From 05a6fd0ab7ec018edf16716046ddb02d17c86fd4 Mon Sep 17 00:00:00 2001 From: Gabriel Wicke Date: Fri, 23 Apr 2004 23:11:52 +0000 Subject: [PATCH] thumb formatting tweaks * thumbs look very similar across the skins now (including monobook) * no fixed width on the outer div * multiple classes on the outer div --- includes/Skin.php | 2 +- stylesheets/common.css | 58 +++++++++++++------------ stylesheets/monobook/IE60Fixes.css | 3 ++ stylesheets/monobook/main.css | 68 +++++++++++++----------------- stylesheets/nostalgia.css | 2 +- 5 files changed, 64 insertions(+), 69 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index ee23afee75..098dc0a02d 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1785,7 +1785,7 @@ class Skin { $magnifyalign = $wgLang->isRTL() ? "left" : "right"; $textalign = $wgLang->isRTL() ? ' style="text-align:right"' : ""; - $s = "
"; + $s = "
"; if ( $thumbUrl == "" ) { $s .= str_replace( "$1", $name, wfMsg("missingimage") ); $zoomicon = ''; diff --git a/stylesheets/common.css b/stylesheets/common.css index a75958762c..6afed32003 100644 --- a/stylesheets/common.css +++ b/stylesheets/common.css @@ -26,40 +26,42 @@ table.rimage { } /* thumbnails */ -div.thumbnail-none, div.thumbnail-right, div.thumbnail-left { - border: 1px solid #8888aa; - background-color: #f7f8ff; - padding: 2px; - margin: 10px; - font-size: smaller; - text-align: center; +div.thumb { + margin: 10px; + text-align: center; + width: auto; } - - -div.thumbnail-none img, div.thumbnail-right img, div.thumbnail-left img { - border:1px solid #8888AA; - margin-bottom:3px; - background:#FFFFFF; +div.thumb div { + border: 1px solid #8888aa; + background-color: #f7f8ff; + padding: 2px; + font-size: 94%; } - -div.magnify img { - border: 0px; - background: none; +div.thumb div * { + border: none; + background: none; +} +div.thumb img { + border:1px solid #8888AA; + margin-bottom:3px; + background:#FFFFFF; +} +div.thumbcaption, +div.thumbcaption * { + border: none !important; + background: none !important; } - div.thumbcaption { - margin-top:3px; margin-bottom:3px; - text-align: left; + padding: 0.2em 0 0.2em 0 !important; + text-align: left !important; } - -div.thumbnail-right { - float: right; - margin-left:0.5em; +div.tright { + float: right; + margin-left:0.5em; } - -div.thumbnail-left { - float: left; - margin-right:0.5em; +div.tleft { + float: left; + margin-right:0.5em; } table.diff { diff --git a/stylesheets/monobook/IE60Fixes.css b/stylesheets/monobook/IE60Fixes.css index 15a74c5006..5ba16c0794 100644 --- a/stylesheets/monobook/IE60Fixes.css +++ b/stylesheets/monobook/IE60Fixes.css @@ -66,4 +66,7 @@ textarea { text-align: left; overflow: hidden; } +div.editsection { + position: relative; +} /*{ border:1px solid Red !important;}*/ diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css index 653e1b3170..55e4dce409 100644 --- a/stylesheets/monobook/main.css +++ b/stylesheets/monobook/main.css @@ -366,7 +366,7 @@ a.new { color:#ba0000; text-decoration:none; } margin-bottom: 0px; } .toctoggle, .editsection { - font-size: smaller; + font-size: 94%; } /* images */ div.floatright { @@ -386,55 +386,34 @@ div.floatleft { } div.floatleft p { font-style: italic; } /* thumbnails */ -div.thumbnail-none, -div.thumbnail-right, -div.thumbnail-left { +div.thumb { + margin-bottom: 0.5em; + border-style: solid; border-color: White; + width: auto; +} +div.thumb div { + border:1px solid #cccccc; + padding: 3px !important; background-color:#f9f9f9; - padding: none; - margin: 0.3em 0 0.5em; - font-size: 95%; + font-size: 94%; } -div.thumbnail-none div, -div.thumbnail-right div, -div.thumbnail-left div { +div.thumb div a img { border:1px solid #cccccc; - text-align: center; } div div.thumbcaption { border: none; text-align: left; - padding: 2px; + padding: 0.3em 0 0.2em 0 !important; } -div.thumbnail-right { +div.magnify { float: right; - border-style: solid; - border-color: White; - border-width: 0.5em 0 0.8em 1.4em; -} -div div.magnify { border: none !important; - background: url(magnify-clip.png) center no-repeat; - width: 20px; - height: 20px; - float: right; - margin: 0; + background: none !important; } -div div.magnify a { +div.magnify a, div.magnify img { display: block; - width: 100%; - height: 100%; - cursor: pointer; - border: none; -} -div.magnify img { - visibility: hidden; -} -div.thumbnail-left { - float: left; - margin-right:0.5em; - border-style: solid; - border-color: White; - border: 0.5em 1.4em 0.8em 0; + border: none !important; + background: none !important; } /* table standards */ table.rimage { @@ -445,7 +424,15 @@ table.rimage { margin-bottom:1em; text-align:center; } - +div.tright { + float: right; + border-width: 0.5em 0 0.8em 1.4em; +} +div.tleft { + float: left; + margin-right:0.5em; + border: 0.5em 1.4em 0.8em 0; +} /* ** Link rendering */ @@ -985,6 +972,9 @@ head:first-child+body #portal-footer li { overflow: auto; width: 100%; } +* html div.editsection { + font-size: smaller; +} /* opera 6 fixes */ html>body #portal-column-one { diff --git a/stylesheets/nostalgia.css b/stylesheets/nostalgia.css index 3ee1f989c3..f07e3a64e1 100644 --- a/stylesheets/nostalgia.css +++ b/stylesheets/nostalgia.css @@ -1,4 +1,4 @@ -@import url("common.css") +@import url("common.css"); body { /* Background color is set separately on page type */ color: black; -- 2.20.1