From 213faca8ed4a51a49ca280475a884f67104b7ca5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 6 Jun 2004 05:36:39 +0000
Subject: Merge to HEAD; 1.3.0beta2

---
 stylesheets/common.css | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'stylesheets/common.css')

diff --git a/stylesheets/common.css b/stylesheets/common.css
index 712e4fe78ae0..a7f5e02d3756 100644
--- a/stylesheets/common.css
+++ b/stylesheets/common.css
@@ -66,7 +66,7 @@ div.tleft {
 
 /* Page history styling */
 /* the auto-generated edit comments */
-.autocomment { color: gray; }
+.autocomment { color: #4b4b4b; }
 #pagehistory span.user { 
     margin-left: 1.4em;
     margin-right: 0.4em;
@@ -107,6 +107,14 @@ img.tex { vertical-align: middle; }
         padding: 5px;
         font-size: 95%;
 }
+#toc .tocindent { margin-left: 2em; }
+#toc .tocline { margin-bottom: 0px; }
+#toc p { margin: 0 }
+#toc .toctoggle { font-size: 94%; }
+#toc .editsection { 
+    margin-top: 0.7em; 
+    font-size: 94%;
+}
 
 .error {
 	color: red;
@@ -140,3 +148,38 @@ div.prefsectiontip {
 }
 fieldset.prefsection { margin-top: 1em }
 fieldset.operaprefsection { margin-left: 15em }
+
+/* emulate center */
+.center {
+    width: 100%;
+    text-align: center;
+}
+*.center * {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+div.townBox {
+    position:relative;
+    float:right;
+    background:White;
+    margin-left:1em;
+    border: 1px solid Grey;
+    padding:0.3em;
+    width: 200px;
+    overflow: hidden;
+    clear: right;
+}
+div.townBox dl {
+    padding: 0;
+    margin: 0 0 0.3em 0; 
+    font-size: 96%;
+}
+div.townBox dl dt {
+    background: none;
+    margin: 0.4em 0 0 0;
+}
+div.townBox dl dd {
+    margin: 0.1em 0 0 1.1em;
+    background-color: #f3f3f3;
+}
-- 
cgit v1.2.3


From 1d6017272668b85e6944039381854a3851b6ae01 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 13 Jun 2004 01:15:16 +0000
Subject: Merge 1.3.0beta3 from HEAD

---
 stylesheets/common.css | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'stylesheets/common.css')

diff --git a/stylesheets/common.css b/stylesheets/common.css
index a7f5e02d3756..b32503f42fb4 100644
--- a/stylesheets/common.css
+++ b/stylesheets/common.css
@@ -18,7 +18,6 @@ div.floatleft p { font-style: italic; }
 /* table standards */
 table.rimage {
         float:right;
-        width:1pt;
         margin-left:1em;
         margin-bottom:1em;
         text-align:center;
@@ -30,6 +29,7 @@ div.thumb {
     margin: 10px;
     text-align: center;
     width: auto;
+    overflow: hidden;
 }
 div.thumb div {
     border: 1px solid #8888aa;
@@ -78,27 +78,26 @@ div.tleft {
     border:1px dashed #aaaaaa;
 }
 
-table.diff {
-        background:white;
-}
-td.diff-otitle {
-        background:#cccccc;
-}
-td.diff-ntitle {
-        background:#cccccc;
+table.diff { background:white; }
+td.diff-otitle { background:#cccccc; }
+td.diff-ntitle { background:#cccccc; }
+td.diff-addedline { 
+    background:#ccffcc;
+    font-size: smaller;
 }
-td.diff-addedline {
-        background:#ccffcc;
-}
-td.diff-deletedline {
-        background:#ffffaa;
+td.diff-deletedline { 
+    background:#ffffaa;
+    font-size: smaller;
 }
 td.diff-context {
-        background:#eeeeee;
+    background:#eeeeee;
+    font-size: smaller;
 }
+span.diffchange { color: red; }
 
 img { border: none; }
 img.tex { vertical-align: middle; }
+span.texhtml { font-family: serif; }
 
 
 #toc {
@@ -183,3 +182,10 @@ div.townBox dl dd {
     margin: 0.1em 0 0 1.1em;
     background-color: #f3f3f3;
 }
+/* use this instead of #toc for page content */
+.toccolours { 
+    border:1px solid #aaaaaa;
+    background-color:#f9f9f9;
+    padding:5px;
+    font-size: 95%;
+}
-- 
cgit v1.2.3