Bmansurov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/282411

Change subject: Primary navigation design fixes
......................................................................

Primary navigation design fixes

* Color changes;
* Remove the left border;
* Height fixes.

Bug: T132207
Change-Id: I27cc3f60ce68775798fcd39d55dddd3bad312002
---
M resources/mobile.mainMenu/mainmenu.less
1 file changed, 26 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/11/282411/1

diff --git a/resources/mobile.mainMenu/mainmenu.less 
b/resources/mobile.mainMenu/mainmenu.less
index b069d2b..55bce4b 100644
--- a/resources/mobile.mainMenu/mainmenu.less
+++ b/resources/mobile.mainMenu/mainmenu.less
@@ -4,9 +4,9 @@
 @import "minerva.mixins";
 
 /* Left menu */
-@menuBorder: 12px;
+@menuSectionPadding: 22px;
 @menuBorderColor: #252525;
-@menuLinkLineHeight: 22px;
+@menuLinkLineHeight: 24px;
 @menuItemFontSize: 1.2em;
 
 @pageLeftListDarkBorderColor: #3e3e3e;
@@ -29,19 +29,15 @@
                &::after {
                        content: '';
                        background-color: @colorProgressive;
-                 width: .65em;
-                 height: .65em;
-                 position: absolute;
-                 top: -0.4em;
-                 right: .6em;
-                 border-radius: .5em;
-                 border: solid .2em white;
+                       width: .65em;
+                       height: .65em;
+                       position: absolute;
+                       top: -0.4em;
+                       right: .6em;
+                       border-radius: .5em;
+                       border: solid .2em white;
                }
        }
-}
-
-nav {
-       float: left;
 }
 
 // needs to be more specific than .overlay rules
@@ -54,11 +50,9 @@
 }
 
 nav {
+       float: left;
        font-size: 90%;
        min-height: 100%;
-       background: @mainMenuBackgroundColor;
-       border-left: solid @menuBorder @menuBorderColor;
-
 
        .client-js & {
                .secondary-action {
@@ -68,19 +62,18 @@
                        top: 0;
                        bottom: 0;
                        padding-right: 0;
-                       border-left: 1px solid @colorGray7;
+                       border-left: 1px solid @colorGray6;
                }
 
                .primary-action {
                        // 1px for the logout icon border-left
-                       margin-right: @menuLinkLineHeight * 2 + 1;
+                       margin-right: @iconSize + @iconGutterWidth * 2;
                }
        }
 
        ul {
+               padding-bottom: @menuSectionPadding;
                &:first-child {
-                       border-bottom: @menuBorder solid @menuBorderColor;
-
                        li:first-child {
                                border-top: none;
                        }
@@ -89,25 +82,21 @@
                li {
                        position: relative; // ensure the logout link in beta 
can be position absolute
                        font-size: @menuItemFontSize;
-                       border-top: 1px solid @colorGray7;
+                       border-top: 1px solid @colorGray6;
+                       background-color: @mainMenuBackgroundColor;
 
-                       &:hover {
-                               background-color: @colorGray5;
-                               margin-left: -@menuBorder;
-                               a {
-                                       border-left: solid @menuBorder #3366BB;
-                               }
-                       }
-                       &:last-child {
-                               border-bottom: 1px solid @colorGray7;
+                       &:first-child {
+                               border-top: 0;
                        }
 
                        a {
                                color: white;
                                display: block;
-                               padding: @menuLinkLineHeight / 2 10px 
@menuLinkLineHeight / 2 9px;
+                               padding: @menuLinkLineHeight / 2 10px 
@menuLinkLineHeight / 2 15px;
 
                                &:hover {
+                                       background-color: @colorGray5;
+                                       box-shadow: inset 4px 0 0 0 
@colorProgressive;
                                        text-decoration: none;
                                }
 
@@ -123,12 +112,16 @@
                                font-size: 0.8em;
                                margin: 0;
                                border: none;
+                               background-color: transparent;
 
                                a {
                                        color: @colorGray12;
                                        border: none;
                                        padding: .7em 12px;
                                        margin-left: 0;
+                                       &:hover {
+                                               box-shadow: none;
+                                       }
                                }
                        }
                }
@@ -155,7 +148,7 @@
                left: @menuWidth;
                // set border here (nav doesn't expand height)
                border-left: solid 1px #000;
-               box-shadow: -5px 0 0 0 rgba(0, 0, 0, 0.1);
+               box-shadow: -1px 0 3px 0 rgba(0,0,0,0.3);
        }
 
        .navigation-drawer,
@@ -170,14 +163,7 @@
 }
 
 .primary-navigation-enabled {
-       // set background and border here (nav doesn't expand height
-       // and #mw-mf-viewport has overflow: hidden and clips blue hover 
borders)
-       border-left: solid @menuBorder @menuBorderColor;
-       background: @mainMenuBackgroundColor;
-
-       #mw-mf-viewport {
-               margin-left: -@menuBorder;
-       }
+       background: @colorGray3;
 
        nav {
                width: @menuWidth;

-- 
To view, visit https://gerrit.wikimedia.org/r/282411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27cc3f60ce68775798fcd39d55dddd3bad312002
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to