From 2738271e6733a9f24b4c09110ca98a0b56689f0f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 23 Mar 2012 03:20:36 +0100 Subject: [PATCH] version 3.1.2: * CSS changes for HsColour --- res/blogstyle.css | 79 ++++++++++++++++++++++++++++++++++++++++++---- res/blogv31.css | 1 - res/blogv311.css | 1 - res/blogv312.css | 1 + res/cbg.jpg | Bin 0 -> 12124 bytes src/Blog.hs | 3 +- src/Locales.hs | 2 +- 7 files changed, 76 insertions(+), 11 deletions(-) delete mode 100644 res/blogv31.css delete mode 100644 res/blogv311.css create mode 100644 res/blogv312.css create mode 100644 res/cbg.jpg diff --git a/res/blogstyle.css b/res/blogstyle.css index 50caad8ea..5f8475613 100644 --- a/res/blogstyle.css +++ b/res/blogstyle.css @@ -1,12 +1,7 @@ @charset "UTF-8"; /* CSS Document */ - -@font-face { - font-family: 'PT Sans'; - font-style: normal; - font-weight: normal; - src: local('PT Sans'), local('PTSans-Regular'), url('http://themes.googleusercontent.com/static/fonts/ptsans/v2/7YGmE4Ls5b94ct65u07hVQLUuEpTyoUstqEm5AMlJo4.woff') format('woff'); -} +@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; @@ -147,3 +142,73 @@ input, textarea, select { font-size: 24px; font-weight: bold; } + +/* HsColour style */ + +.code +{ + box-shadow: 3px 3px 5px 1px #888; + border-radius: 10px; + padding: 0.75em; + + font-size: 11pt; + width: 60em; + color: white; + line-height: 1.2em; + font-family: 'Droid Sans Mono', sans-serif; + background: black; + background-image:url('/static/cbg.jpg'); + background-repeat: no-repeat; + } + +.code pre +{ + font-family: 'Droid Sans Mono', sans-serif; +} + +kbd +{ + font-family: 'Droid Sans Mono', sans-serif; + color: #333; + font-size: 0.8em; +} + +.wide +{ + width: 90em; +} + + +code +{ + line-height: 1.5em; + border: 1px; + } + +.source-code +{ + font-size: 0.75em; + color: #666; + } + +.warning +{ + color: red; + } + + +.hs-keyglyph { color: DarkGoldenrod; } +.hs-layout { color: white;} +.hs-keyword { color: skyblue; } +.hs-comment, .hs-comment a { color: cadetblue;} +.hs-str { color: Darkorange; } +.hs-chr { color: RosyBrown;} +.hs-conid { color: GreenYellow; } +.hs-varid { color: white; } +.hs-num { color: white; } +.hs-varop { color: DarkGoldenrod; } +.hs-conop { color: DarkGoldenrod; } +.hs-sel { color: FireBrick; } +.hs-cpp { color: yellow; } +.hs-definition { color: gold; } + diff --git a/res/blogv31.css b/res/blogv31.css deleted file mode 100644 index 15656b088..000000000 --- a/res/blogv31.css +++ /dev/null @@ -1 +0,0 @@ -@charset UTF-8;@font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'), local(PTSans-Regular), url(http://themes.googleusercontent.com/static/fonts/ptsans/v2/7YGmE4Ls5b94ct65u07hVQLUuEpTyoUstqEm5AMlJo4.woff) format(woff);}html,body{margin:0;padding:0;}body{font-family:'PT Sans', sans-serif;min-height:850px;color:#EEE;}a{color:#000;}input,textarea,select{border:1px solid #555;font-size:15px;line-height:1.2em;width:550px;background:#F9F9F9;-webkit-border-radius:.5em;padding:.5em;}.header{background:url(/static/ios-linen.jpg);z-index:4;padding-left:20px;padding-bottom:70px;padding-top:30px;position:relative;box-shadow:0 6px 5px 1px #343537;}.link{color:#EEE;}.middle{position:relative;z-index:2;display:block;width:100%;padding-top:40px;background-color:#EEE;color:#000;}.footer{background:url(/static/ios-linen.jpg);z-index:4;position:relative;background-color:#4A525A;margin-top:30px;padding-top:20px;box-shadow:0 -6px 5px 1px #343537;color:#EEE;}.btitle{text-decoration:none;color:#EEE;font-size:x-large;font-weight:700;margin-top:15px;margin-bottom:10px;}.contacts{float:left;font-weight:bolder;}.righttext{float:right;padding-right:20px;}.rightbox{text-align:right;padding-right:14px;}.innerTitle{margin-left:10px;font-weight:700;}.innerBoxComments{margin-left:10px;}.innerContainer{padding-right:20px;}.centerbox{text-align:center;min-height:45px;}.cInput{margin-left:15px;}.tt{font-family:"courier new",courier,monospace;font-size:13px;}.cl{text-decoration:none;color:#000;}.cHead{font-size:large;font-weight:700;}.notFoundFace{text-align:center;font-size:100px;}.notFoundText{text-align:center;font-size:24px;font-weight:700;} diff --git a/res/blogv311.css b/res/blogv311.css deleted file mode 100644 index 0a3fa957a..000000000 --- a/res/blogv311.css +++ /dev/null @@ -1 +0,0 @@ -@charset UTF-8;@font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'), local(PTSans-Regular), url(http://themes.googleusercontent.com/static/fonts/ptsans/v2/7YGmE4Ls5b94ct65u07hVQLUuEpTyoUstqEm5AMlJo4.woff) format(woff);}html,body{margin:0;padding:0;}body{font-family:'PT Sans', sans-serif;min-height:850px;color:#EEE;}a{color:#000;}input,textarea,select{border:1px solid #555;font-size:15px;line-height:1.2em;width:550px;background:#F9F9F9;-webkit-border-radius:.5em;padding:.5em;}.header{background:url(/static/hbg.jpg);z-index:4;padding-left:20px;padding-bottom:70px;padding-top:30px;position:relative;box-shadow:0 6px 5px 1px #343537;}.link{color:#EEE;}.middle{position:relative;z-index:2;display:block;width:100%;padding-top:40px;background:url(/static/bg.gif);color:#000;}.footer{background:url(/static/hbg.jpg);z-index:4;position:relative;background-color:#4A525A;margin-top:30px;padding-top:20px;box-shadow:0 -6px 5px 1px #343537;color:#EEE;}.btitle{text-decoration:none;color:#EEE;font-size:x-large;font-weight:700;margin-top:15px;margin-bottom:10px;}.contacts{float:left;font-weight:bolder;}.righttext{float:right;padding-right:20px;}.rightbox{text-align:right;padding-right:14px;}.innerTitle{margin-left:10px;font-weight:700;}.innerBoxComments{margin-left:10px;}.innerContainer{padding-right:20px;}.centerbox{text-align:center;min-height:45px;}.cInput{margin-left:15px;}.tt{font-family:"courier new",courier,monospace;font-size:13px;}.cl{text-decoration:none;color:#000;}.cHead{font-size:large;font-weight:700;}.notFoundFace{text-align:center;font-size:100px;}.notFoundText{text-align:center;font-size:24px;font-weight:700;} diff --git a/res/blogv312.css b/res/blogv312.css new file mode 100644 index 000000000..69c3775b2 --- /dev/null +++ b/res/blogv312.css @@ -0,0 +1 @@ +@charset UTF-8;@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;}a{color:#000;}input,textarea,select{border:1px solid #555;font-size:15px;line-height:1.2em;width:550px;background:#F9F9F9;-webkit-border-radius:.5em;padding:.5em;}.header{background:url(/static/hbg.jpg);z-index:4;padding-left:20px;padding-bottom:70px;padding-top:30px;position:relative;box-shadow:0 6px 5px 1px #343537;}.link{color:#EEE;}.middle{position:relative;z-index:2;display:block;width:100%;padding-top:40px;background:url(/static/bg.gif);color:#000;}.footer{background:url(/static/hbg.jpg);z-index:4;position:relative;background-color:#4A525A;margin-top:30px;padding-top:20px;box-shadow:0 -6px 5px 1px #343537;color:#EEE;}.btitle{text-decoration:none;color:#EEE;font-size:x-large;font-weight:700;margin-top:15px;margin-bottom:10px;}.contacts{float:left;font-weight:bolder;}.righttext{float:right;padding-right:20px;}.rightbox{text-align:right;padding-right:14px;}.innerTitle{margin-left:10px;font-weight:700;}.innerBoxComments{margin-left:10px;}.innerContainer{padding-right:20px;}.centerbox{text-align:center;min-height:45px;}.cInput{margin-left:15px;}.tt{font-family:"courier new",courier,monospace;font-size:13px;}.cl{text-decoration:none;color:#000;}.cHead{font-size:large;font-weight:700;}.notFoundFace{text-align:center;font-size:100px;}.notFoundText{text-align:center;font-size:24px;font-weight:700;}.code{box-shadow:3px 3px 5px 1px #888;border-radius:10px;font-size:11pt;width:60em;color:#FFF;line-height:1.2em;font-family:'Droid Sans Mono', sans-serif;background:#000;background-image:url(/static/cbg.jpg);background-repeat:no-repeat;padding:.75em;}.code pre{font-family:'Droid Sans Mono', sans-serif;}kbd{font-family:'Droid Sans Mono', sans-serif;color:#333;font-size:.8em;}.wide{width:90em;}code{line-height:1.5em;border:1px;}.source-code{font-size:.75em;color:#666;}.warning{color:red;}.hs-keyword{color:#87CEEB;}.hs-comment,.hs-comment a{color:#5F9EA0;}.hs-str{color:#FF8C00;}.hs-chr{color:#BC8F8F;}.hs-conid{color:#ADFF2F;}.hs-sel{color:#B22222;}.hs-cpp{color:#FF0;}.hs-definition{color:#FFD700;}.hs-keyglyph,.hs-varop,.hs-conop{color:#B8860B;}.hs-layout,.hs-varid,.hs-num{color:#FFF;} \ No newline at end of file diff --git a/res/cbg.jpg b/res/cbg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c83bb4c2953cc37355f5ac205d9df40fde1f8d15 GIT binary patch literal 12124 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 literal 0 HcmV?d00001 diff --git a/src/Blog.hs b/src/Blog.hs index a9707fa07..3f1fe063c 100644 --- a/src/Blog.hs +++ b/src/Blog.hs @@ -43,7 +43,8 @@ blogTemplate lang t_append body = H.docTypeHtml $ do --add body H.head $ do H.title $ (toHtml $ blogTitle lang t_append) H.link ! A.rel "alternate" ! A.type_ "application/rss+xml" ! A.title "RSS-Feed" ! A.href "/rss" - H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/static/blogv311.css" ! A.media "all" + H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/static/blogv312.css" ! A.media "all" + --H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/res/blogstyle.css" ! A.media "all" H.meta ! A.httpEquiv "content-type" ! A.content "text/html;charset=UTF-8" --H.style ! A.type_ "text/css" ! A.title "iOS iMessage" ! A.media "screen and (max-device-width: 1024px)" $ "#cosx{display:none;}" preEscapedText analytics diff --git a/src/Locales.hs b/src/Locales.hs index a3adaa517..fc072ed61 100644 --- a/src/Locales.hs +++ b/src/Locales.hs @@ -13,7 +13,7 @@ import BlogDB (BlogLang (..)) data BlogError = NotFound | DBError -version = "3.1.1" +version = "3.1.2" allLang = [EN, DE]