jenkins-bot has submitted this change and it was merged.

Change subject: Hide some links from nonjs users
......................................................................


Hide some links from nonjs users

* Watchlist, Login, and logout links on Special:MobileMenu
* Watchstar icon on pages

Change-Id: I43c6e849cadc9c0b43721e627a171c095fc64e69
---
M includes/skins/SkinMinerva.php
M less/mainmenu.less
M less/pageactions.less
M less/specials/mobilemenu.less
4 files changed, 40 insertions(+), 39 deletions(-)

Approvals:
  Jdlrobson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index f7f2dc3..ed8f9f5 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -341,6 +341,7 @@
                                                'class' => MobileUI::iconClass( 
'watchlist', 'before' ),
                                        ),
                                ),
+                               'class' => 'jsonly'
                        )
                );
                if ( $this->isMobileMode ) {
@@ -533,6 +534,7 @@
                                                'class' => MobileUI::iconClass( 
'anonymous-white', 'before', 'icon-anon' ),
                                        ),
                                ),
+                               'class' => 'jsonly'
                        );
                }
 
diff --git a/less/mainmenu.less b/less/mainmenu.less
index a92cc94..592ab35 100644
--- a/less/mainmenu.less
+++ b/less/mainmenu.less
@@ -48,6 +48,41 @@
        box-shadow: -5px 0 0 0 rgba(0, 0, 0, 0.3);
 }
 
+.client-js {
+       #mw-mf-page-left ul {
+               li {
+                       .icon-secondary {
+                               border: none;
+                               position: absolute;
+                               right: 0;
+                               top: 0;
+                               bottom: 0;
+                               padding-right: 0;
+                               border-left: 1px solid @colorGray7;
+
+                               // FIXME: Remove when cache cleared and using 
mw-ui-icon
+                               &.icon {
+                                       width: 0;
+                               }
+
+                               &.mw-ui-icon {
+                                       padding: 0;
+                                       margin: 0;
+                               }
+                       }
+
+                       .icon-profile {
+                               margin-right: 40px;
+                       }
+
+                       // FIXME: Why is logout button with mw-ui icon class 
larger?
+                       .mw-ui-icon-profile {
+                               margin-right: 48px;
+                       }
+               }
+       }
+}
+
 #mw-mf-page-left ul {
        background-color: @mainMenuBackgroundColor;
 
@@ -105,35 +140,6 @@
                        background-color: @colorGray5;
                        border-left: solid @menuBorder #3366BB;
                        margin-left: -@menuBorder;
-               }
-
-               .icon-secondary {
-                       border: none;
-                       position: absolute;
-                       right: 0;
-                       top: 0;
-                       bottom: 0;
-                       padding-right: 0;
-                       border-left: 1px solid @colorGray7;
-
-                       // FIXME: Remove when cache cleared and using mw-ui-icon
-                       &.icon {
-                               width: 0;
-                       }
-
-                       &.mw-ui-icon {
-                               padding: 0;
-                               margin: 0;
-                       }
-               }
-
-               .icon-profile {
-                       margin-right: 40px;
-               }
-
-               // FIXME: Why is logout button with mw-ui icon class larger?
-               .mw-ui-icon-profile {
-                       margin-right: 48px;
                }
 
                a {
diff --git a/less/pageactions.less b/less/pageactions.less
index 371aba8..c724550 100644
--- a/less/pageactions.less
+++ b/less/pageactions.less
@@ -4,7 +4,7 @@
 @borderBottomColor: #CACACA;
 
 // hide menu items when not possible to use
-.client-nojs #ca-watch.cta,
+.client-nojs #ca-watch,
 .client-nojs #ca-edit,
 .client-nojs #ca-upload,
 #ca-talk.selected {
diff --git a/less/specials/mobilemenu.less b/less/specials/mobilemenu.less
index de5a522..232815e 100644
--- a/less/specials/mobilemenu.less
+++ b/less/specials/mobilemenu.less
@@ -20,15 +20,8 @@
                        background-image: none;
                        padding-left: 0;
                }
-               .icon-profile {
-                       margin-right: 100px;
-               }
-               .icon-secondary-logout {
-                       &.icon {
-                               max-width: 100px;
-                               text-indent: 10px;
-                               width: auto;
-                       }
+               .icon-secondary {
+                       display: none;
                }
        }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43c6e849cadc9c0b43721e627a171c095fc64e69
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to