Merge remote-tracking branch 'origin/master' into related_posts-plugin-support

2016-02-22 11:36:11 -07:00 · 2016-02-22 11:36:11 -07:00 · 98159f07d0
commit 98159f07d0
parent 2dd409a44d 16051319bd
20 changed files with 221 additions and 17 deletions
--- a/static/stylesheet/font-awesome.min.css
+++ b/static/stylesheet/font-awesome.min.css
--- a/static/stylesheet/pygments.min.css
+++ b/static/stylesheet/pygments.min.css
--- a/static/stylesheet/style.less
+++ b/static/stylesheet/style.less
@ -143,6 +143,7 @@ main {

  .pagination {
    margin: 4% 8% 2% 8%;
+    height: 20px;
  }

  .social-share {
--- a/static/stylesheet/style.min.css
+++ b/static/stylesheet/style.min.css