Almost ready

7 files changed, 123 insertions, 35 deletions

diff --git a/crumbs/static/css/cr_title.css b/crumbs/static/css/cr_title.css
index 86bef57..cced3b4 100644
--- a/crumbs/static/css/cr_title.css
+++ b/crumbs/static/css/cr_title.css
@@ -19,6 +19,16 @@ div.navigation {
     font-size: 58px;
 }
 
+/* For the title page we want other paragraph styles */
+p {
+    font-size: 22px;
+    font-weight: 300;
+    padding-bottom: 0px;
+    padding-left: 5px;
+    padding-right: 0px;
+    text-indent: 0px;
+  }
+
 
 /* This is the block container */
 .gay {
diff --git a/crumbs/static/css/crumbs.css b/crumbs/static/css/crumbs.css
index 46f7527..e5e102e 100644
--- a/crumbs/static/css/crumbs.css
+++ b/crumbs/static/css/crumbs.css
@@ -16,18 +16,44 @@ body {
   margin: 0;
 }
 
+a {
+  color: #ce7b59;
+}
+
+a:hover {
+  color: #f6915f;
+  text-decoration: none;
+}
+
 p {
   font-size: 22px;
   font-weight: 300;
+  padding-bottom: 15px;
+  padding-left: 35px;
+  padding-right: 50px;
+  text-indent: 25px;
 }
 
-p.timer {
-  font-style: italic;
-  font-size: 16px;
+li {
+  font-size: 22px;
+  font-weight: 300;
+  padding-bottom: 15px;
+  padding-left: 35px;
+  padding-right: 50px;
+  text-indent: 25px;
+}
+
+strong {
+  font-weight: 500;
 }
 
 h1, h2, h3, h4 {
   font-family: 'Inconsolata', monospace;
+  padding-bottom: 15px;
+}
+
+.card h2, h3, h4 {
+  padding-left: 15px;
 }
 
 div.navigation {
@@ -56,6 +82,25 @@ div.navigation a {
   margin-left: 25px;
 }
 
+pre, code {
+  background: #222222;
+  padding: 15px;
+  font-size: 16px;
+  line-height: 24px;
+  font-family: Inconsolata, monospace;
+  border-radius: 0px;
+  color: #BEBEBE;
+  margin: 34px 0;
+  font-weight: 700;
+}
+
+code {
+  background: #bdbab1;
+  color: #4b505a;
+}
+
+code { padding: 3px 3px; }
+
 
 /*
 
@@ -80,6 +125,7 @@ div.navigation a {
 #t-color-org { color: #f6915f; }
 #t-color-ylw { color: #fdcb71; }
 #t-color-grn { color: #99cb9b; }
+.tc-brown { color: #ce7b59; }
 
 
 .colour1  { background-color: #3c3c3c; }
@@ -127,14 +173,19 @@ div.card hr {
 }
 
 
-/* hr {
-  display: ;
-  color: #222222;
-  height: 1px;
-  border: 0;
-  border-top: 1px solid #222222;
-  margin: 1em 0;
-  padding: 0; 
-  padding-bottom: 15px;
-  padding-top: 15px;
-} */
\ No newline at end of file
+div.article-title {
+  padding-bottom: 50px;
+  margin-bottom: 15px;
+}
+
+.text-right {
+  text-align: right;
+}
+
+div.article-title p {
+  font-style: italic;
+  font-size: 16px;
+  line-height: 16px;
+  padding-bottom: 0px;
+  /* padding-bottom: 15px; */
+}
diff --git a/crumbs/templates/article.html b/crumbs/templates/article.html
index 50e0da1..0161fdf 100755
--- a/crumbs/templates/article.html
+++ b/crumbs/templates/article.html
@@ -7,23 +7,23 @@
 {% block content %}
 
 <dl class="dl-horizontal">
+
+    <h1>{{ article.title }}</h1>
+    <br />
+
     <div class="card">
 
-        <h1>{{ article.title }}</h1>
+        {% set in_article = true %}
+        {% include "article_header.html" %}
+        <!-- <h1>{{ article.title }}</h1>
 
         <div class="pull-right">
             <p class="timer">This article takes {{article.read_time_string}} to read.</p>
-        </div>
-        <br/>
-        <hr />
-
+        </div> -->
         {{ article.content }}
     </div>
 </dl>
-
-    
-
-
+ 
     <!-- <div class="col-lg-9 content">
         {{ article.content }}
 
diff --git a/crumbs/templates/article_header.html b/crumbs/templates/article_header.html
new file mode 100644
index 0000000..a4412e5
--- /dev/null
+++ b/crumbs/templates/article_header.html
@@ -0,0 +1,27 @@
+<!-- <div class="article-title">
+    <p>< Back</p>
+</div> -->
+
+<div class="article-title text-right">
+
+    {% if in_article == true %}
+    <div class="pull-left">
+        <h3><a href="{{ SITEURL }}/{{ article.category|lower }}"> ⇠ Back</a></h3>
+    </div>
+    {% endif %}
+
+    <div class="pull-right">
+        <p>
+            {% if article.tags|length > 0 %}
+                {% for tag in article.tags|sort %}
+                <strong>{{ tag }} |</strong>
+                {% endfor %}
+                Tags
+            {% endif %}
+        </p>
+        <p>Published <span class="tc-brown"><strong>{{ article.locale_date }}</strong></span></p>
+        <p>This article takes <span class="tc-brown"><strong>{{article.read_time_string}}</strong></span> to read.</p>
+    </div>
+
+</div>
+<hr />
\ No newline at end of file
diff --git a/crumbs/templates/base.html b/crumbs/templates/base.html
index 87ae083..6836a7f 100755
--- a/crumbs/templates/base.html
+++ b/crumbs/templates/base.html
@@ -2,7 +2,7 @@
 <html lang="{{ DEFAULT_LANG }}">
     <head>
         <meta charset="utf-8">
-        <!-- <title>{% block title %}{{ SITENAME }}{% endblock title %}</title> -->
+        <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
 
         <!-- Load Montserrat, Inconsolata and font-awesome -->
         <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500;subset=cyrillic,latin-ext" rel="stylesheet"> 
@@ -11,9 +11,9 @@
 
         <!-- Load bootstrap, then my own CSS -->
         <link href="{{ SITEURL }}/theme/css/bootstrap.min.css" rel="stylesheet">
+        <link href="{{ SITEURL }}/theme/css/pygment.css" rel="stylesheet">
         <link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
         <link href="{{ SITEURL }}/theme/css/cr_gay_override.css" rel="stylesheet">
-
     </head>
 
     <body>
@@ -22,7 +22,6 @@
             <!-- HEADER FOR EVERY PAGE -->
             <div>
                 <div class="navigation">
-
                     <div class="nav pull-left">
     
                         <!-- The page title -->
diff --git a/crumbs/templates/category.html b/crumbs/templates/category.html
index 3264eef..d88ab8c 100755
--- a/crumbs/templates/category.html
+++ b/crumbs/templates/category.html
@@ -12,8 +12,10 @@
 <dl class="dl-horizontal">
     {% for article in articles %}
     <div class="card">
-        <h2><b>{{ article.title }}</b></h2>
-        <hr class="divider" />
+        <h2><b><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></b></h2>
+        {% set in_article = false %}
+        {% include "article_header.html" %}
+
         <p>{{ article.summary }}</p>
     </div>
     {% endfor %}
diff --git a/crumbs/templates/home.html b/crumbs/templates/home.html
index 7df2bfe..2367bad 100755
--- a/crumbs/templates/home.html
+++ b/crumbs/templates/home.html
@@ -2,21 +2,20 @@
 <html lang="{{ DEFAULT_LANG }}">
   <head>
     <meta charset="utf-8">
-
     <title{{ SITENAME }}</title>
 
-    <!-- Fonts -->
-    <!-- <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500|Raleway:200,200i,300,300i,400,400i,500" rel="stylesheet">  -->
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,500" rel="stylesheet"> 
-    <link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet"> 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-
     <!-- Load bootstrap, then my own CSS -->
     <link href="{{ SITEURL }}/theme/css/bootstrap.min.css" rel="stylesheet">
     <link href="{{ SITEURL }}/theme/css/crumbs.css" rel="stylesheet">
     <link href="{{ SITEURL }}/theme/css/cr_title.css" rel="stylesheet">
     <!-- /Stylesheets -->
 
+    <!-- Fonts -->
+    <!-- <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500|Raleway:200,200i,300,300i,400,400i,500" rel="stylesheet">  -->
+    <!-- <link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,500" rel="stylesheet"> 
+    <link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet"> 
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> -->
+
   </head>
 
   <body>