* added bootstrap file

* moved CSS to correct paths

res/blog.lucius

@@ -3,58 +3,50 @@
 @import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);
 @import url(http://fonts.googleapis.com/css?family=PT+Sans);
 
-html, body{
-	margin: 0;
-	padding: 0;
-}
-
 body {
 	font-family: 'PT Sans', sans-serif;
 	min-height: 850px;
-	color: #EEE;
+	background: url(/static/bg.gif);
+}
+
+html, body {
+	height: 100%;
 }
 
 a {
 	color: black;
 }
 
-input, textarea, select {
+article a, .entry a {
-   border: 1px solid #555;
+	text-decoration: underline;
-   padding: 0.5em;
+}
-   font-size: 15px;
+
-   line-height: 1.2em;
+#wrap {
-   width: 550px;
+    min-height: 100%;
-   background: #F9F9F9;
+    height: auto !important;
-   -webkit-border-radius: 0.5em;
+    height: 100%;
- }
+}
+
+.readmore {
+	text-decoration: underline;
+}
 
-/* site sections */
 .header {
+	color: #EEE;
 	background: url(/static/hbg.jpg);
 	z-index: 4;
 	padding-left: 20px;
-	padding-bottom: 70px;
+	padding-bottom: 30px;
 	padding-top:  30px;
 	position: relative;
 	box-shadow: 0 6px 5px 1px #343537;
-}
+	margin-bottom: 25px;
-
+	padding-left: 0px;
-.link {
-	color: #EEE;
-}
-
-.middle {
-	position: relative;
-	z-index: 2;
-	display: block;
-	width: 100%;
-	padding-top: 40px;
-	background: url(/static/bg.gif);
-	color: black;
 }
 
 .footer {
 	background: url(/static/hbg.jpg);
+	height: 90;
 	z-index: 4;
 	position: relative;
 	background-color: #4A525A;
@@ -64,15 +56,47 @@ input, textarea, select {
 	color: #EEE;
 }
 
-/* header elements */ 
+
+.header a, .footer a {
+	color: #EEE;
+	text-decoration: none;
+}
+
+
+.boldify {
+    font-size:large;
+    font-weight:bold;
+}
+
+.pusher {
+	padding-bottom: 20px;
+}
+
+.innerBoxComments {
+	padding-top: 20px;
+}
+
+.cCaptcha {
+	padding: 5px;
+	border: 1px solid #555;
+    border-radius: 0.5em;
+    width: 606px;
+    background: #F9F9F9;
+}
+
+.tt { 
+	font-family: "courier new",courier,monospace; 
+	font-size: 13px;
+}
 
 .btitle {
 	text-decoration:none;
-	color: #EEE;
+	//color: #EEE;
 	font-size:x-large;
 	font-weight:bold;
 	margin-top: 15px;
-	margin-bottom: 10px;
+	padding-bottom: 25px;
+	padding-top: 20px;
 }
 
 .contacts {
@@ -85,71 +109,19 @@ input, textarea, select {
 	padding-right: 20px;
 }
 
-.rightbox {
+.commentname {
-	text-align:right;
+	text-align: right;
-	padding-right: 14px;
-}
-
-/* middle elements */
-.innerTitle {
-	margin-left: 10px;
-	font-weight: bold;
-}
-
-.innerBoxComments{
-	margin-left: 10px;
-}
-
-.innerContainer {
-	padding-right: 20px;
-
-}
-
-/* common elements */
-.centerbox {
-	text-align:center;
-    min-height: 45px;
-}
-
-
-/* style elements */
-
-.cInput {
-	margin-left: 15px;
-}
-
-.cCaptcha {
-	padding: 5px;
-	border: 1px solid #555;
-    -webkit-border-radius: 0.5em;
-    margin-left: 15px;
-    width: 555px;
-    background: #F9F9F9;
-}
-
-.tt { 
-	font-family: "courier new",courier,monospace; 
-	font-size: 13px;
-}
-
-.cl {
-	text-decoration:none;color:black;
-}
-
-.cHead {
-    font-size:large;
-    font-weight:bold;
 }
 
 .notFoundFace {
-	text-align: center;
+	height: 100px;
-	font-size: 100px;
+	padding-top: 50px;
+	font-size:100px
 }
 
 .notFoundText {
-	text-align: center;
+	font-size:24px;
-	font-size: 24px;
+	font-weight:bold
-	font-weight: bold;
 }
 
 /* HsColour style */
@@ -172,6 +144,7 @@ input, textarea, select {
 
 .code pre
 {
+
    font-family: 'Droid Sans Mono', sans-serif; 
 }
 
@@ -220,4 +193,3 @@ code
 .hs-sel      { color: FireBrick; }
 .hs-cpp      { color: yellow; }
 .hs-definition { color: gold; }
-

src/Blog.hs

@@ -42,11 +42,9 @@ markdownCutoff = fromJust $ parseTime defaultTimeLocale "%s" "1367149834"
 
 
 -- blog CSS (admin is still static)
-stylesheetSource = $(luciusFile "../res/blogbs.lucius")
+stylesheetSource = $(luciusFile "../res/blog.lucius")
 blogStyle = renderCssUrl undefined stylesheetSource
 
---   <link rel="stylesheet" type="text/css" href="/static/blogv34.css" media="all"> FIXME
-
 -- blog HTML
 blogTemplate :: BlogLang -> Text -> Html -> Html
 blogTemplate lang t_append body = [shamlet|
@@ -54,7 +52,7 @@ $doctype 5
   <head>
     <title>#{blogTitle lang t_append}
     <link rel="stylesheet" type="text/css" href="/static/bootstrap.css" media="all">
-    <link rel="stylesheet" type="text/css" href="/static/blogv300.css" media="all">
+    <link rel="stylesheet" type="text/css" href="/static/blogv40.css" media="all">
     <link rel="alternate" type="application/rss+xml" title="RSS-Feed" href=#{rssUrl}>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8">
   <body>