[MediaWiki-commits] [Gerrit] Story 832: Show icons when not available / add new assets - change (mediawiki...MobileFrontend)

2013-07-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

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/editor.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/editor.css
M stylesheets/modules/talk.css
13 files changed, 49 insertions(+), 43 deletions(-)

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



diff --git a/less/common/pageactions.less b/less/common/pageactions.less
index d1af5a1..6d07daa 100644
--- a/less/common/pageactions.less
+++ b/less/common/pageactions.less
@@ -1,33 +1,34 @@
 @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;
 }
 
 #section_0 {
-   margin: @headingMarginTop @contentMarginRight 0 @contentMarginLeft;
-   padding-bottom: @headingMarginBottom;
+   margin: 10px @contentMarginRight 0 @contentMarginLeft;
+   padding-bottom: 9px;
border-bottom: dotted 1px #CACACA;
 }
 
 #page-actions {
-   padding: 8px @contentMarginRight;
+   padding: 10px @contentMarginRight 8px;
// end hacks
border-bottom: solid 1px #CACACA;
-   height: 40px;
+   height: 30px;
 
+   li,
+   .watch-this-article {
+   .background-size( auto, 30px );
+   }
li {
position: relative;
-   height: 40px;
+   height: 30px;
width: 40px;
text-indent: -px;
-   background-position: center center;
+   background-position: 50% 0;
background-repeat: no-repeat;
-   .background-size( auto, @watchStarSize );
 
// file inputs are notoriously difficult to style
input {
@@ -55,18 +56,22 @@
 }
 
 #ca-edit {
-   background-image: url(images/pagemenu/edit.png);
+   background-image: url(images/pagemenu/edit-locked.png);
+   margin-right: 17px;
+   .enabled {
+   background-image: url(images/pagemenu/edit.png);
+   }
 }
 
 #ca-talk {
+   margin-right: 14px;
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: 19px;
+   background-image: url(images/pagemenu/upload-locked.png);
+   .enabled {
+   background-image: url(images/pagemenu/upload.png);
+   }
 }
diff --git a/less/modules/editor.less b/less/modules/editor.less
index cbd511f..bf0bd25 100644
--- a/less/modules/editor.less
+++ b/less/modules/editor.less
@@ -1,13 +1,9 @@
 @import ../mf-variables.less;
 @import ../mf-mixins.less;
 
-.edit-page {
-   margin-top: .5em;
-   float: right;
-}
-
 .section_heading {
.edit-page {
+   float: right;
margin: 0 30px 0 0;
display: none;
font-size: .65em;
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 000..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

[MediaWiki-commits] [Gerrit] Story 832: Show icons when not available / add new assets - change (mediawiki...MobileFrontend)

2013-07-05 Thread Jdlrobson (Code Review) 
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: -px;
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 000..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 000..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
+++