Merge remote-tracking branch 'upstream/master'

README.md

@@ -95,6 +95,7 @@ A set of icons have custom background, for this you must follow the names below:
 - linkedin
 - pinterest
 - rss
+- stack-overflow
 - twitter
 - youtube
 

static/css/style.css

@@ -35,7 +35,7 @@ body {
   padding: 0;
   background-color: #ffffff;
   color: #242121;
-  font-family: 'Source Sans Pro', sans-serif;
+  font-family: 'Source Sans Pro', 'Verdana', sans-serif;
   font-size: 1.02em;
   line-height: 1.2em;
 }
@@ -124,7 +124,7 @@ main article code,
 main article kbd,
 main article samp,
 main article pre {
-  font-family: 'Source Code Pro', monospace;
+  font-family: 'Source Code Pro', 'Consolas', monospace;
 }
 main article blockquote,
 main article pre {
@@ -280,6 +280,9 @@ ul.social a.sc-linkedin {
 ul.social a.sc-rss {
   background-color: #f26109;
 }
+ul.social a.sc-stack-overflow {
+  background-color: #ff9900;
+}
 ul.social a.sc-twitter {
   background-color: #4da7de;
 }

static/css/style.less

@@ -5,8 +5,8 @@
 @light-grey:  #eeeeee;
 @med-grey:  #999999;
 @dark-grey: #242121;
-@sans: 'Source Sans Pro', sans-serif;
+@sans: 'Source Sans Pro', 'Verdana', sans-serif;
-@mono: 'Source Code Pro', monospace;
+@mono: 'Source Code Pro', 'Consolas', monospace;
 
 html, body {
   width: 100%;
@@ -353,6 +353,10 @@ ul.social {
     background-color: #f26109;
   }
 
+  a.sc-stack-overflow {
+    background-color: #ff9900;
+  }
+
   a.sc-twitter {
     background-color: #4da7de;
   }

static/css/style.min.css

@@ -1 +1 @@
-aside,main nav{text-align:center}body,html{width:100%;height:100%}h1,h2,h3,h4,h5,h6{font-weight:300;line-height:1.1}h1{font-size:2.4em}h2{font-size:2em}h3{font-size:1.6em}h4{font-size:1.36em}h5{font-size:1.2em}h6{font-size:1.1em}body{margin:0;padding:0;background-color:#fff;color:#242121;font-family:'Source Sans Pro',sans-serif;font-size:1.02em;line-height:1.2em}a{color:#d9411e;text-decoration:none}a:hover{color:#ff5a09}hr{color:#eee;background-color:#eee;height:1px;border:none;margin-top:40px;margin-bottom:40px}aside,aside a{color:#fff}img{max-width:100%}aside{background-color:#333}aside a:hover{color:#eee}aside div{padding:20px;margin:0}aside div img{border-radius:50%;max-width:140px}aside div h1{margin:15px 0 5px}aside div p{margin:0 0 15px;font-size:.92em}aside nav ul li{display:inline;line-height:1.6em;font-size:1.28em;text-transform:lowercase}main nav{text-transform:uppercase;font-size:.72em;padding:14px 0;border-bottom:#eee 1px solid}main nav a{padding:0 4px;border-right:#eee 1px solid}main nav :first-child{border-left:#eee 1px solid}main .pagination{margin:4% 8% 2%}main .social-share p{font-size:.8em}main article{margin:0 8% 2%}main article header h1,main article header h2{margin-bottom:0}main article header p{color:#999;font-size:.82em}main article code,main article kbd,main article pre,main article samp{font-family:'Source Code Pro',monospace}main article blockquote,main article pre{background-color:rgba(128,128,128,.05);border-top-right-radius:5px;border-bottom-right-radius:5px;border-left:8px solid rgba(128,128,128,.075);border-left-width:10px}main article blockquote{padding:10px 20px;font-weight:300;font-size:1.1em}main article pre{padding:4px;font-size:.9em;overflow-x:auto}main article samp{white-space:pre;display:block;overflow-x:auto}main article kbd{padding:.1em .6em;border:1px solid rgba(63,63,63,.25);box-shadow:0 1px 0 rgba(63,63,63,.25);background-color:#fff;color:#333;border-radius:3px;display:inline-block;margin:0 .1em;white-space:nowrap;font-size:.78em}main article code{font-size:.8em;white-space:nowrap;color:#c25;padding:1px 3px;background-color:#f7f7f9;border:1px solid #e1e1e8;border-radius:3px}main article .comment-count{font-size:.8em}main article table{border-collapse:collapse;border-spacing:0}main article table thead:first-child tr:first-child th{border-top:0}main article table td,main article table th{padding:8px;line-height:20px;vertical-align:top;border-top:1px solid #ddd}main footer{padding-top:4px;border-top:#eee 1px solid}main footer p{margin:2px;text-align:center;padding:0 40px;color:#999;font-size:11px}.tag-cloud a,a.btn{text-align:center;line-height:1;color:#fff;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.tag-cloud a{background-color:#d9411e;padding:.2em .6em;font-size:.74em}.tag-cloud a:hover{background-color:#ff5a09}a.btn{background-color:#d9411e;padding:.4em .6em;font-size:.9em}a.btn:hover{background-color:#ff5a09}.center{text-align:center}.float-right{float:right}ul.list,ul.social{list-style-type:none;margin:0;padding:0}ul.list{padding:1em 0}ul.list li{padding:4px}ul.social{font-size:1.6em;padding-top:20px}ul.social li{display:inline}ul.social a:hover{z-index:2;-webkit-transform:translateY(-5px);transform:translateY(-5px)}ul.social a{display:inline-block;width:36px;height:36px;border-radius:100%;text-align:center;font-size:.8em;line-height:36px}ul.social a.sc-facebook{background-color:#3e5b98}ul.social a.sc-google{background-color:#d93e2d}ul.social a.sc-pinterest{background-color:#c92619}ul.social a.sc-linkedin{background-color:#3371b7}ul.social a.sc-rss{background-color:#f26109}ul.social a.sc-twitter{background-color:#4da7de}ul.social a.sc-youtube{background-color:#e02a20}ul.social a.sc-github,ul.social a.sc-github-alt{background-color:#111010}ul.social a.sc-envelope-o{background-color:#578AD6}@media screen and (min-width:768px){aside{width:25%;height:100%;position:fixed;top:0;left:0;overflow-y:auto}aside div{padding:36px 18px}aside div nav ul li{padding:0!important;display:block}aside div ul.social{padding-top:32px}main{width:75%;position:absolute;top:0;left:25%;overflow-x:hidden;overflow-y:hidden}main article ul.list li{padding:2px}}
+aside,main footer p,main nav{text-align:center}body,html{width:100%;height:100%}h1,h2,h3,h4,h5,h6{font-weight:300;line-height:1.1}h1{font-size:2.4em}h2{font-size:2em}h3{font-size:1.6em}h4{font-size:1.36em}h5{font-size:1.2em}h6{font-size:1.1em}body{margin:0;padding:0;background-color:#fff;color:#242121;font-family:'Source Sans Pro',Verdana,sans-serif;font-size:1.02em;line-height:1.2em}a{color:#d9411e;text-decoration:none}a:hover{color:#ff5a09}hr{color:#eee;background-color:#eee;height:1px;border:none;margin-top:40px;margin-bottom:40px}aside,aside a{color:#fff}img{max-width:100%}aside{background-color:#333}aside a:hover{color:#eee}aside div{padding:20px;margin:0}aside div img{border-radius:50%;max-width:140px}aside div h1{margin:15px 0 5px}aside div p{margin:0 0 15px;font-size:.92em}aside nav ul li{display:inline;line-height:1.6em;font-size:1.28em;text-transform:lowercase}main nav{text-transform:uppercase;font-size:.72em;padding:14px 0;border-bottom:#eee 1px solid}main nav a{padding:0 4px;border-right:#eee 1px solid}main nav :first-child{border-left:#eee 1px solid}main .pagination{margin:4% 8% 2%}main .social-share p{font-size:.8em}main article{margin:0 8% 2%}main article header h1,main article header h2{margin-bottom:0}main article header p{color:#999;font-size:.82em}main article code,main article kbd,main article pre,main article samp{font-family:'Source Code Pro',Consolas,monospace}main article blockquote,main article pre{background-color:rgba(128,128,128,.05);border-top-right-radius:5px;border-bottom-right-radius:5px;border-left:8px solid rgba(128,128,128,.075);border-left-width:10px}main article blockquote{padding:10px 20px;font-weight:300;font-size:1.1em}main article pre{padding:4px;font-size:.9em;overflow-x:auto}main article samp{white-space:pre;display:block;overflow-x:auto}main article kbd{padding:.1em .6em;border:1px solid rgba(63,63,63,.25);box-shadow:0 1px 0 rgba(63,63,63,.25);background-color:#fff;color:#333;border-radius:3px;display:inline-block;margin:0 .1em;white-space:nowrap;font-size:.78em}main article code{font-size:.8em;white-space:nowrap;color:#c25;padding:1px 3px;background-color:#f7f7f9;border:1px solid #e1e1e8;border-radius:3px}main article .comment-count{font-size:.8em}main article table{border-collapse:collapse;border-spacing:0}main article table thead:first-child tr:first-child th{border-top:0}main article table td,main article table th{padding:8px;line-height:20px;vertical-align:top;border-top:1px solid #ddd}main footer{padding-top:4px;border-top:#eee 1px solid}main footer p{margin:2px;padding:0 40px;color:#999;font-size:11px}.tag-cloud a,a.btn{line-height:1;color:#fff;white-space:nowrap;vertical-align:baseline;border-radius:.25em;text-align:center}.tag-cloud a{background-color:#d9411e;padding:.2em .6em;font-size:.74em}.tag-cloud a:hover{background-color:#ff5a09}a.btn{background-color:#d9411e;padding:.4em .6em;font-size:.9em}a.btn:hover{background-color:#ff5a09}.center{text-align:center}.float-right{float:right}ul.list,ul.social{list-style-type:none;margin:0;padding:0}ul.list{padding:1em 0}ul.list li{padding:4px}ul.social{font-size:1.6em;padding-top:20px}ul.social li{display:inline}ul.social a:hover{z-index:2;-webkit-transform:translateY(-5px);transform:translateY(-5px)}ul.social a{display:inline-block;width:36px;height:36px;border-radius:100%;text-align:center;font-size:.8em;line-height:36px}ul.social a.sc-facebook{background-color:#3e5b98}ul.social a.sc-google{background-color:#d93e2d}ul.social a.sc-pinterest{background-color:#c92619}ul.social a.sc-linkedin{background-color:#3371b7}ul.social a.sc-rss{background-color:#f26109}ul.social a.sc-stack-overflow{background-color:#f90}ul.social a.sc-twitter{background-color:#4da7de}ul.social a.sc-youtube{background-color:#e02a20}ul.social a.sc-github,ul.social a.sc-github-alt{background-color:#111010}ul.social a.sc-envelope-o{background-color:#578AD6}@media screen and (min-width:768px){aside{width:25%;height:100%;position:fixed;top:0;left:0;overflow-y:auto}aside div{padding:36px 18px}aside div nav ul li{padding:0!important;display:block}aside div ul.social{padding-top:32px}main{width:75%;position:absolute;top:0;left:25%;overflow-x:hidden;overflow-y:hidden}main article ul.list li{padding:2px}}

templates/base.html

@@ -3,13 +3,13 @@
 <head>
   <link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic' rel='stylesheet' type='text/css'>
   {% if USE_LESS %}
-  <link rel="stylesheet/less" type="text/css" href="{{ SITEURL }}/theme/css/style.less">
+  <link rel="stylesheet/less" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/style.less">
   <script src="//cdnjs.cloudflare.com/ajax/libs/less.js/2.5.1/less.min.js" type="text/javascript"></script>
   {% else %}
-  <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.min.css">
+  <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/style.min.css">
   {% endif %}
-  <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/pygments.min.css">
+  <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/pygments.min.css">
-  <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/font-awesome.min.css">
+  <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/font-awesome.min.css">
   {% if FEED_ALL_ATOM %}
   <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom">
   {% endif %}
@@ -39,7 +39,7 @@
         {% if SITELOGO %}
         <img src="{{ SITELOGO }}" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
         {% else %}
-        <img src="{{ SITEURL }}/theme/img/profile.png" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
+        <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
         {% endif %}
       </a>
       <h1><a href="{{ SITEURL }}">{{ SITETITLE }}</a></h1>

templates/index.html

@@ -6,8 +6,9 @@
   <header>
     <h2><a href="{{ SITEURL }}/{{ article.url }}#{{ article.slug }}">{{ article.title }}</a></h2>
     <p>
-      Posted on {{ article.locale_date }} in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> &#8226;
+      Posted on {{ article.locale_date }} in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-      {% if article.tags %}Tagged with
+      {% if article.tags %}
+      &#8226; Tagged with
       {% for tag in article.tags %}
       <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% if not loop.last %},{% endif %}
       {% endfor %}

templates/partial/jsonld_article.html

@@ -1,7 +1,7 @@
 {% if SITELOGO %}
   {% set default_cover = SITELOGO %}
 {% else %}
-  {% set default_cover = '{{ SITEURL }}/theme/img/profile.png' %}
+  {% set default_cover = '{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png' %}
 {% endif %}
 <script type="application/ld+json">
 {