Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56515
Change subject: Bring watchlist css/html markup closer to desktop
......................................................................
Bring watchlist css/html markup closer to desktop
Change-Id: I4d67fd48586541e0f11c15f0088e3a2126221d71
---
M javascripts/modules/mf-watchstar.js
M less/common/mf-navigation.less
M less/modules/mf-watchstar.less
R stylesheets/common/images/watch.png
R stylesheets/common/images/watched.png
M stylesheets/common/mf-navigation.css
M stylesheets/modules/mf-watchstar.css
7 files changed, 60 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/15/56515/1
diff --git a/javascripts/modules/mf-watchstar.js
b/javascripts/modules/mf-watchstar.js
index baf88b4..aa48ff5 100644
--- a/javascripts/modules/mf-watchstar.js
+++ b/javascripts/modules/mf-watchstar.js
@@ -205,7 +205,7 @@
function init( container, title ) {
var pageTitle = mw.config.get( 'wgTitle' );
- container = container || nav.getPageMenu();
+ container = container || $( '<li>' ).appendTo(
nav.getPageMenu() )[ 0 ];
title = title || pageTitle;
// initialise on current page
if ( container ) {
diff --git a/less/common/mf-navigation.less b/less/common/mf-navigation.less
index e234766..b52619c 100644
--- a/less/common/mf-navigation.less
+++ b/less/common/mf-navigation.less
@@ -9,9 +9,37 @@
@overlayAlertPadding: 0.5em @overlayAlertPaddingHorizontal;
@overlayBorderWidth: 1px;
@toastNotificationColor: #373737;
+@watchThisArticleSize: 22px;
#mw-mf-menu-page {
right: 0;
+ list-style: none;
+
+ li.watch-this-article,
+ li.watch-this-article a {
+ position: absolute;
+ right: 0;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ }
+}
+
+li.watch-this-article,
+a.watch-this-article {
+ background-image: url(images/watch.png);
+ background-position: center center;
+ .background-size( auto, @watchThisArticleSize );
+ position: absolute;
+ top: 0;
+ right: 0;
+ text-indent: -9999px;
+ background-repeat: no-repeat;
+
+ &#ca-watch,
+ &.watched {
+ background-image: url(images/watched.png);
+ }
}
.client-js {
diff --git a/less/modules/mf-watchstar.less b/less/modules/mf-watchstar.less
index 9f9cbfe..1c4032c 100644
--- a/less/modules/mf-watchstar.less
+++ b/less/modules/mf-watchstar.less
@@ -1,20 +1,6 @@
@import "../mf-mixins.less";
-@watchThisArticleSize: 22px;
-
a.watch-this-article {
- background-image: url(images/watch.png);
- background-position: center center;
- .background-size( auto, @watchThisArticleSize );
- position: absolute;
- top: 0;
- right: 0;
- text-indent: -9999px;
- background-repeat: no-repeat;
-
- &.watched {
- background-image: url(images/watched.png);
- }
&.loading {
background-image: @ajaxLoadingImage;
@@ -42,16 +28,6 @@
width: @searchResultPaddingVertical * 2;
background-position: center center;
margin: 0;
-}
-
-#mw-mf-menu-page {
- a.watch-this-article {
- position: absolute;
- right: 0;
- top: 0;
- left: 0;
- bottom: 0;
- }
}
/* notification */
diff --git a/stylesheets/modules/images/watch.png
b/stylesheets/common/images/watch.png
similarity index 100%
rename from stylesheets/modules/images/watch.png
rename to stylesheets/common/images/watch.png
Binary files differ
diff --git a/stylesheets/modules/images/watched.png
b/stylesheets/common/images/watched.png
similarity index 100%
rename from stylesheets/modules/images/watched.png
rename to stylesheets/common/images/watched.png
Binary files differ
diff --git a/stylesheets/common/mf-navigation.css
b/stylesheets/common/mf-navigation.css
index d2f52b0..c0b93ec 100644
--- a/stylesheets/common/mf-navigation.css
+++ b/stylesheets/common/mf-navigation.css
@@ -1,5 +1,36 @@
#mw-mf-menu-page {
right: 0;
+ list-style: none;
+}
+#mw-mf-menu-page li.watch-this-article,
+#mw-mf-menu-page li.watch-this-article a {
+ position: absolute;
+ right: 0;
+ top: 0;
+ left: 0;
+ bottom: 0;
+}
+li.watch-this-article,
+a.watch-this-article {
+ background-image: url(images/watch.png);
+ background-position: center center;
+ /* use -webkit prefix for older android browsers eg. nexus 1 */
+
+ -moz-background-size: auto 22px;
+ -o-background-size: auto 22px;
+ -webkit-background-size: auto 22px;
+ background-size: auto 22px;
+ position: absolute;
+ top: 0;
+ right: 0;
+ text-indent: -9999px;
+ background-repeat: no-repeat;
+}
+li.watch-this-article#ca-watch,
+a.watch-this-article#ca-watch,
+li.watch-this-article.watched,
+a.watch-this-article.watched {
+ background-image: url(images/watched.png);
}
.client-js #mw-mf-main-menu-button {
background-image: /* @embed */ url(images/menu/main.png);
diff --git a/stylesheets/modules/mf-watchstar.css
b/stylesheets/modules/mf-watchstar.css
index ceb49d0..270c6fd 100644
--- a/stylesheets/modules/mf-watchstar.css
+++ b/stylesheets/modules/mf-watchstar.css
@@ -1,21 +1,3 @@
-a.watch-this-article {
- background-image: url(images/watch.png);
- background-position: center center;
- /* use -webkit prefix for older android browsers eg. nexus 1 */
-
- -moz-background-size: auto 22px;
- -o-background-size: auto 22px;
- -webkit-background-size: auto 22px;
- background-size: auto 22px;
- position: absolute;
- top: 0;
- right: 0;
- text-indent: -9999px;
- background-repeat: no-repeat;
-}
-a.watch-this-article.watched {
- background-image: url(images/watched.png);
-}
a.watch-this-article.loading {
background-image: url(../common/images/ajax-loader.gif);
min-height: auto;
@@ -44,13 +26,6 @@
width: 24px;
background-position: center center;
margin: 0;
-}
-#mw-mf-menu-page a.watch-this-article {
- position: absolute;
- right: 0;
- top: 0;
- left: 0;
- bottom: 0;
}
/* notification */
#mf-notification div.watch-action {
--
To view, visit https://gerrit.wikimedia.org/r/56515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d67fd48586541e0f11c15f0088e3a2126221d71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
