Merge branch 'master-da' of coreander:/srv/git/source.byvandring.nu/bynu_content into master-da

Conflicts:
	local.css

1 files changed, 5 insertions, 19 deletions

diff --git a/local.css b/local.css
index 61d45baf..378e9b58 100644
--- a/local.css
+++ b/local.css
@@ -2,7 +2,7 @@ H1,
 H2,
 H3 {
 	margin-bottom: 0;
-	color: darkred;
+	color: darkblue;
 }
 
 H4,
@@ -32,7 +32,7 @@ p {
 
 BODY {
 	margin: 0;
-	background-color: white;
+	background-color: LightBlue;
 	font-family: sans-serif;
 	text-align: center;
 }
@@ -129,10 +129,9 @@ DIV#wrapper {
 DIV#content {
 	clear: both;
 	margin: 3em auto 1em;
-	padding: 1em;
+	padding: 0;
 	max-width: 52em;
 	text-align: left;
-	background-color: lightblue;
 }
 
 DIV#content IMG {
@@ -145,13 +144,13 @@ DIV#content IMG {
 DIV.inlinepage {
 	border: 0;
 	padding: 1em;
-	background-color: lightyellow;
+	background-color: white;
 }
 
 DIV.inlinepage SPAN.header a {
 	font-size: 0.9em;
 	font-weight: normal;
-	color: black;
+	color: darkblue;
 	text-transform: uppercase;
 }
 
@@ -159,19 +158,6 @@ DIV.inlinefooter {
 	display: none;
 }
 
-DIV.notebox {
-	color: #9cf !important;
-	background: lightblue;
-	border: none;
-	margin-right: -480px;
-	width: 200px;
-}
-
-DIV.notebox p {
-	color: #06c;
-	text-align: left;
-}
-
 DIV#backlinks {
 	display: none;
 }