diff options
| -rw-r--r-- | res/bg.gif | bin | 0 -> 15015 bytes | |||
| -rw-r--r-- | res/blogstyle.css | 6 | ||||
| -rw-r--r-- | res/blogv311.css | 1 | ||||
| -rw-r--r-- | res/hbg.jpg (renamed from res/ios-linen.jpg) | bin | 6039 -> 6039 bytes | |||
| -rw-r--r-- | src/Blog.hs | 4 | ||||
| -rw-r--r-- | src/Locales.hs | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/res/bg.gif b/res/bg.gif new file mode 100644 index 000000000000..62c5cba41c96 --- /dev/null +++ b/res/bg.gif Binary files differdiff --git a/res/blogstyle.css b/res/blogstyle.css index 9f5d69521e7e..50caad8ea60a 100644 --- a/res/blogstyle.css +++ b/res/blogstyle.css @@ -35,7 +35,7 @@ input, textarea, select { /* site sections */ .header { - background: url(/static/ios-linen.jpg); + background: url(/static/hbg.jpg); z-index: 4; padding-left: 20px; padding-bottom: 70px; @@ -54,12 +54,12 @@ input, textarea, select { display: block; width: 100%; padding-top: 40px; - background-color: #EEE; + background: url(/static/bg.gif); color: black; } .footer { - background: url(/static/ios-linen.jpg); + background: url(/static/hbg.jpg); z-index: 4; position: relative; background-color: #4A525A; diff --git a/res/blogv311.css b/res/blogv311.css new file mode 100644 index 000000000000..0a3fa957a0c0 --- /dev/null +++ b/res/blogv311.css @@ -0,0 +1 @@ +@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/ios-linen.jpg b/res/hbg.jpg index c03636fd1dd5..c03636fd1dd5 100644 --- a/res/ios-linen.jpg +++ b/res/hbg.jpg Binary files differdiff --git a/src/Blog.hs b/src/Blog.hs index 7e719466a014..a9707fa07fa7 100644 --- a/src/Blog.hs +++ b/src/Blog.hs @@ -43,7 +43,7 @@ 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/blogv31.css" ! A.media "all" + H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/static/blogv311.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 @@ -88,7 +88,7 @@ renderEntries showAll entries topText footerLinks = do when ( mtext e /= T.empty ) $ H.p $ entryLink e $ readMore $ lang e unless ( mtext e /= T.empty ) $ - preEscapedText "<br> </br>" + preEscapedText "<br> " entryLink :: Entry -> Text -> Html entryLink e s = H.a ! A.href (toValue $ concat $ intersperse' "/" $ linkElems e) $ toHtml (T.concat ["[", s, "]"]) diff --git a/src/Locales.hs b/src/Locales.hs index b73321f4f60b..a3adaa517976 100644 --- a/src/Locales.hs +++ b/src/Locales.hs @@ -13,7 +13,7 @@ import BlogDB (BlogLang (..)) data BlogError = NotFound | DBError -version = "3.1" +version = "3.1.1" allLang = [EN, DE] |
