Update to MediaWiki 1.25.1

7 files changed, 41 insertions, 23 deletions

diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css
index 7a417081..7dd5ee7f 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -8,7 +8,8 @@
 /* Table of Contents */
 #toc,
 .toc,
-.mw-warning {
+.mw-warning,
+.toccolours {
 	border: 1px solid #aaa;
 	background-color: #f9f9f9;
 	padding: 5px;
@@ -87,13 +88,6 @@ table.toc td {
 	font-size: 94%;
 }
 
-.toccolours {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-}
-
 /* Warning */
 .mw-warning {
 	margin-left: 50px;
@@ -165,8 +159,13 @@ div.magnify a {
 	width: 15px;
 	height: 11px;
 	/* Default styles when there's no .mw-content-ltr or .mw-content-rtl, overridden below */
+
+	/* Use same SVG support hack as mediawiki.legacy's shared.css */
+	background-image: url(images/magnify-clip-ltr.png);
+	/* @embed */
+	background-image: -webkit-linear-gradient(transparent, transparent), url(images/magnify-clip-ltr.svg);
 	/* @embed */
-	background: url(images/magnify-clip-ltr.png) center center no-repeat;
+	background-image: linear-gradient(transparent, transparent), url(images/magnify-clip-ltr.svg);
 	/* Don't annoy people who copy-paste everything too much */
 	-moz-user-select: none;
 	-webkit-user-select: none;
@@ -194,8 +193,12 @@ img.thumbborder {
 
 /* @noflip */
 .mw-content-ltr div.magnify a {
-	/* @embed */
+	/* Use same SVG support hack as mediawiki.legacy's shared.css */
 	background-image: url(images/magnify-clip-ltr.png);
+	/* @embed */
+	background-image: -webkit-linear-gradient(transparent, transparent), url(images/magnify-clip-ltr.svg);
+	/* @embed */
+	background-image: linear-gradient(transparent, transparent), url(images/magnify-clip-ltr.svg);
 }
 
 /* @noflip */
@@ -212,8 +215,12 @@ img.thumbborder {
 
 /* @noflip */
 .mw-content-rtl div.magnify a {
-	/* @embed */
+	/* Use same SVG support hack as mediawiki.legacy's shared.css */
 	background-image: url(images/magnify-clip-rtl.png);
+	/* @embed */
+	background-image: -webkit-linear-gradient(transparent, transparent), url(images/magnify-clip-rtl.svg);
+	/* @embed */
+	background-image: linear-gradient(transparent, transparent), url(images/magnify-clip-rtl.svg);
 }
 
 /* @noflip */
diff --git a/resources/src/mediawiki.skinning/elements.css b/resources/src/mediawiki.skinning/elements.css
index 392a2a66..8140d1a5 100644
--- a/resources/src/mediawiki.skinning/elements.css
+++ b/resources/src/mediawiki.skinning/elements.css
@@ -112,7 +112,7 @@ h6 {
 }
 
 h3 {
-	font-size: 132%;
+	font-size: 128%;
 }
 
 h4 {
@@ -141,7 +141,6 @@ h5 {
 
 p {
 	margin: .4em 0 .5em 0;
-	line-height: 1.5em;
 }
 
 p img {
@@ -149,14 +148,12 @@ p img {
 }
 
 ul {
-	line-height: 1.5em;
 	list-style-type: square;
 	margin: .3em 0 0 1.6em;
 	padding: 0;
 }
 
 ol {
-	line-height: 1.5em;
 	margin: .3em 0 0 3.2em;
 	padding: 0;
 	list-style-image: none;
@@ -177,17 +174,10 @@ dl {
 }
 
 dd {
-	line-height: 1.5em;
 	margin-left: 1.6em;
 	margin-bottom: .1em;
 }
 
-/* IE 6 and 7 lack support for quotes aroud the <q> element ('::before' and '::after'
-   pseudoelements, 'quotes' property). Let's italicize it instead (using the star hack). */
-q {
-	*font-style: italic;
-}
-
 pre, code, tt, kbd, samp, .mw-code {
 	/*
 	 * Some browsers will render the monospace text too small, namely Firefox, Chrome and Safari.
@@ -221,7 +211,6 @@ fieldset {
 	border: 1px solid #2f6fab;
 	margin: 1em 0 1em 0;
 	padding: 0 1em 1em;
-	line-height: 1.5em;
 }
 
 fieldset.nested {
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
index 00a9cee1..712b1b48 100644
--- a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.svg b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.svg
new file mode 100644
index 00000000..4d3dcb65
--- /dev/null
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 15" width="15" height="11">
+    <g id="magnify-clip" fill="#fff" stroke="#000">
+        <path id="bigbox" d="M1.509 1.865h10.99v7.919h-10.99z"/>
+        <path id="smallbox" d="M-1.499 6.868h5.943v4.904h-5.943z"/>
+    </g>
+</svg>
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
index ff85c077..1d03a8c0 100644
--- a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.svg b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.svg
new file mode 100644
index 00000000..582e4ae7
--- /dev/null
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 15" width="15" height="11">
+    <g id="magnify-clip" fill="#fff" stroke="#000">
+        <path id="bigbox" d="M9.491 1.865h-10.99v7.919h10.99z"/>
+        <path id="smallbox" d="M12.499 6.868h-5.943v4.904h5.943z"/>
+    </g>
+</svg>
diff --git a/resources/src/mediawiki.skinning/interface.css b/resources/src/mediawiki.skinning/interface.css
index 398a132d..b57ee367 100644
--- a/resources/src/mediawiki.skinning/interface.css
+++ b/resources/src/mediawiki.skinning/interface.css
@@ -15,6 +15,14 @@
 	clear: both;
 }
 
+.editOptions {
+	background-color: #F0F0F0;
+	border: 1px solid silver;
+	border-top: none;
+	padding: 1em 1em 1.5em 1em;
+	margin-bottom: 2em;
+}
+
 .usermessage {
 	background-color: #ffce7b;
 	border: 1px solid #ffa500;