* more bootstrap-related fixes, nearing completion

* version bumped to 4.0

3 files changed, 15 insertions, 13 deletions

diff --git a/TazBlog.cabal b/TazBlog.cabal
index 1295363f60e1..295d4e8ae36f 100644
--- a/TazBlog.cabal
+++ b/TazBlog.cabal
@@ -1,5 +1,5 @@
 Name:                TazBlog
-Version:             3.5
+Version:             4.0
 Synopsis:            Tazjin's Blog
 License-file:        LICENSE
 Author:              Vincent Ambo
diff --git a/src/Blog.hs b/src/Blog.hs
index 8a7d49b9218a..4c8d19aa310b 100644
--- a/src/Blog.hs
+++ b/src/Blog.hs
@@ -138,7 +138,7 @@ $forall entry <- elist
         <br>
         #{linkText $ length $ comments entry}
         #{cHead $ lang entry}
-    <div .span10>
+    <div .span10 .entry>
       $if (isEntryMarkdown entry)
         ^{renderEntryMarkdown $ append " " $ btext entry}
       $else
@@ -158,19 +158,21 @@ $maybe links <- footerLinks
 
 showLinks :: Maybe Int -> BlogLang -> Html
 showLinks (Just i) lang = [shamlet|
- $if ((>) i 1)
-  <div class="centerbox">
-   <a href=#{nLink $ succ i}>#{backText lang}
-   \ -- #
-   <a href=#{nLink $ pred i}>#{nextText lang}
- $elseif ((<=) i 1)
-  ^{showLinks Nothing lang}
+  $if ((>) i 1)
+    <div .row .text-center>
+      <div .span12>
+        <a href=#{nLink $ succ i}>#{backText lang}
+        \ -- #
+        <a href=#{nLink $ pred i}>#{nextText lang}
+  $elseif ((<=) i 1)
+    ^{showLinks Nothing lang}
 |]
   where
    nLink page = T.concat ["/", show' lang, "/?page=", show' page]
 showLinks Nothing lang = [shamlet|
-<div class="centerbox">
- <a href=#{nLink}>#{backText lang}
+<div .row .text-center>
+  <div .span12>
+    <a href=#{nLink}>#{backText lang}
 |]
   where
    nLink = T.concat ["/", show' lang, "/?page=2"]
diff --git a/src/Locales.hs b/src/Locales.hs
index 67c55a81dc62..34d3fadf25d0 100644
--- a/src/Locales.hs
+++ b/src/Locales.hs
@@ -18,7 +18,7 @@ import           BlogDB      (BlogLang (..))
 
 data BlogError = NotFound | DBError
 
-version = "3.5"
+version = "4.0"
 
 allLang = [EN, DE]
 
@@ -159,6 +159,6 @@ rightText DE = "English version <a href=\"/en\" class=\"link\">available here</a
 rightText EN = "Deutsche Version <a href=\"/de\" class=\"link\">hier verf&uuml;gbar</a>."
 
 -- static information
-repoURL   :: Text = "https://bitbucket.org/tazjin/tazblog-haskell"
+repoURL   :: Text = "http://hg.tazj.in/tazblog-haskell"
 mailTo    :: Text = "mailto:tazjin+blog@gmail.com"
 twitter   :: Text = "http://twitter.com/#!/tazjin"