From 0e2a5d6affb1ade8b0dea6721665e02210d2a8ae Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 23 May 2007 20:09:55 +0000
Subject: [PATCH] Use proper CSS class instead of hardcoded style for new thumb
 parameter 'border', per hint of Brion

---
 includes/DefaultSettings.php |  2 +-
 includes/Linker.php          | 10 +++++-----
 skins/chick/main.css         |  5 ++++-
 skins/common/common.css      |  4 ++++
 skins/common/commonPrint.css |  3 +++
 skins/monobook/main.css      |  4 +++-
 skins/simple/main.css        |  5 ++++-
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ad685ad1b8..a8899d2f32 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1125,7 +1125,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '72';
+$wgStyleVersion = '73';
 
 
 # Server-side caching:
diff --git a/includes/Linker.php b/includes/Linker.php
index 8575403e8a..4161f2169e 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -486,11 +486,11 @@ class Linker {
 			'longdesc' => $u
 		);
 
-		$borderStyle = $border ? 'border: solid 1px #dddddd;' : '';
 		if ( $valign ) {
-			$imgAttribs['style'] = "$borderStyle vertical-align: $valign";
-		} elseif ( $border ) {
-			$imgAttribs['style'] = "$borderStyle";
+			$imgAttribs['style'] = "vertical-align: $valign";
+		}
+		if ( $border ) {
+			$imgAttribs['class'] = "thumbborder";
 		}
 		$linkAttribs = array(
 			'href' => $u,
@@ -504,7 +504,7 @@ class Linker {
 			$s = $thumb->toHtml( $imgAttribs, $linkAttribs );
 		}
 		if ( '' != $align ) {
-			$s = "<div class=\"float{$align}\"><span>{$s}</span></div>";
+			$s = "<div class=\"float{$align}\">{$s}</div>";
 		}
 		return str_replace("\n", ' ',$prefix.$s.$postfix);
 	}
diff --git a/skins/chick/main.css b/skins/chick/main.css
index 997dd5111f..b28f384cdc 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -321,6 +321,9 @@ div.tleft {
     margin-right:0.5em;
     border-width: 0.5em 1.4em 0.8em 0;
 }
+img.thumbborder {
+	border: 1px solid #dddddd;
+}
 
 .hiddenStructure {
     display: none;
@@ -474,4 +477,4 @@ div.gallerytext {
 .mw-plusminus-null { color: #aaa; }
 .texvc { direction: ltr; unicode-bidi: embed; }
 /* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
\ No newline at end of file
+#toolbar, #wpTextbox1 { clear: both; }
diff --git a/skins/common/common.css b/skins/common/common.css
index 25b716cc7b..f1251a834a 100644
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -95,6 +95,9 @@ div.tleft {
 	margin-right: .5em;
 	border-width: .5em 1.4em .8em 0;
 }
+img.thumbborder {
+	border: 1px solid #dddddd;
+}
 
 /* Page history styling */
 /* the auto-generated edit comments */
@@ -473,3 +476,4 @@ p.mw-ipb-conveniencelinks {
 	font-size: 90%;
 }
 
+
diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 4fddafaad9..a7d49e3643 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -73,6 +73,9 @@ div.tleft {
     margin-right:0.5em;
     border-width: 0.5em 1.4em 0.8em 0;
 }
+img.thumbborder {
+	border: 1px solid #dddddd;
+}
 
 /* table standards */
 table.rimage {
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 4b9dd358df..db312a2e9b 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -485,7 +485,9 @@ div.tleft {
 	margin-right: .5em;
 	border-width: .5em 1.4em .8em 0;
 }
-
+img.thumbborder {
+	border: 1px solid #dddddd;
+}
 .hiddenStructure {
 	display: none;
 	speak: none;
diff --git a/skins/simple/main.css b/skins/simple/main.css
index ea682ecc55..24f5cc5b2e 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -346,6 +346,9 @@ div.tleft {
     margin-right:0.5em;
     border-width: 0.5em 1.4em 0.8em 0;
 }
+img.thumbborder {
+	border: 1px solid #dddddd;
+}
 
 a.stub { color: #772233; }
 a.new,
@@ -451,4 +454,4 @@ table.collapsed tr.collapsable {
 #file img, .gallerybox .thumb img {
 	background: url(../common/images/Checker-16x16.png) repeat;
 }
-*/
\ No newline at end of file
+*/
-- 
2.20.1