Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/72227
Change subject: Story 832: Show icons when not available / add new assets
......................................................................
Story 832: Show icons when not available / add new assets
Change-Id: I9ceea67010590ff71e95a168d49dbad59aae85a0
---
M less/common/pageactions.less
M less/modules/talk.less
A stylesheets/common/images/pagemenu/edit-locked.png
M stylesheets/common/images/pagemenu/edit.png
M stylesheets/common/images/pagemenu/talk.png
A stylesheets/common/images/pagemenu/upload-locked.png
M stylesheets/common/images/pagemenu/upload.png
M stylesheets/common/images/pagemenu/watch.png
M stylesheets/common/images/pagemenu/watched.png
M stylesheets/common/pageactions.css
M stylesheets/modules/talk.css
11 files changed, 48 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/27/72227/1
diff --git a/less/common/pageactions.less b/less/common/pageactions.less
index d1af5a1..fac56f9 100644
--- a/less/common/pageactions.less
+++ b/less/common/pageactions.less
@@ -1,8 +1,6 @@
@import "../mf-mixins.less";
// hide menu items when not possible to use
-#ca-upload,
-#ca-edit,
.client-nojs #ca-watch.cta,
#ca-talk.selected {
display: none;
@@ -20,6 +18,13 @@
border-bottom: solid 1px #CACACA;
height: 40px;
+ li,
+ .watch-this-article {
+ .background-size( auto, 37px );
+ &.loading {
+ .background-size( auto, auto );
+ }
+ }
li {
position: relative;
height: 40px;
@@ -27,7 +32,6 @@
text-indent: -9999px;
background-position: center center;
background-repeat: no-repeat;
- .background-size( auto, @watchStarSize );
// file inputs are notoriously difficult to style
input {
@@ -55,18 +59,22 @@
}
#ca-edit {
- background-image: url(images/pagemenu/edit.png);
+ background-image: url(images/pagemenu/edit-locked.png);
+ margin-right: 19px;
+ &.enabled {
+ background-image: url(images/pagemenu/edit.png);
+ }
}
#ca-talk {
+ margin-right: 12px;
background-image: url(images/pagemenu/talk.png);
}
#ca-upload {
- background-image: url(images/pagemenu/upload.png);
-}
-
-#ca-edit.enabled,
-#ca-upload.enabled {
- display: inline-block;
+ margin-right: 24px;
+ background-image: url(images/pagemenu/upload-locked.png);
+ &.enabled {
+ background-image: url(images/pagemenu/upload.png);
+ }
}
diff --git a/less/modules/talk.less b/less/modules/talk.less
index 3578304..210b783 100644
--- a/less/modules/talk.less
+++ b/less/modules/talk.less
@@ -4,9 +4,10 @@
.alpha #page-actions #ca-talk.count a {
text-indent: 0;
text-align: center;
- line-height: 36px;
+ line-height: 48px;
font-weight: bold;
color: #FFF;
+ padding-left: 4px;
font-size: 9px; // FIXME: use pixels for time being as the icon in
pixels.
}
diff --git a/stylesheets/common/images/pagemenu/edit-locked.png
b/stylesheets/common/images/pagemenu/edit-locked.png
new file mode 100644
index 0000000..08d8863
--- /dev/null
+++ b/stylesheets/common/images/pagemenu/edit-locked.png
Binary files differ
diff --git a/stylesheets/common/images/pagemenu/edit.png
b/stylesheets/common/images/pagemenu/edit.png
index 2321bf6..4d773a3 100644
--- a/stylesheets/common/images/pagemenu/edit.png
+++ b/stylesheets/common/images/pagemenu/edit.png
Binary files differ
diff --git a/stylesheets/common/images/pagemenu/talk.png
b/stylesheets/common/images/pagemenu/talk.png
index 3ca37cf..619ad75 100644
--- a/stylesheets/common/images/pagemenu/talk.png
+++ b/stylesheets/common/images/pagemenu/talk.png
Binary files differ
diff --git a/stylesheets/common/images/pagemenu/upload-locked.png
b/stylesheets/common/images/pagemenu/upload-locked.png
new file mode 100644
index 0000000..c8362a3
--- /dev/null
+++ b/stylesheets/common/images/pagemenu/upload-locked.png
Binary files differ
diff --git a/stylesheets/common/images/pagemenu/upload.png
b/stylesheets/common/images/pagemenu/upload.png
index fc7579e..f0a0615 100644
--- a/stylesheets/common/images/pagemenu/upload.png
+++ b/stylesheets/common/images/pagemenu/upload.png
Binary files differ
diff --git a/stylesheets/common/images/pagemenu/watch.png
b/stylesheets/common/images/pagemenu/watch.png
index 9087094..2737d3f 100644
--- a/stylesheets/common/images/pagemenu/watch.png
+++ b/stylesheets/common/images/pagemenu/watch.png
Binary files differ
diff --git a/stylesheets/common/images/pagemenu/watched.png
b/stylesheets/common/images/pagemenu/watched.png
index ff61a52..9201d01 100644
--- a/stylesheets/common/images/pagemenu/watched.png
+++ b/stylesheets/common/images/pagemenu/watched.png
Binary files differ
diff --git a/stylesheets/common/pageactions.css
b/stylesheets/common/pageactions.css
index 2cfca2d..015604e 100644
--- a/stylesheets/common/pageactions.css
+++ b/stylesheets/common/pageactions.css
@@ -1,5 +1,3 @@
-#ca-upload,
-#ca-edit,
.client-nojs #ca-watch.cta,
#ca-talk.selected {
display: none;
@@ -14,6 +12,24 @@
border-bottom: solid 1px #CACACA;
height: 40px;
}
+#page-actions li,
+#page-actions .watch-this-article {
+ /* use -webkit prefix for older android browsers eg. nexus 1 */
+
+ -moz-background-size: auto 37px;
+ -o-background-size: auto 37px;
+ -webkit-background-size: auto 37px;
+ background-size: auto 37px;
+}
+#page-actions li.loading,
+#page-actions .watch-this-article.loading {
+ /* use -webkit prefix for older android browsers eg. nexus 1 */
+
+ -moz-background-size: auto auto;
+ -o-background-size: auto auto;
+ -webkit-background-size: auto auto;
+ background-size: auto auto;
+}
#page-actions li {
position: relative;
height: 40px;
@@ -21,12 +37,6 @@
text-indent: -9999px;
background-position: center center;
background-repeat: no-repeat;
- /* 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;
}
#page-actions li input {
opacity: 0;
@@ -48,15 +58,20 @@
background-image: url(images/pagemenu/watched.png);
}
#ca-edit {
+ background-image: url(images/pagemenu/edit-locked.png);
+ margin-right: 19px;
+}
+#ca-edit.enabled {
background-image: url(images/pagemenu/edit.png);
}
#ca-talk {
+ margin-right: 12px;
background-image: url(images/pagemenu/talk.png);
}
#ca-upload {
- background-image: url(images/pagemenu/upload.png);
+ margin-right: 24px;
+ background-image: url(images/pagemenu/upload-locked.png);
}
-#ca-edit.enabled,
#ca-upload.enabled {
- display: inline-block;
+ background-image: url(images/pagemenu/upload.png);
}
diff --git a/stylesheets/modules/talk.css b/stylesheets/modules/talk.css
index 8184084..b8cc8b0 100644
--- a/stylesheets/modules/talk.css
+++ b/stylesheets/modules/talk.css
@@ -1,9 +1,10 @@
.alpha #page-actions #ca-talk.count a {
text-indent: 0;
text-align: center;
- line-height: 36px;
+ line-height: 48px;
font-weight: bold;
color: #FFF;
+ padding-left: 4px;
font-size: 9px;
}
.overlay .header button.add {
--
To view, visit https://gerrit.wikimedia.org/r/72227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ceea67010590ff71e95a168d49dbad59aae85a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
