website, blog: style fixes
diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index 4925837..a67c9f1 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -64,20 +64,16 @@
}
.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 3cfb234..91d3ead 100644
--- a/website/templates/js/blog.js
+++ b/website/templates/js/blog.js
@@ -48,6 +48,7 @@
},
dataType: "json",
success: function(data) {
+ $(".progress").toggle(false);
if(data.exc) console.log(data.exc);
blog.render(data.message);
}
@@ -81,10 +82,10 @@
</div><hr>', 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("<div class='alert'>Nothing more to show.</div>");
+ .parent().append("<div class='alert alert-info'>Nothing more to show.</div>");
} else {
$("#next-page").toggle(false)
.parent().append("<div class='alert'>No blogs written yet.</div>");
diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html
index 05302c6..cfdd536 100644
--- a/website/templates/pages/blog.html
+++ b/website/templates/pages/blog.html
@@ -14,6 +14,9 @@
<div class="span12">
<h2 id="blog-title">Blog</h2>
<br>
+ <div class="progress progress-striped active">
+ <div class="bar" style="width: 100%;"></div>
+ </div>
<div id="blog-list">
<!-- blog list will be generated dynamically -->
</div>