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

2 files changed, 27 insertions, 9 deletions

diff --git a/local.css b/local.css
index 9e084e8a..65fd5e05 100644
--- a/local.css
+++ b/local.css
@@ -4,37 +4,50 @@ BODY {
 	font-family: sans-serif;
 }
 
-DIV#sidebar {
+DIV#topbar {
 	width: 98%;
 	margin: 0;
 	padding: 0;
+	background-color: LightBlue;
 	text-align: center;
 	text-transform: uppercase;
 	font-weight: bold;
 }
-DIV#sidebar p {
+DIV#topbar p {
 	float: left;
 }
-DIV#sidebar ul {
+DIV#topbar ul {
 	list-style-type:none;
 	margin: 66px 0 0;
 	padding: 0;
 }
-DIV#sidebar ul li {
+DIV#topbar ul li {
 	display:inline;
 	margin: 0 20px;
 }
-DIV#sidebar li,
-DIV#sidebar ul,
-DIV#sidebar ul li,
-DIV#sidebar ol,
-DIV#sidebar ol li {
+DIV#topbar li,
+DIV#topbar ul,
+DIV#topbar ul li,
+DIV#topbar ol,
+DIV#topbar ol li {
 	font-size: 1.1em;
 	line-height: 2em;
 }
+div#pageinfo {
+	border-top: 0;
+}
+div.actions ul {
+	border-bottom: 0;
+}
 
 DIV#content {
 	clear: both;
 	margin: 0 10%;
 	max-width: 62em;
 }
+DIV#content IMG {
+	display: block;
+	clear: both;
+	float: right;
+	padding: 10px;
+}
\ No newline at end of file
diff --git a/topbar.mdwn b/topbar.mdwn
new file mode 100644
index 00000000..5c43dfd6
--- /dev/null
+++ b/topbar.mdwn
@@ -0,0 +1,5 @@
+ * [[Byvandringer|tours]]
+ * [[Specialture|events]]
+ * [[Historier|talks]]
+ * [[Priser|prices]]
+ * [[Kontakt|contact]]