From e4289ff65214fe46c0be7ac5ce64b010a70e29e2 Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 2 Sep 2015 19:51:03 +0200 Subject: [PATCH] r20150902 --- _sakura/changelog.json | 28 ++++- _sakura/components/Users.php | 7 ++ _sakura/sakura.php | 9 +- _sakura/templates/yuuno/global/header.tpl | 5 +- _sakura/templates/yuuno/main/memberlist.tpl | 16 +-- main/content/data/yuuno/css/yuuno.css | 121 ++++++++------------ main/content/data/yuuno/js/yuuno.js | 33 ------ 7 files changed, 96 insertions(+), 123 deletions(-) diff --git a/_sakura/changelog.json b/_sakura/changelog.json index a988fb3..80b85b9 100644 --- a/_sakura/changelog.json +++ b/_sakura/changelog.json @@ -54,7 +54,8 @@ "20150828", "20150829", "20150830", - "20150831" + "20150831", + "20150902" ] @@ -2343,6 +2344,31 @@ "user": "Flashwave" } + ], + + "20150902": [ + + { + "type": "REM", + "change": "Removed dodgy old mobile view.", + "user": "Flashwave" + }, + { + "type": "FIX", + "change": "Fixed menu width on smaller monitors.", + "user": "Flashwave" + }, + { + "type": "FIX", + "change": "Made the dropdowns in the memberlist usable on phones.", + "user": "Flashwave" + }, + { + "type": "REM", + "change": "Removed special styling on support us button.", + "user": "Flashwave" + } + ] } diff --git a/_sakura/components/Users.php b/_sakura/components/Users.php index bb5bf44..1dbd0c0 100644 --- a/_sakura/components/Users.php +++ b/_sakura/components/Users.php @@ -1473,4 +1473,11 @@ class Users { } + // Update donation tracker + public static function updatePremiumTracker($id, $amount, $comment) { + + + + } + } diff --git a/_sakura/sakura.php b/_sakura/sakura.php index d9042da..f8560b2 100644 --- a/_sakura/sakura.php +++ b/_sakura/sakura.php @@ -8,7 +8,7 @@ namespace Sakura; // Define Sakura version -define('SAKURA_VERSION', '20150831'); +define('SAKURA_VERSION', '20150902'); define('SAKURA_VLABEL', 'Eminence'); define('SAKURA_COLOUR', '#6C3082'); define('SAKURA_STABLE', false); @@ -88,6 +88,13 @@ if(!defined('SAKURA_NO_TPL')) { // Set base page rendering data $renderData = [ + /* + * Idea for flexibility in templates and to reduce redundancy; + * Attempt to use a class instead of an assoc. array for the + * template variables since twig supports this to make accessing + * certain functions, like the time elapsed function easier. + */ + 'sakura' => [ 'versionInfo' => [ diff --git a/_sakura/templates/yuuno/global/header.tpl b/_sakura/templates/yuuno/global/header.tpl index 16a3f32..79640c3 100644 --- a/_sakura/templates/yuuno/global/header.tpl +++ b/_sakura/templates/yuuno/global/header.tpl @@ -171,7 +171,7 @@ {% if session.checkLogin %} - + {% endif %} -
- Open Menu -
diff --git a/_sakura/templates/yuuno/main/memberlist.tpl b/_sakura/templates/yuuno/main/memberlist.tpl index 1eeaf4d..6393132 100644 --- a/_sakura/templates/yuuno/main/memberlist.tpl +++ b/_sakura/templates/yuuno/main/memberlist.tpl @@ -7,20 +7,20 @@
- Rank: - All members + Rank:All members{{ rank.name }}{% if rank.multi %}s{% endif %}
+
View:{{ sort|capitalize }}
{% if page.notfound %}

The requested rank was not found!

diff --git a/main/content/data/yuuno/css/yuuno.css b/main/content/data/yuuno/css/yuuno.css index 3c6fe96..2c7574a 100644 --- a/main/content/data/yuuno/css/yuuno.css +++ b/main/content/data/yuuno/css/yuuno.css @@ -440,6 +440,33 @@ a#gotop.exit { display: none; } +@media (max-width: 1024px) { + + .dropDown { + position: static; + } + + .dropDown .dropDownInner { + float: none !important; + margin-bottom: 5px; + } + + .dropDown .dropDownInner a { + padding: 3px 6px; + float: none !important; + display: inline-block !important; + } + + .dropDown .dropDownInner a:not(:last-child) { + border-right: 2px solid #9475B2; + } + + .membersPageList { + padding-top: 10px; + } + +} + #headerLoginForm { background: rgba(211, 191, 255, .8); border: 1px solid #9475B2; @@ -555,9 +582,11 @@ a#gotop.exit { } @media (max-width: 768px) { + .header .logo { font: 100 50px/60px "SegoeUI-Light", "SegoeUI", "Segoe UI", sans-serif; } + } .header .menu { @@ -574,12 +603,8 @@ a#gotop.exit { float: right; } -.header .menu .menu-mob { - display: none; -} - .header .menu .menu-item { - margin: 0 8px -2px; + margin: 0 7px -2px 6px; display: inline-block; border-bottom: 2px solid #8364A1; color: inherit; @@ -597,7 +622,6 @@ a#gotop.exit { .header .menu .menu-item.avatar { padding-left: 30px; background: url('/pixel.png') no-repeat scroll left center / contain transparent; - background-size: auto 30px; } .header .menu .menu-item:hover { @@ -609,92 +633,37 @@ a#gotop.exit { background-color: #503180 !important; } -.header .menu .menu-donate:hover { - border-color: #EE9400 !important; -} - -.header .menu .menu-donate:active { - border-color: #EE9400 !important; - background-color: #EE9400 !important; -} - -@media (max-width: 1283px) and (min-width: 930px) { +@media (max-width: 1024px) { .header .menu { border: 0; - padding-bottom: 5px; - } - - .header .menu .menu-nav { - margin-left: 32px; + padding: 10px 0 5px; + margin: 0 auto; + width: auto; } .header .menu .menu-nav, .header .menu .menu-ucp { - display: block; + display: inline-block; float: none; text-align: center; } + .header .menu .menu-ucp { + margin-left: -1px; + } + .header .menu .menu-item { - min-width: 120px; border: 0; - margin: 0 8px; - } - - .header .menu .menu-nav .menu-item { - min-width: 120px; - border-bottom: 1px solid #8364A1; - } - - .header .menu .menu-ucp .menu-item { - min-width: 120px; - border-top: 1px solid #8364A1; - } - -} - -@media (max-width: 930px) { - - .header .menu .menu-nav, .header .menu .menu-ucp { - float: none; - text-align: center; - display: none; - } - - .header .menu .menu-hid { - display: block; - } - - .header .menu .menu-mob { - display: block; + height: 50px; + width: 50px; + line-height: 50px; + font-size: 2em; + display: inline-block; } .header .menu .menu-item.avatar { - padding-left: 0; - } - - .header .menu .menu-mob .menu-item { - width: 100px; - } - - .header .menu .menu-nav .menu-item, .header .menu .menu-ucp .menu-item { - display: block; - border-top: 0; - border-bottom: 1px solid #8364A1; - margin: 0 8px; - } - - .header .menu .menu-nav:before { - content: "Navigation"; - font-size: 20px; - line-height: 40px; - } - - .header .menu .menu-ucp:before { - content: "User Settings"; - font-size: 20px; - line-height: 40px; + padding-left: 50px; } } diff --git a/main/content/data/yuuno/js/yuuno.js b/main/content/data/yuuno/js/yuuno.js index e9abf50..20259ac 100644 --- a/main/content/data/yuuno/js/yuuno.js +++ b/main/content/data/yuuno/js/yuuno.js @@ -21,39 +21,6 @@ function cookieData(action, name, data) { } -// Toggling the menu on mobile devices -function mobileMenu(mode) { - - // Assign the elements to variables - var ucpMenuBtn = document.getElementById('navMenuSite'); - var navMenuBtn = document.getElementById('navMenuUser'); - var mobMenuBtn = document.getElementById('mobileNavToggle'); - - // Open or close the menus depending on the values - if(mode) { - - // Alter the classes - ucpMenuBtn.className = ucpMenuBtn.className + ' menu-hid'; - navMenuBtn.className = navMenuBtn.className + ' menu-hid'; - - // Update the button - mobMenuBtn.innerHTML = 'Close Menu'; - mobMenuBtn.setAttribute('onclick', 'mobileMenu(false);'); - - } else { - - // Alter the classes - ucpMenuBtn.className = ucpMenuBtn.className.replace(' menu-hid', ''); - navMenuBtn.className = navMenuBtn.className.replace(' menu-hid', ''); - - // Update the button - mobMenuBtn.innerHTML = 'Open Menu'; - mobMenuBtn.setAttribute('onclick', 'mobileMenu(true);'); - - } - -} - // Get the current unix/epoch timestamp function epochTime() {