X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fwipi.git;a=blobdiff_plain;f=static%2Fexodus%2Fcss%2Fscreen.css;h=fcb680547650fdfa6fde740d38fe97d522056bbc;hp=1b9e207628f6cba29b6f3846d99a6e5335e359d1;hb=d9f67a806fcacf980379c2023294dac9f8913949;hpb=5a8db2f9310fc4677adc4a187516da4b48aac985

diff --git a/static/exodus/css/screen.css b/static/exodus/css/screen.css
index 1b9e207..fcb6805 100644
--- a/static/exodus/css/screen.css
+++ b/static/exodus/css/screen.css
@@ -1,5 +1,4 @@
 /*@import url('../../modern/css/screen.css');*/
-@import url("home.css");
 
 html, body {
 	margin:0px;
@@ -17,16 +16,14 @@ html {
 	font-size:11px;
 }
 
+a {color: #ffd200;}
+a:visited {color: #ffd200;}
+a.nonexistent, a.badinterwiki {color: #cc8900;}
+
 img {
 	border:0px;
 }
 
-#menubar li {
-	display: inline;
-	list-style-type: none;
-}
-
-
 body {
 	background-image: url('../img/background.jpg');
 	background-repeat: no-repeat;
@@ -34,13 +31,15 @@ body {
 }
 
 #header {
-	padding-top:70px;
+	/* Fit exactly into the header in the background, and push the menu bar in place */
+	padding-top: 70px;
+	height: 40px;
 	/* Center the header */
 	width:1024px;
 	margin:auto;
 }
 
-ul#menubar {
+#menubar ul {
 	/* Fit exactly into the bar in the background */
 	padding-top: 5px;
 	height:15px;
@@ -51,57 +50,115 @@ ul#menubar {
 	list-style-type:none;
 	list-style-position:outside;
 	/* Set the font size to fit exactly */
-	font-size: 15px;
+	font-size: 12px;
 	font-weight: bold;
 }
 
 /* Display next to each other instead of below */
-ul#menubar li {
+#menubar li, #menubar li p {
 	display:inline;
-	padding:0px 10px 0px 10px;
+}
+
+#menubar li p {
+	padding:0px 0px 0px 10px;
 	color:#5F3E06;
 	font-weight:bold;
 }
 
 /* Disable underlining and the default blue colour for links in the menubar */
-ul#menubar li a {
+#menubar li a {
 	color:#5F3E06;
 	text-decoration:none;
 }
 
-#footer {
-	/* Put a dotted line at the top of the footer */
-	border-top: 1px dotted #9C9C9C;
-	/* Include some spacing around the line */
-	padding-top: 5px;
-	margin-top: 5px;
+/* Give the menu bar links a hover color */
+#menubar li a:hover {
+	color:#FFD200;
 }
 
-/* Format the editbar, copied from modern theme */
+#page, #footer{
+	/* Center the page and footer, just like the header */
+	width:1024px;
+	margin-right: auto;
+	margin-left: auto;
+}
 
-.editbar {
-    float: left;
-    margin: 5px 0;
-    padding: 0;
+
+#pagetop {
+	width: 694px;
+	height:39px;
+	background-image:url('../img/perkamentTop.gif');
 }
 
-.editbar a, .editbar a:visited { color: #0044B3; }
+#pagemiddle {
+	background-image:url('../img/perkamentCenter.gif');
+	background-repeat:repeat-y;
+	/* Force a new block-formatting context, to prevent any margins from
+	 * content to stick out of this div, causing a gap between #pagetop
+	 * and #pagemiddle */
+	overflow: hidden;
+	/* Indent the text a bit, so it skips the jagged edges of the
+	 * background */
+	padding:0px 45px 0px 45px;
+	/* 694px image width minus two times 45px padding*/
+	width: 604px;
+	/* Set a font colour that's readable on the background image. We
+	 * should really also set a background colour here (for when images
+	 * are disabled), but it seems it's impossible to do that without the
+	 * colour showing always */
+	color:#731E01;
+	font-weight:bold;
+}
 
-.editbar form, .editbar form div {
-    display: inline;
-    margin: 0;
+#pagemiddle h1,
+#pagemiddle h2,
+#pagemiddle h3 {
+	color:#3F3426;
 }
 
-.editbar li {
-    display: inline;
-    padding: 0;
-    margin: 4px 6px;
+#pagemiddle h1 {
+	font-size:17px;
+}
+#pagemiddle h2 {
+	font-size:15px;
 }
 
-#footerbar {
+#pagemiddle a, #pagemiddle a:visited {color: #9F2900;}
+#pagemiddle a:hover, #pagemiddle a:visited:hover {color: #ffd200;}
+
+table {
+	border:0px;
+}
+/*Vaardigheden table*/
+table.border td {
+	border:0px;
+	border-bottom:1px solid #5A1800;
+}
+/* Header row of vaardigheden table*/
+tr.kop1 {
+	background-color:#BEAA76;
 }
 
-.editbar a, .editbar a:visited { color: #0044B3; }
+tr.kop2 {
+	background-color:#F1E5CB;
+}
+#pagebottom {
+	width: 694px;
+	height:37px;
+	background-image:url('../img/perkamentBottom.gif');
+}
+
+#footer {
+	/* Put a dotted line at the top of the footer */
+	border-top: 1px dotted #9C9C9C;
+	/* Include some spacing around the line */
+	padding-top: 5px;
+	margin-top: 5px;
+}
+
+
+#footerbar {
+}
 
 #editor {
     margin: 0;
@@ -118,88 +175,91 @@ ul#menubar li a {
     margin-top: 0.5em;
 }
 
+/* Format the pageinfo bar. */
+#pageinfo {
+    float: right;
+    margin: 0px 12px;
+}
 /* Format the username bar, copied from the modern theme */
 
 #username {
-    float: right;
+    float: left;
     display: inline;
-    margin: 5px 12px;
+    margin: 0px 12px;
     padding: 0;
     text-align: right;
     font-size: 0.82em;
     white-space: nowrap;
 }
 
-*[dir="rtl"] #username {
-    text-align: left;
-    margin: 5px 0px;
-}
-
 #username li {
     display: inline;
     padding: 0 0.5em 0 0;
 }
 
-#username form {
-    display: inline;
+#searchform {
+    /* Put the searchform below the pageinfo / username bar */
+    clear: both;
+    float: right;
+    /* Put a bit of offset between the pageinfo and searchform. Don't use
+     * margin here, that collapses with the floating pageinfo. */
+    padding-top: 10px;
+}
+
+.editbar {
+    /* Put a bit of offset between the pageinfo and searchform. Don't use
+     * margin here, that collapses with the floating pageinfo. */
+    /*padding-top: 10px;
+    margin: 5px 0;*/
+    /* Unset the default ul margins */
+    margin-top: 0px;
+    margin-bottom: 0px;
+    /* Put the editbar at the right side (but not over the image there */
+    float: right;
+    margin-right: 220px;
+    /* Prevent weird linebreaks */
+    white-space: nowrap;
 }
 
-#username input {
+.editbar form, .editbar form div {
     display: inline;
-    padding: 0;
     margin: 0;
-    border: none;
-    background: #E7E7E7; /* inherit doesnt work on IE */
-    color: blue;
-    font-size: 0.82em;
-    cursor: pointer;
 }
 
-#username input:hover {
-    color: red;
+.editbar li {
+ /*   display: inline;*/
+    padding: 0;
+    margin: 4px 6px;
 }
 
-/****************** Next pages ************************/
-.WipiContent {
-	float:left;
-	clear:left;
-	width:694px;
-	margin-top:10px;
-	background-image:url('img/perkamentCenter.gif');
-	background-position:center 39px;
-	background-repeat:repeat-y;
+img.Decorative {
+	border:3px double #cc8900;
 }
 
-.WipiTop {
-	width:100%;
-	height:39px;
-	margin:0px;
-	background-image:url('img/perkamentTop.gif');
-	background-repeat:no-repeat;
-	background-color:#5a1800;
+/* Diff view, copied from modern/screen.css */
+.diff-header {
+    font-weight: bold;
 }
 
-.WipiText {
-	width:624px; /*694 parent width minus two times 35px padding*/
-	margin:0px;
-	padding:0px 35px 0px 35px;
+.diff-title {
+    background-color: #C0C0C0;
 }
 
-.WipiText p {
-	color:#731E01;
-	font-weight:bold;
+.diff-added {
+    background-color: #E0FFE0;
+    vertical-align: sub;
 }
 
-.WipiBottom {
-	width:100%;
-	height:37px;
-	background-image:url('img/perkamentBottom.gif');
-	background-repeat:no-repeat;
-	background-color:#5a1800;
+.diff-removed {
+    background-color: #FFFFE0;
+    vertical-align: sub;
 }
 
-img.Decorative {
-	border:3px double #cc8900;
+.diff-added span {
+    background-color: #80FF80;
 }
 
+.diff-removed span {
+    background-color: #FFFF80;
+}
 /* vim: set sw=4 sts=4 expandtab */