Merge pull request getpelican#12 from Mins/master

Updates to tuxlite_tbs and bootstrap themes

bootstrap/static/local.css

@@ -29,7 +29,7 @@ div.highlight pre {
 .social a[href*='github.com']:before {content: url('./images/icons/github.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='google.com/reader']:before {content: url('./images/icons/reader.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='jamendo.com']:before {content: url('./images/icons/jamendo.png'); margin-right: 2px; vertical-align: -3px;}
-.social a[href*='last.fm']:before, .social a[href*='lastfm.']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;}
+.social a[href*='last.fm']:before {content: url('./images/icons/lastfm.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='linkedin.com']:before {content: url('./images/icons/linkedin.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='rss.xml']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='stackoverflow.com']:before {content: url('./images/icons/stackoverflow.png'); margin-right: 2px; vertical-align: -3px;}

tuxlite_tbs/static/local.css

@@ -1,57 +1,63 @@
-/* Navigation bar color */
+/* Styling for Nav bar. Bg color, link color etc */
 .navbar-inner {
-  background-color: #222222;
-  background-color: #222222;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
+  padding-left: 20px;
+  padding-right: 20px;
+  background-color: #2E435E;
+  background-image: -moz-linear-gradient(top, #2e435e, #172e50);
+  background-image: -ms-linear-gradient(top, #2e435e, #172e50);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2e435e), to(#172e50));
+  background-image: -webkit-linear-gradient(top, #2e435e, #172e50);
+  background-image: -o-linear-gradient(top, #2e435e, #172e50);
+  background-image: linear-gradient(top, #2e435e, #172e50);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  border-radius: 0px;
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }
 
-/* Rounded borders for content */
-.content {
-        background-color: #fff;
-        padding: 20px;
-        margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
-        -webkit-border-radius: 7px 7px 7px 7px;
-           -moz-border-radius: 7px 7px 7px 7px;
-                border-radius: 7px 7px 7px 7px;
-        -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-           -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-                box-shadow: 0 1px 2px rgba(0,0,0,.15);
-        box-shadow: 0 0 15px 2px rgba(0, 0, 0, 0.25) 
-	}
+.navbar .nav > li > a { color: #49AFCD; }
+.navbar .divider-vertical { border-right: 1px solid #4D4D4D; }
+.navbar { margin-bottom: 4em; } 
 
-body { font-size: 14px; }
-p { font-size: 15px; }
-.article { padding-top: 20px; }
+
+/* Styling for elements */
+body { font-size: 100%; }
+p { font-size: 100%; line-height: 1.6em; margin-top: 0.8em; margin-bottom: 0.8em; }
+li { line-height: 1.6em; }
+h3 { margin-top: 2.5em; }
+.table th, .table td { line-height: 1.3em; }
+
+/* Styling for articles */
+.article { padding-bottom:20px; padding-right: 40px; }
 .content-title { margin-bottom: 30px; }
+.article a:hover { text-decoration: none; } 
 
-/* Remove underline when hovering over article titles */
-.article a:hover{
-    text-decoration: none;
-}
 
-.well.small {
-    padding: 6px 6px 4px;
-}
 
-.btn.xsmall {
+/* Styling for the "other entries" section */
+/* Metadata */
+.well.small { padding: 6px 6px 4px; }
+
+/* Read more button */
+.btn-info.xsmall {
     padding: 1px 3px 1px;
     font-size: 11px;
+    float: right;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
 }
 
-.summary * { display: inline; }
+/* Article summary */
+.summary { margin-bottom: 4em; }
 .summary pre { display: none; }
 
+
+/* Styling for Sidebar */
 .social a[href*='activestate.com']:before {content: url('./images/icons/activestate.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='atom.xml']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='bitbucket.org']:before {content: url('./images/icons/bitbucket.png'); margin-right: 2px; vertical-align: -3px;}
@@ -62,7 +68,7 @@ p { font-size: 15px; }
 .social a[href*='github.com']:before {content: url('./images/icons/github.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='google.com/reader']:before {content: url('./images/icons/reader.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='jamendo.com']:before {content: url('./images/icons/jamendo.png'); margin-right: 2px; vertical-align: -3px;}
-.social a[href*='last.fm']:before, .social a[href*='lastfm.']:before {content: url('./images/icons/lastfm.png'); margin-right: 2px; vertical-align: -3px;}
+.social a[href*='last.fm']:before {content: url('./images/icons/lastfm.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='linkedin.com']:before {content: url('./images/icons/linkedin.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='rss.xml']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='stackoverflow.com']:before {content: url('./images/icons/stackoverflow.png'); margin-right: 2px; vertical-align: -3px;}

tuxlite_tbs/templates/archives.html

@@ -1,15 +1,19 @@
 {% extends "base.html" %}
 {% block title %}{{ SITENAME }} <small>[archive]</small>{% endblock %}
 {% block content %}
-{% for year, date_year in dates|groupby( 'date.year' ) %}
-<h2>{{ year }}</h2>
-{% for month, articles in date_year|groupby( 'date.month' ) %}
-<h3>{{ articles[ 0 ].date.strftime( '%B' ) }}</h3>
-<ul>
-{% for article in articles %}
-	<li><a href="{{ article.url }}">{{ article.title }}</li>
-{% endfor %}
-</ul>
-{% endfor %}
-{% endfor %}
+
+<h1>Archives</h1>
+
+<table class="table">
+    <tbody>
+    {% for article in dates %}
+        <tr>
+        <td>{{ article.date.strftime("%d %b %Y") }}</td>
+        <td><a href='{{ article.url }}'>{{ article.title }}</a></td>
+        </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+
 {% endblock %}

tuxlite_tbs/templates/article.html

@@ -2,7 +2,7 @@
 {% block content %}
     <div class='article'>
         <div class="content-title">
-            <h2>{{ article.title }}</h2>
+            <h1>{{ article.title }}</h1>
             {% include "metadata.html" %}
         </div>
 
@@ -12,6 +12,6 @@ <h2>{{ article.title }}</h2>
 
         <h2>Comments</h2>
 	{% include "twitter.html" %}
-	{% if DISQUS_SITENAME %}<div id="disqus_thread"></div>{% endif %}
+	{% include 'disqus.html' %}
     </div>
 {% endblock %}