Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/135731
Change subject: Update to latest styles
......................................................................
Update to latest styles
Change-Id: I4022831fd0bee990264340041ebf0963459dc36e
---
M wikipedia/assets/abusefilter.css
M wikipedia/assets/preview.css
M wikipedia/assets/styles.css
M wikipedia/res/values/last_updated.xml
4 files changed, 88 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/31/135731/1
diff --git a/wikipedia/assets/abusefilter.css b/wikipedia/assets/abusefilter.css
index f4303b9..e827249 100644
--- a/wikipedia/assets/abusefilter.css
+++ b/wikipedia/assets/abusefilter.css
@@ -188,7 +188,7 @@
* off special external link styling */
html {
-webkit-text-size-adjust: none;
- font-size: 90%;
+ font-size: 100%;
}
body {
font-family: "Helvetica Neue", "Helvetica", "Nimbus Sans L", "Arial",
"Liberation Sans", sans-serif;
@@ -200,6 +200,7 @@
line-height: 1.3;
}
.content {
+ line-height: 1.65;
margin: .8em 16px 0;
word-wrap: break-word;
}
@@ -210,22 +211,18 @@
.content h5,
.content h6 {
line-height: 1.3;
- font-family: Georgia, serif;
+ font-family: "Linux Libertine", Georgia, Times, serif;
padding: .5em 0;
}
.content p {
- margin-bottom: .7em;
+ margin: .5em 0 1em 0;
}
.content .thumb {
- margin: 15px 0 15px 0;
- border: 1px solid #ccc;
- border-radius: 5px;
- background: #f9f9f9;
- text-align: center;
+ margin: .6em 0;
/* bug 20030 */
}
.content .thumb .thumbinner {
- margin: 5px auto;
+ margin: 0 auto;
max-width: 100%;
}
.content .thumb .thumbinner > div {
@@ -233,17 +230,21 @@
width: auto !important;
clear: both !important;
}
-.content .thumb .thumbcaption {
- margin: 5px 10px 0;
- text-align: center;
- width: auto !important;
-}
.content .thumb .noresize {
width: 100%;
overflow-x: auto;
}
.content .thumb .noresize img {
max-width: none !important;
+}
+.content .thumbcaption {
+ margin: 0;
+ font-size: .8em;
+ line-height: 1.5;
+ text-align: left;
+ padding: 0 !important;
+ color: #777;
+ width: auto !important;
}
.content .thumbborder {
border: 1px solid #ccc;
@@ -334,13 +335,10 @@
}
code,
pre {
- padding: 0.2em 0.5em;
+ padding: 1em;
font-family: monospace;
border: solid 1px #CCC;
-}
-pre {
white-space: pre-wrap;
- padding: 1em;
}
dl {
margin-left: 1em;
@@ -350,8 +348,8 @@
}
.pre-content h1,
.content h1 {
- font-family: Georgia, serif;
- font-size: 1.8em;
+ font-family: "Linux Libertine", Georgia, Times, serif;
+ font-size: 1.7em;
}
h2 {
font-size: 1.5em;
@@ -372,6 +370,7 @@
sub,
sup {
font-size: 0.75em;
+ line-height: 1;
}
@media all and (max-width: 280px) {
body {
@@ -382,17 +381,23 @@
}
}
blockquote {
+ font-family: "Linux Libertine", Georgia, Times, serif;
+ font-size: 1.1em;
quotes: "\201C" "\201D";
- padding: 1em 0 1em 10px;
+ padding: 1em 25px 1em 30px;
position: relative;
}
blockquote:before {
content: open-quote;
font-size: 3em;
+ position: absolute;
+ left: 0;
+ top: 0;
}
blockquote:after {
- font-size: 3em;
content: close-quote;
+ font-size: 3em;
+ line-height: 1;
position: absolute;
right: 0;
bottom: 0;
@@ -501,10 +506,8 @@
.references li:target {
background-color: #ddeeff;
}
-.beta .dablink,
-.beta .rellink,
-.alpha .dablink,
-.alpha .rellink {
+.dablink,
+.rellink {
padding: 0 0 .6em 0;
color: #777;
font-size: .8em;
diff --git a/wikipedia/assets/preview.css b/wikipedia/assets/preview.css
index fa4f5f2..5302dea 100644
--- a/wikipedia/assets/preview.css
+++ b/wikipedia/assets/preview.css
@@ -145,7 +145,7 @@
* off special external link styling */
html {
-webkit-text-size-adjust: none;
- font-size: 90%;
+ font-size: 100%;
}
body {
font-family: "Helvetica Neue", "Helvetica", "Nimbus Sans L", "Arial",
"Liberation Sans", sans-serif;
@@ -157,6 +157,7 @@
line-height: 1.3;
}
.content {
+ line-height: 1.65;
margin: .8em 16px 0;
word-wrap: break-word;
}
@@ -167,22 +168,18 @@
.content h5,
.content h6 {
line-height: 1.3;
- font-family: Georgia, serif;
+ font-family: "Linux Libertine", Georgia, Times, serif;
padding: .5em 0;
}
.content p {
- margin-bottom: .7em;
+ margin: .5em 0 1em 0;
}
.content .thumb {
- margin: 15px 0 15px 0;
- border: 1px solid #ccc;
- border-radius: 5px;
- background: #f9f9f9;
- text-align: center;
+ margin: .6em 0;
/* bug 20030 */
}
.content .thumb .thumbinner {
- margin: 5px auto;
+ margin: 0 auto;
max-width: 100%;
}
.content .thumb .thumbinner > div {
@@ -190,17 +187,21 @@
width: auto !important;
clear: both !important;
}
-.content .thumb .thumbcaption {
- margin: 5px 10px 0;
- text-align: center;
- width: auto !important;
-}
.content .thumb .noresize {
width: 100%;
overflow-x: auto;
}
.content .thumb .noresize img {
max-width: none !important;
+}
+.content .thumbcaption {
+ margin: 0;
+ font-size: .8em;
+ line-height: 1.5;
+ text-align: left;
+ padding: 0 !important;
+ color: #777;
+ width: auto !important;
}
.content .thumbborder {
border: 1px solid #ccc;
@@ -291,13 +292,10 @@
}
code,
pre {
- padding: 0.2em 0.5em;
+ padding: 1em;
font-family: monospace;
border: solid 1px #CCC;
-}
-pre {
white-space: pre-wrap;
- padding: 1em;
}
dl {
margin-left: 1em;
@@ -307,8 +305,8 @@
}
.pre-content h1,
.content h1 {
- font-family: Georgia, serif;
- font-size: 1.8em;
+ font-family: "Linux Libertine", Georgia, Times, serif;
+ font-size: 1.7em;
}
h2 {
font-size: 1.5em;
@@ -329,6 +327,7 @@
sub,
sup {
font-size: 0.75em;
+ line-height: 1;
}
@media all and (max-width: 280px) {
body {
@@ -339,17 +338,23 @@
}
}
blockquote {
+ font-family: "Linux Libertine", Georgia, Times, serif;
+ font-size: 1.1em;
quotes: "\201C" "\201D";
- padding: 1em 0 1em 10px;
+ padding: 1em 25px 1em 30px;
position: relative;
}
blockquote:before {
content: open-quote;
font-size: 3em;
+ position: absolute;
+ left: 0;
+ top: 0;
}
blockquote:after {
- font-size: 3em;
content: close-quote;
+ font-size: 3em;
+ line-height: 1;
position: absolute;
right: 0;
bottom: 0;
@@ -458,10 +463,8 @@
.references li:target {
background-color: #ddeeff;
}
-.beta .dablink,
-.beta .rellink,
-.alpha .dablink,
-.alpha .rellink {
+.dablink,
+.rellink {
padding: 0 0 .6em 0;
color: #777;
font-size: .8em;
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index f4303b9..e827249 100644
--- a/wikipedia/assets/styles.css
+++ b/wikipedia/assets/styles.css
@@ -188,7 +188,7 @@
* off special external link styling */
html {
-webkit-text-size-adjust: none;
- font-size: 90%;
+ font-size: 100%;
}
body {
font-family: "Helvetica Neue", "Helvetica", "Nimbus Sans L", "Arial",
"Liberation Sans", sans-serif;
@@ -200,6 +200,7 @@
line-height: 1.3;
}
.content {
+ line-height: 1.65;
margin: .8em 16px 0;
word-wrap: break-word;
}
@@ -210,22 +211,18 @@
.content h5,
.content h6 {
line-height: 1.3;
- font-family: Georgia, serif;
+ font-family: "Linux Libertine", Georgia, Times, serif;
padding: .5em 0;
}
.content p {
- margin-bottom: .7em;
+ margin: .5em 0 1em 0;
}
.content .thumb {
- margin: 15px 0 15px 0;
- border: 1px solid #ccc;
- border-radius: 5px;
- background: #f9f9f9;
- text-align: center;
+ margin: .6em 0;
/* bug 20030 */
}
.content .thumb .thumbinner {
- margin: 5px auto;
+ margin: 0 auto;
max-width: 100%;
}
.content .thumb .thumbinner > div {
@@ -233,17 +230,21 @@
width: auto !important;
clear: both !important;
}
-.content .thumb .thumbcaption {
- margin: 5px 10px 0;
- text-align: center;
- width: auto !important;
-}
.content .thumb .noresize {
width: 100%;
overflow-x: auto;
}
.content .thumb .noresize img {
max-width: none !important;
+}
+.content .thumbcaption {
+ margin: 0;
+ font-size: .8em;
+ line-height: 1.5;
+ text-align: left;
+ padding: 0 !important;
+ color: #777;
+ width: auto !important;
}
.content .thumbborder {
border: 1px solid #ccc;
@@ -334,13 +335,10 @@
}
code,
pre {
- padding: 0.2em 0.5em;
+ padding: 1em;
font-family: monospace;
border: solid 1px #CCC;
-}
-pre {
white-space: pre-wrap;
- padding: 1em;
}
dl {
margin-left: 1em;
@@ -350,8 +348,8 @@
}
.pre-content h1,
.content h1 {
- font-family: Georgia, serif;
- font-size: 1.8em;
+ font-family: "Linux Libertine", Georgia, Times, serif;
+ font-size: 1.7em;
}
h2 {
font-size: 1.5em;
@@ -372,6 +370,7 @@
sub,
sup {
font-size: 0.75em;
+ line-height: 1;
}
@media all and (max-width: 280px) {
body {
@@ -382,17 +381,23 @@
}
}
blockquote {
+ font-family: "Linux Libertine", Georgia, Times, serif;
+ font-size: 1.1em;
quotes: "\201C" "\201D";
- padding: 1em 0 1em 10px;
+ padding: 1em 25px 1em 30px;
position: relative;
}
blockquote:before {
content: open-quote;
font-size: 3em;
+ position: absolute;
+ left: 0;
+ top: 0;
}
blockquote:after {
- font-size: 3em;
content: close-quote;
+ font-size: 3em;
+ line-height: 1;
position: absolute;
right: 0;
bottom: 0;
@@ -501,10 +506,8 @@
.references li:target {
background-color: #ddeeff;
}
-.beta .dablink,
-.beta .rellink,
-.alpha .dablink,
-.alpha .rellink {
+.dablink,
+.rellink {
padding: 0 0 .6em 0;
color: #777;
font-size: .8em;
diff --git a/wikipedia/res/values/last_updated.xml
b/wikipedia/res/values/last_updated.xml
index c5122ae..0862a1f 100644
--- a/wikipedia/res/values/last_updated.xml
+++ b/wikipedia/res/values/last_updated.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- timestamp of when the bundled styles were last updated in ISO 8601-->
- <string name="bundled_styles_updated">2014-05-24T00:00:00Z</string>
+ <string name="bundled_styles_updated">2014-05-27T00:00:00Z</string>
</resources>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/135731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4022831fd0bee990264340041ebf0963459dc36e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
