Mercurial > moin > 1.9

changeset 308:4e78d0982f01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
css: removed debug stuff, fixed classic imported from: moin--main--1.5--patch-312
author Thomas Waldmann <tw@waldmann-edv.de>
date Mon, 12 Dec 2005 18:05:16 +0000
parents af55eede8076
children a59335030db8
files MoinMoin/theme/classic.py wiki/htdocs/classic/css/screen.css wiki/htdocs/modern/css/screen.css
diffstat 3 files changed, 33 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/theme/classic.py	Mon Dec 12 16:29:57 2005 +0000
+++ b/MoinMoin/theme/classic.py	Mon Dec 12 18:05:16 2005 +0000
@@ -112,8 +112,10 @@
 %(logo_html)s
 %(search_form_html)s
 %(username_html)s
+<div id="locationline">
 %(interwiki_html)s
 %(title_html)s
+</div>
 %(trail_html)s
 %(iconbar_html)s
 %(navibar_html)s
--- a/wiki/htdocs/classic/css/screen.css	Mon Dec 12 16:29:57 2005 +0000
+++ b/wiki/htdocs/classic/css/screen.css	Mon Dec 12 18:05:16 2005 +0000
@@ -84,6 +84,7 @@
 
 #username {
     display: inline;
+    margin: 0;
     padding: 0;
     text-align: right;
     font-size: 0.82em;
@@ -96,7 +97,7 @@
 
 #username li {
     display: inline;
-    padding: 0 0.2em;
+    padding: 0 0.5em 0 0;
 }
 
 #username form {
@@ -111,13 +112,15 @@
     background-color: white; /* inherit is broken on IE */
     color: brown;
     font-size: 0.82em;
+    cursor: pointer;
+    text-decoration: underline;
 }
 
 #pagetrail {
     clear: right;
     display: block;
-    margin: 4px;
-    padding: 0 10px;
+    margin: 0.2em 0;
+    padding: 0;
     font-size: 0.88em;
     height: 2em;
 }
@@ -127,36 +130,33 @@
 }
 
 #interwiki {
-    float: left;
-    margin: 8px 0;
-    padding: 0 2px;
-    font-size: 18px;
-}
-
-*[dir="rtl"] #interwiki {
-    float: right;
+    display: inline;
+    font-size: 1em;
 }
 
 #interwiki span:after {
-    content: ": ";
+    content: ":";
 }
 
-#pagelocation {
+#locationline {
     clear: right;
-    display: block;
-    margin: 8px 0;
-    padding: 0 10px;
-    font-size: 24px;
+    padding: 3px 0;
 }
-
-*[dir="rtl"] #pagelocation {
+  
+*[dir="rtl"] #locationline {
     clear: left;
 }
+  
+#pagelocation {
+    display: inline;
+    margin: 0 0.25em;
+    padding: 0;
+    font-size: 1.5em;
+}
 
 #pagetrail li, #pagelocation li {
-    display: inline; /* old: block */
-    padding: 0 2px;
-    margin: 0 0 5px 0; /* old: 5px 2px */
+    display: inline;
+    margin: 0;
 }
 
 /* XXX Warning: non-ascii characters! */
@@ -171,6 +171,12 @@
 #pagetrail li:last-child:after {
     content: "";
 }
+
+* html #pagetrail li, * html #pagelocation li { /* for broken IE */
+    border-left: 1px solid #AAA;
+    padding: 0 0.3em;
+}
+
 #pagelocation li:after {
     content: "/ ";
 }
@@ -206,8 +212,8 @@
 	clear: left;
 	margin: 0;
 	padding: 0;
-	font-size: 0.88em;
-	height: 2em;
+    font-size: 0.82em;
+    zoom: 1; /* for avoiding a gap between navibar and pageline on IE */
 }
 
 *[dir="rtl"] #navibar {
--- a/wiki/htdocs/modern/css/screen.css	Mon Dec 12 16:29:57 2005 +0000
+++ b/wiki/htdocs/modern/css/screen.css	Mon Dec 12 18:05:16 2005 +0000
@@ -148,7 +148,7 @@
     padding: 3px 0;
 }
 
-*[dir="rtl"] #loc {
+*[dir="rtl"] #locationline {
     clear: left;
 }
 
@@ -454,8 +454,3 @@
  */
 * html span.anchor { display: none; }
 
-/*
-ul {
-    border: 1px solid #9C9C9C;
-}
-*/