From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 skins/Vector/components/animations.less | 28 ---------------------------
 skins/Vector/components/common.less     | 34 ++++++++++++++++++++++++---------
 skins/Vector/components/navigation.less | 19 +++++++++---------
 skins/Vector/components/tabs.less       |  1 -
 4 files changed, 35 insertions(+), 47 deletions(-)
 delete mode 100644 skins/Vector/components/animations.less

(limited to 'skins/Vector/components')

diff --git a/skins/Vector/components/animations.less b/skins/Vector/components/animations.less
deleted file mode 100644
index ab273dc0..00000000
--- a/skins/Vector/components/animations.less
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Animate between standard and high definition layouts */
-body.vector-animateLayout {
-	.mw-body,
-	div#footer,
-	#left-navigation {
-		.transition(margin-left 250ms, padding 250ms;);
-	}
-
-	#p-logo {
-		.transition(left 250ms);
-	}
-
-	#mw-panel {
-		.transition(padding-right 250ms);
-	}
-
-	#p-search {
-		.transition(margin-right 250ms);
-	}
-
-	#p-personal {
-		.transition(right 250ms);
-	}
-
-	#mw-head-base {
-		.transition(margin-left 250ms);
-	}
-}
diff --git a/skins/Vector/components/common.less b/skins/Vector/components/common.less
index ac4b8509..088b373e 100644
--- a/skins/Vector/components/common.less
+++ b/skins/Vector/components/common.less
@@ -50,16 +50,14 @@ body {
 	}
 
 	h1,
-	h2,
-	#firstHeading {
+	h2 {
 		font-family: @content-heading-font-family;
 		line-height: @heading-line-height;
 		margin-bottom: 0.25em;
 		padding: 0;
 	}
 
-	h1,
-	#firstHeading {
+	h1 {
 		font-size: @content-heading-font-size;
 	}
 
@@ -98,6 +96,27 @@ body {
 		font-size: 100%; /* (reset) */
 		font-family: @content-font-family;
 	}
+
+	.firstHeading {
+		/* Change the default from mediawiki.skinning CSS to let indicators float into heading area */
+		overflow: visible;
+	}
+
+	.mw-indicators {
+		float: right;
+		line-height: @content-line-height;
+		font-size: @content-font-size;
+		/* Ensure that this is displayed on top of .mw-body-content and clickable */
+		position: relative;
+		z-index: 1;
+	}
+
+	.mw-indicator {
+		display: -moz-inline-block;
+		display: inline-block;
+		zoom: 1;
+		*display: inline;
+	}
 }
 
 /* Hide empty portlets */
@@ -107,7 +126,7 @@ div.emptyPortlet {
 
 ul {
 	list-style-type: disc;
-	.list-style-image('images/bullet-icon.png');
+	.list-style-image-svg('images/bullet-icon.svg', 'images/bullet-icon.png');
 }
 
 pre, .mw-code {
@@ -123,12 +142,9 @@ pre, .mw-code {
 	font-size: 140%;
 }
 
-.redirectMsg img {
-	vertical-align: text-bottom;
-}
-
 .mw-body-content {
 	position: relative;
 	line-height: @content-line-height;
 	font-size: @content-font-size;
+	z-index: 0;
 }
diff --git a/skins/Vector/components/navigation.less b/skins/Vector/components/navigation.less
index 8b384acf..e9c5e4af 100644
--- a/skins/Vector/components/navigation.less
+++ b/skins/Vector/components/navigation.less
@@ -129,16 +129,17 @@ div#mw-panel {
 				}
 			}
 		}
+	}
 
-		&.first {
-			background-image: none;
-			margin-top: 0;
-			h3 {
-				display: none;
-			}
-			div.body {
-				margin-left: 0.5em;
-			}
+	/* First sidebar portlet. Not using :first-of-type for IE<=8 support. */
+	#p-logo + div.portal {
+		background-image: none;
+		margin-top: 0;
+		h3 {
+			display: none;
+		}
+		div.body {
+			margin-left: 0.5em;
 		}
 	}
 }
diff --git a/skins/Vector/components/tabs.less b/skins/Vector/components/tabs.less
index a5647345..2d28d938 100644
--- a/skins/Vector/components/tabs.less
+++ b/skins/Vector/components/tabs.less
@@ -134,7 +134,6 @@ div#mw-head div.vectorMenu h3 {
 	.background-image('images/tab-break.png');
 	background-repeat: no-repeat;
 	background-position: bottom right;
-	margin-left: -1px;
 	font-size: 1em;
 	height: 2.5em;
 	// This effectively moves the "background border" outside of the element to act like a real
-- 
cgit v1.2.2