diff options
| -rw-r--r-- | res/blogstyle.css | 79 | ||||
| -rw-r--r-- | res/blogv31.css | 1 | ||||
| -rw-r--r-- | res/blogv311.css | 1 | ||||
| -rw-r--r-- | res/blogv312.css | 1 | ||||
| -rw-r--r-- | res/cbg.jpg | bin | 0 -> 12124 bytes | |||
| -rw-r--r-- | src/Blog.hs | 3 | ||||
| -rw-r--r-- | src/Locales.hs | 2 |
7 files changed, 76 insertions, 11 deletions
diff --git a/res/blogstyle.css b/res/blogstyle.css index 50caad8ea60a..5f8475613a3d 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 15656b088131..000000000000 --- 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 0a3fa957a0c0..000000000000 --- 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 000000000000..69c3775b2e17 --- /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 000000000000..c83bb4c2953c --- /dev/null +++ b/res/cbg.jpg Binary files differdiff --git a/src/Blog.hs b/src/Blog.hs index a9707fa07fa7..3f1fe063cc03 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 a3adaa517976..fc072ed61cb7 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] |
