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=0fb84e8133f91fcb339e1b46f6a9e4c0990a626a;hb=d9f67a806fcacf980379c2023294dac9f8913949;hpb=93a8a6c69260cc3955a334545bd20bfc54c5eb5a

diff --git a/static/exodus/css/screen.css b/static/exodus/css/screen.css
index 0fb84e8..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;
@@ -25,12 +24,6 @@ img {
 	border:0px;
 }
 
-#menubar li {
-	display: inline;
-	list-style-type: none;
-}
-
-
 body {
 	background-image: url('../img/background.jpg');
 	background-repeat: no-repeat;
@@ -46,7 +39,7 @@ body {
 	margin:auto;
 }
 
-ul#menubar {
+#menubar ul {
 	/* Fit exactly into the bar in the background */
 	padding-top: 5px;
 	height:15px;
@@ -57,24 +50,32 @@ 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;
 }
 
+/* Give the menu bar links a hover color */
+#menubar li a:hover {
+	color:#FFD200;
+}
+
 #page, #footer{
 	/* Center the page and footer, just like the header */
 	width:1024px;
@@ -82,7 +83,70 @@ ul#menubar li a {
 	margin-left: auto;
 }
 
-h1 { margin: 0; padding: 0; }
+
+#pagetop {
+	width: 694px;
+	height:39px;
+	background-image:url('../img/perkamentTop.gif');
+}
+
+#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;
+}
+
+#pagemiddle h1,
+#pagemiddle h2,
+#pagemiddle h3 {
+	color:#3F3426;
+}
+
+#pagemiddle h1 {
+	font-size:17px;
+}
+#pagemiddle h2 {
+	font-size:15px;
+}
+
+#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;
+}
+
+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 */
@@ -163,52 +227,39 @@ h1 { margin: 0; padding: 0; }
 }
 
 .editbar li {
-    display: inline;
+ /*   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 */