BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153705
Change subject: tmp: PageIssues and Disambig without borders
......................................................................
tmp: PageIssues and Disambig without borders
for Vibha
Change-Id: If8c0732449ba2150c97e8c0bef407c345bc63c4f
---
M wikipedia/assets/bundle.js
M wikipedia/assets/night.css
M wikipedia/assets/preview.js
M wikipedia/assets/styles.css
M www/js/issues.js
5 files changed, 58 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/05/153705/1
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 6164dd8..f34376b 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -185,6 +185,7 @@
var link = document.createElement( 'a' );
link.setAttribute( 'href', '#issues' );
link.className = 'issues_button';
+ link.innerText = 'Page issues';
wrapper.appendChild( link );
el.parentNode.replaceChild( wrapper, el );
var i = 0,
@@ -192,6 +193,12 @@
for (; i < len; i++) {
wrapper.appendChild( issues[i] );
}
+
+ var separator = document.createElement( 'span' );
+ separator.innerText = '|';
+ separator.className = 'separator';
+ container.appendChild( separator );
+
container.appendChild( wrapper );
}
return content;
diff --git a/wikipedia/assets/night.css b/wikipedia/assets/night.css
index ae144a8..7106832 100644
--- a/wikipedia/assets/night.css
+++ b/wikipedia/assets/night.css
@@ -28,18 +28,20 @@
background: #000;
}
a.issues_button {
- background:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAADBElEQVR4nO3aX0hTURwH8O/v3q3co1CgERQY/rtK5EMR+hT44tgGRfbSm4EV1RaRYNFLD75kuVkJ+VJBBWkUmxYU1EvYP1TK3CzTKCywGQRSodu999dDChJEeXe2s+h8GAwuO+d8+bJ7Lzt3gKIoiqIo/ytyOrA8dGs9EW1wWa4vTFbaInOm6qOV7O1ttEQGzDbHBVSGoq3E1PbLYQboLQHDDAyD7IcF36efDXU3pzPMmTUuwfMRwCUMlADYCSbMeYq/GaHYABhR3W3eGGnfnhS8ZkZEfwP+xALwAKAr87Z+feJsw7zT9RdV7+svtNxck+j03XcyXss0wDLpAOoBvrxSM98Zh6InNh28s9rpZBWhvhp7hf0Imr3Z6RyiT4HlKALRyRSZx4xg7CpIPxcPe5//zcCyA9E1Ll1rBaMZgDuTEDILWFQAoAlsNRnBvpfE6IdmD2iW+4V7furTUHdzeuvhHs+s6SmFjjpibmBgG8AFIhbPhwKW4GomVIMJlmbC8hTDCMYwawPQGPj5EirX14C8owqQHUA2VYDsALKpAmQHkE0VIDuAbKoA2QFkUwXIDiCbKkB2ANlUAbIDyCZsR4iAJwz0sKYNwjZTBG0tAWUM1ANUC3BGe3fZIqwAG7iUiPgvLDn0dOG9rfRI3yq3hd1g7AFgiFpThJzsCY6f9n0GEAY4YgRjPjAdB8HxVrZIOb4GEMcjgVi807+FiHcAmBIwaZLTrmtOB0u7CI6GAzeRnqtkQjtATp8dzpDG3rHz3vdOc0i9C8S7Gr8mwv6jlq5VMaEHy9v1fmwz1Y52BAYzyZAXt8FXZ7zjibB/lw6uAPgUQJO/++zCk+e98cLhurFO35tM186rByMjkcBrAC0AWoz9t4vg5o1gex00ssF2EhoSox2BCZFr5lUBS8W7vNMAprO9Tl6cAjKpAmQHkE0VIDuAbKoA2QFkUwXIDiCbKkB2ANmEFUDMc6LmyiVBP4ZoEqZ+V8xcueW4AEq5LmouvgfdTJV/SCX+tb/JK4qiKIqi/ABBuOy9cIEOvwAAAABJRU5ErkJggg==)
no-repeat center;
- background:
url(//bits.beta.wmflabs.org/static-master/extensions/MobileApp/less/../images/flag-night.png?2014-07-29T19:15:00Z)
no-repeat center!ie;
- border: 1px solid #2B6FB2;
+ /*background:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAADBElEQVR4nO3aX0hTURwH8O/v3q3co1CgERQY/rtK5EMR+hT44tgGRfbSm4EV1RaRYNFLD75kuVkJ+VJBBWkUmxYU1EvYP1TK3CzTKCywGQRSodu999dDChJEeXe2s+h8GAwuO+d8+bJ7Lzt3gKIoiqIo/ytyOrA8dGs9EW1wWa4vTFbaInOm6qOV7O1ttEQGzDbHBVSGoq3E1PbLYQboLQHDDAyD7IcF36efDXU3pzPMmTUuwfMRwCUMlADYCSbMeYq/GaHYABhR3W3eGGnfnhS8ZkZEfwP+xALwAKAr87Z+feJsw7zT9RdV7+svtNxck+j03XcyXss0wDLpAOoBvrxSM98Zh6InNh28s9rpZBWhvhp7hf0Imr3Z6RyiT4HlKALRyRSZx4xg7CpIPxcPe5//zcCyA9E1Ll1rBaMZgDuTEDILWFQAoAlsNRnBvpfE6IdmD2iW+4V7furTUHdzeuvhHs+s6SmFjjpibmBgG8AFIhbPhwKW4GomVIMJlmbC8hTDCMYwawPQGPj5EirX14C8owqQHUA2VYDsALKpAmQHkE0VIDuAbKoA2QFkUwXIDiCbKkB2ANlUAbIDyCZsR4iAJwz0sKYNwjZTBG0tAWUM1ANUC3BGe3fZIqwAG7iUiPgvLDn0dOG9rfRI3yq3hd1g7AFgiFpThJzsCY6f9n0GEAY4YgRjPjAdB8HxVrZIOb4GEMcjgVi807+FiHcAmBIwaZLTrmtOB0u7CI6GAzeRnqtkQjtATp8dzpDG3rHz3vdOc0i9C8S7Gr8mwv6jlq5VMaEHy9v1fmwz1Y52BAYzyZAXt8FXZ7zjibB/lw6uAPgUQJO/++zCk+e98cLhurFO35tM186rByMjkcBrAC0AWoz9t4vg5o1gex00ssF2EhoSox2BCZFr5lUBS8W7vNMAprO9Tl6cAjKpAmQHkE0VIDuAbKoA2QFkUwXIDiCbKkB2ANmEFUDMc6LmyiVBP4ZoEqZ+V8xcueW4AEq5LmouvgfdTJV/SCX+tb/JK4qiKIqi/ABBuOy9cIEOvwAAAABJRU5ErkJggg==)
no-repeat center;*/
+ /*background:
url(//bits.beta.wmflabs.org/static-master/extensions/MobileApp/less/../images/flag-night.png?2014-07-29T19:15:00Z)
no-repeat center!ie;*/
+ /*border: 1px solid #2B6FB2;*/
+ /*color: #2B6FB2;*/
}
a.issues_button:active {
- border: 4px solid #2B6FB2;
+ /*border: 4px solid #2B6FB2;*/
+ color: #b0b0b0;
}
a.disambig_button {
- border: 1px solid #2B6FB2;
- color: #2B6FB2;
+ /*border: 1px solid #2B6FB2;*/
+ /*color: #2B6FB2;*/
}
a.disambig_button:active {
- background-color: #2B6FB2;
+ /*background-color: #2B6FB2;*/
color: #b0b0b0;
-}
\ No newline at end of file
+}
diff --git a/wikipedia/assets/preview.js b/wikipedia/assets/preview.js
index 00fee54..af9d02c 100644
--- a/wikipedia/assets/preview.js
+++ b/wikipedia/assets/preview.js
@@ -533,4 +533,4 @@
try { module.exports = parseCSSColor } catch(e) { }
-},{}]},{},[3,2,4,1,5,6,7])
+},{}]},{},[3,2,4,1,5,6,7])
\ No newline at end of file
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index 21b14a5..a6d48df 100644
--- a/wikipedia/assets/styles.css
+++ b/wikipedia/assets/styles.css
@@ -597,20 +597,34 @@
}
div.issues_container {
- margin: 0px;
- padding: 0px;
+ margin-top: -0.9em; /* a bit hacky that it assumes it's right below an h1
heading */
+ margin-bottom: 3.5em;
+ padding: 0;
width: 100%;
- display: inline-block;
+ display: block;
+ font-size: .95em;
+ letter-spacing: 0.02em;
}
+
+span.separator {
+ padding-left: 0.6em;
+ padding-right: 0.6em;
+ float: left;
+}
+
a.issues_button {
- height: 32px;
- width: 36px;
- background-size: 24px 24px;
- background:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAACzklEQVR4nO3aP2gTYRjH8e+TpK2iiIIFEUFpi/+D1qb+oZ2UOujgIOIiLnVwcXCwtAlCkKQKOgjiYBHUxaEVQXGxq1Tb9FJRsai14h8otVVcFLXXu8fBDsFByuWSN+L7WQJH3vf58YO7I7kDy7Isy7L+VxJ04c5OXePFaPCEL3i4AtN1Y0z19YkXZsBSC1xAc1K7VOj+47ACbwRGfBgRnwf6mVy+R9ziYpZOLOT9BKhXqBc4RASklm+JlA4I3PlZxa2naZkKeWZRImWYsQjYq3C52mUikdL+RFKPNpzQmjA2j3fqsuak7gm6vhwFFIoCbQg3li7hbVNSTzd2aW3QzZqSuq0mykNge9A9yl1AoRUinIlGeJ9I6dXmpG6d78LGtK5MpPSSCIPA+mJChH0NCGIB0K5CeyKlz1S4h89ArJonsxN8zPeIu+ukLvQWs9ZXWlH24bJ7bl3RKqGAQnFR4gh4LkgtJFKKC+CXZqDJU6Ai2AJMBzDNFmA6gGm2ANMBTLMFmA5gmi3AdADTbAGmA5hmCzAdwDRbgOkApoX2j5DAoAq9vocjMWbEZxWwDmgDWoCqsGaFKbQCVLjuZORKwaGhuc/uprQuF5cjwDFgU1gzw1CWUyCflk9OVi46WeIIB4BcOebOR5mvAaJORu46WdkhwkHgQ9E7wtSscDPoemMXweGM3P5exUaFC0DQZ4fTAvsfZ+Vd0BxG7wLP0/I1n5VTEZ/NKvTy++Hq/AiPokJLLitOMRkq4jaYOyuv8hk5jLAB4Tww/pevjyAcd2K0DmVkrNjZFfVgxMnIS6AD6GhO6wpvhi1RYbWv+BJhyp9ldOScvA5zZkUVUGg4LZPAZKnnVMQpYJItwHQA02wBpgOYZgswHcA0W4DpAKbZAkwHMC20AlT5EdZe5RRWAeORKu6HtFdZBf81WM0136NfYKbuBaP/2mvylmVZlmVZvwDZmcBBeFfe1QAAAABJRU5ErkJggg==)
no-repeat center;
- background:
url(//bits.beta.wmflabs.org/static-master/extensions/MobileApp/less/../images/flag-light.png?2014-07-29T19:15:00Z)
no-repeat center!ie;
- border: 1px solid #347BFF;
- border-radius: 4px;
- display: inline-block;
+ /*height: 32px;*/
+ /*width: 36px;*/
+ /*padding-left: 30px;*/
+ /*padding-right: 8px; */
+ /*background-size: 24px 24px;*/
+ /*background:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAACzklEQVR4nO3aP2gTYRjH8e+TpK2iiIIFEUFpi/+D1qb+oZ2UOujgIOIiLnVwcXCwtAlCkKQKOgjiYBHUxaEVQXGxq1Tb9FJRsai14h8otVVcFLXXu8fBDsFByuWSN+L7WQJH3vf58YO7I7kDy7Isy7L+VxJ04c5OXePFaPCEL3i4AtN1Y0z19YkXZsBSC1xAc1K7VOj+47ACbwRGfBgRnwf6mVy+R9ziYpZOLOT9BKhXqBc4RASklm+JlA4I3PlZxa2naZkKeWZRImWYsQjYq3C52mUikdL+RFKPNpzQmjA2j3fqsuak7gm6vhwFFIoCbQg3li7hbVNSTzd2aW3QzZqSuq0mykNge9A9yl1AoRUinIlGeJ9I6dXmpG6d78LGtK5MpPSSCIPA+mJChH0NCGIB0K5CeyKlz1S4h89ArJonsxN8zPeIu+ukLvQWs9ZXWlH24bJ7bl3RKqGAQnFR4gh4LkgtJFKKC+CXZqDJU6Ai2AJMBzDNFmA6gGm2ANMBTLMFmA5gmi3AdADTbAGmA5hmCzAdwDRbgOkApoX2j5DAoAq9vocjMWbEZxWwDmgDWoCqsGaFKbQCVLjuZORKwaGhuc/uprQuF5cjwDFgU1gzw1CWUyCflk9OVi46WeIIB4BcOebOR5mvAaJORu46WdkhwkHgQ9E7wtSscDPoemMXweGM3P5exUaFC0DQZ4fTAvsfZ+Vd0BxG7wLP0/I1n5VTEZ/NKvTy++Hq/AiPokJLLitOMRkq4jaYOyuv8hk5jLAB4Tww/pevjyAcd2K0DmVkrNjZFfVgxMnIS6AD6GhO6wpvhi1RYbWv+BJhyp9ldOScvA5zZkUVUGg4LZPAZKnnVMQpYJItwHQA02wBpgOYZgswHcA0W4DpAKbZAkwHMC20AlT5EdZe5RRWAeORKu6HtFdZBf81WM0136NfYKbuBaP/2mvylmVZlmVZvwDZmcBBeFfe1QAAAABJRU5ErkJggg==)
no-repeat center;*/
+ /*background:
url(//bits.beta.wmflabs.org/static-master/extensions/MobileApp/less/../images/flag-light.png?2014-07-29T19:15:00Z)
no-repeat center!ie;*/
+ /*border: 1px solid #347BFF;*/
+ /*border-radius: 4px;*/
+ text-decoration: none;
+ color: #555555;
+ float: left;
}
.content-rtl a.issues_button {
/* Flip it! */
@@ -618,24 +632,26 @@
transform: scaleX(-1);
}
a.issues_button:active {
- border: 4px solid #347BFF;
+ /*border: 4px solid #347BFF;*/
+ color: #ffffff;
}
a.disambig_button {
- height: 32px;
- padding-left: 8px;
- padding-right: 8px;
- padding-top: 2px;
- margin-right: 8px;
- border: 1px solid #347BFF;
- border-radius: 4px;
- display: inline-block;
+
+ /*height: 32px;*/
+ /*padding-left: 8px;*/
+ /*padding-right: 8px;*/
+ /*padding-top: 2px;*/
+ /*margin-right: 8px;*/
+ /*border: 1px solid #347BFF;*/
+ /*border-radius: 4px;*/
+ /*display: inline-block;*/
text-decoration: none;
- color: #347BFF;
+ color: #555555;
float: left;
}
a.disambig_button:active {
- background-color: #347BFF;
+ /*background-color: #347BFF;*/
color: #ffffff;
}
@@ -953,4 +969,4 @@
-moz-column-count: 1 !important;
-webkit-column-count: 1 !important;
column-count: 1 !important;
-}
\ No newline at end of file
+}
diff --git a/www/js/issues.js b/www/js/issues.js
index 1db6f17..cf0bc66 100644
--- a/www/js/issues.js
+++ b/www/js/issues.js
@@ -9,6 +9,7 @@
var link = document.createElement( 'a' );
link.setAttribute( 'href', '#issues' );
link.className = 'issues_button';
+ link.innerText = 'Page issues';
wrapper.appendChild( link );
el.parentNode.replaceChild( wrapper, el );
var i = 0,
--
To view, visit https://gerrit.wikimedia.org/r/153705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8c0732449ba2150c97e8c0bef407c345bc63c4f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
