Merge branch 'feature/color-scheme'

2 files changed, 108 insertions, 34 deletions

diff --git a/static/css/color-theme.css b/static/css/color-theme.css
new file mode 100644
index 0000000..4599a4c
--- /dev/null
+++ b/static/css/color-theme.css
@@ -0,0 +1,61 @@
+/*
+From material design color palette:
+
+#f1f8e9 - Light Green  50
+#558b2f - Light Green 800
+#33691e - Light Green 900
+
+#bdbdbd - Gray 400
+#616161 - Gray 700
+*/
+
+.text-primary, a {
+    color: #558b2f;
+}
+
+a:hover {
+    color: #33691e;
+}
+
+.global-footer .sns-links a:hover {
+    border: 1px solid #33691e;
+    color: #33691e;
+}
+
+.post-tag a:hover {
+    background-color: #f1f8e9;
+    color: #bdbdbd;
+}
+
+.btn-primary {
+    background-color: transparent;
+    border-color: #ccc;
+}
+
+.btn-primary:hover {
+    color: #fff;
+    background-color: #fff;
+    border-color: #558b2f;
+}
+
+.btn-primary.disabled, .btn-primary.disabled > a {
+    color: #616161;
+    background-color: #fff;
+    border-color: #bdbdbd;
+}
+
+.btn-default {
+  color: #fff;
+  background-color: transparent;
+  border-color: #fff;
+}
+
+.btn-default > a {
+  color: #fff;
+}
+
+.btn-default:hover {
+  color: #fff;
+  background-color: #bdbdbd4c;
+  border-color: #fff;
+}
diff --git a/static/css/main.css b/static/css/main.css
index f1fd51b..660cd61 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -89,7 +89,9 @@ a.btn-subscribe {
 }
 
 a.btn-back {
+    position: absolute;
     left: 20px;
+    top: 20px;
 }
 
 /* Navbar */
@@ -107,7 +109,6 @@ a.btn-back {
 .navbar-item {
     margin-left: 20px;
     position: initial !important;
-
 }
 
 .navbar-item:last-child {
@@ -133,11 +134,9 @@ a.btn-back {
 /* Footer */
 
 .global-footer {
-    margin-top: 10px;
     padding-top: 10px;
     max-width: 750px;
     height: 100px;
-    border-top: 1px solid rgba(0, 0, 0, 0.2);
     color: rgba(0, 0, 0, 0.4);
 }
 
@@ -209,8 +208,7 @@ a.btn-back {
 
 .author-info {
     padding: 25px 0;
-    border-top: 1px solid rgba(0, 0, 0, 0.2);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    overflow: auto;
 }
 
 .author-name {
@@ -230,29 +228,7 @@ a.btn-back {
 }
 
 .author-contact {
-    position: relative;
-    display: inline-block;
-    padding-top: 10px;
-    height: 100px;
-    text-align: center;
-}
-
-.author-contact a {
-    display: inline-block;
-    padding: 7px 16px;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    border-radius: 3px;
-    color: rgba(0, 0, 0, 0.7);
-    text-decoration: none;
-    font-weight: 300;
-    font-size: 13px;
-    transition: background-color,border-color,color 0.1s linear;
-}
-
-.author-contact a:hover {
-    border: 1px solid rgba(51, 122, 182, 1.0);
-    background-color: rgba(51, 122, 183, 1.0);
-    color: rgba(255, 255, 255, 1.0);
+    margin-top: 10px;
 }
 
 /* Pagination */
@@ -296,10 +272,10 @@ a.btn-back {
     border-color: #98a0a4;
 }
 
-/* Override some of Bootstrap's styles */
+/* Bootstrap adjustions */
 
 pre {
-    font-size: 14px;
+    font-size: 13px;
 }
 
 pre code {
@@ -308,10 +284,6 @@ pre code {
     word-wrap: normal;
 }
 
-.pager li>a {
-    transition: background-color 0.1s linear;
-}
-
 blockquote {
      font-style:italic;
 }
@@ -325,3 +297,44 @@ article section img {
     height: auto;
     margin: 13px auto;
 }
+
+.btn {
+    border: 1px solid transparent;
+    font-size: 13px;
+    line-height: 1.58823529;
+    border-radius: 3px;
+      -webkit-user-select: none;
+      -moz-user-select: none;
+      -ms-user-select: none;
+}
+
+.btn:hover, .btn-primary:hover, .btn-default:hover {
+    -webkit-transition: background-color 0.1s linear;
+    -ms-transition: background-color 0.1s linear;
+    transition: background-color 0.1s linear;
+}
+
+.btn-older-posts {
+    float: left;
+}
+
+.btn-newer-posts {
+    float: right;
+}
+
+/*
+Paging at the bottom
+
+I don't use the default pager-class because I want to use the normal buttons with my style
+*/
+.pager-container {
+    overflow: auto;
+}
+
+.delimiter {
+    margin-left: -20px;
+    margin-right: -20px;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}