diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index 4925837c59d..a67c9f1746f 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -64,20 +64,16 @@ div.web-footer { } .navbar-inverse .brand, +.navbar-inverse .brand:hover, +.navbar-inverse .brand:focus, .navbar-inverse .nav > li > a { color: #{{ doc.top_bar_foreground or "fff"}}; text-shadow: none; } -.navbar-inverse .brand:hover, .navbar-inverse .nav > li > a:hover, -.navbar-inverse .brand:focus, .navbar-inverse .nav > li > a:focus { - color: #{{ doc.top_bar_background or "aaa"}}; -} - -.navbar-inverse .brand { - color: #{{ doc.top_bar_foreground or "fff"}}; + color: #{{ doc.top_bar_background or "000"}}; } .navbar-inverse .navbar-text { diff --git a/website/templates/js/blog.js b/website/templates/js/blog.js index 3cfb2345492..91d3ead65ab 100644 --- a/website/templates/js/blog.js +++ b/website/templates/js/blog.js @@ -48,6 +48,7 @@ var blog = { }, dataType: "json", success: function(data) { + $(".progress").toggle(false); if(data.exc) console.log(data.exc); blog.render(data.message); } @@ -81,10 +82,10 @@ var blog = {
', b)).appendTo($wrap); }); blog.start += (data.length || 0); - if(!data.length) { + if(!data.length || data.length < 20) { if(blog.start) { $("#next-page").toggle(false) - .parent().append("
Nothing more to show.
"); + .parent().append("
Nothing more to show.
"); } else { $("#next-page").toggle(false) .parent().append("
No blogs written yet.
"); diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html index 05302c63de5..cfdd5366964 100644 --- a/website/templates/pages/blog.html +++ b/website/templates/pages/blog.html @@ -14,6 +14,9 @@

Blog


+
+
+