Merge pull request #158 from simonsmh/patch-1

fix(layout): fix elevation for posts
iblh · Jan 22, 2017 · 339831f · 339831f
2 parents 7f08939 + 4a6c517
commit 339831f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/_config.template.yml b/_config.template.yml
@@ -124,7 +124,14 @@ sidebar:
             #icon: person
 
 
-
+# Card Elevation Level
+card_elevation: 2
+
+# Pages Menu
+pages:
+    #About:
+        #link: "/about"
+        #icon: person
 
 # Qrcode for redirect at other device
 qrcode: false

diff --git a/layout/_partial/Isolation-post_entry.ejs b/layout/_partial/Isolation-post_entry.ejs
@@ -1,6 +1,6 @@
-<div class="post_entry-module mdl-card mdl-cell mdl-cell--12-col fade out">
+<div class="post_entry-module mdl-card <% if(theme.card_elevation) { %><%= 'mdl-shadow--' + theme.card_elevation + 'dp' %><% } %> mdl-cell mdl-cell--12-col fade out">
     <!-- Post_entry Header -->
-    <% if(post.thumbnail == undefined) { %>
+    <% if(!post.thumbnail) { %>
         <!-- Post Header Info -->
         <div class="post_entry-header_info without-thumbnail">
             <!-- Author Avatar & Name -->

diff --git a/layout/_partial/Paradox-post_entry.ejs b/layout/_partial/Paradox-post_entry.ejs
@@ -1,4 +1,4 @@
-<div class="post_entry-module mdl-card mdl-cell mdl-cell--12-col fade out">
+<div class="post_entry-module mdl-card <% if(theme.card_elevation) { %><%= 'mdl-shadow--' + theme.card_elevation + 'dp' %><% } %> mdl-cell mdl-cell--12-col fade out">
     <!-- Post Thumbnail -->
     <% if(!post.thumbnail) { %>
         <% if(!theme.thumbnail.purecolor) { %>

diff --git a/layout/_partial/blog_info.ejs b/layout/_partial/blog_info.ejs
@@ -1,5 +1,5 @@
 <!-- Blog info -->
-<div class="mdl-card something-else mdl-cell mdl-cell--8-col mdl-cell--4-col-desktop index-top-block">
+<div class="mdl-card <% if(theme.card_elevation) { %><%= 'mdl-shadow--' + theme.card_elevation + 'dp' %><% } %> something-else mdl-cell mdl-cell--8-col mdl-cell--4-col-desktop index-top-block">
 
     <!-- Search -->
     <%- partial('_partial/Paradox-search') %>

diff --git a/layout/_partial/daily_pic.ejs b/layout/_partial/daily_pic.ejs
@@ -1,5 +1,5 @@
 <!-- Daily pic -->
-<div class="mdl-card daily-pic mdl-cell mdl-cell--8-col index-top-block">
+<div class="mdl-card <% if(theme.card_elevation) { %><%= 'mdl-shadow--' + theme.card_elevation + 'dp' %><% } %> daily-pic mdl-cell mdl-cell--8-col index-top-block">
 
     <!-- Pic & Slogan -->
     <div class="mdl-card__media mdl-color-text--grey-50" style="background-image:url(<%= theme.img.daily_pic %>)">

diff --git a/layout/post.ejs b/layout/post.ejs
@@ -16,7 +16,7 @@
     <!-- Hidden Page -->
     <div class="material-post_container">
         <div class="material-post mdl-grid">
-            <div class="mdl-card mdl-shadow--4dp mdl-cell mdl-cell--12-col">
+            <div class="mdl-card <% if(theme.card_elevation) { %><%= 'mdl-shadow--' + theme.card_elevation + 'dp' %><% } %> mdl-cell mdl-cell--12-col">
                 <!-- Post Header(Thumbnail & Title) -->
                 <%- partial('_partial/post-header') %>
 

diff --git a/source/css/style.css b/source/css/style.css
@@ -528,7 +528,7 @@ a {
     min-height: 400px;
     flex-direction: column;
     align-items: stretch;
-  border-radius: 5px;
+    border-radius: 2px;
 }
 @media screen and (max-width: 480px) {
   #scheme-Paradox .material-post .mdl-card {
@@ -1261,9 +1261,9 @@ a {
 
 
 #scheme-Isolation .post_entry-module {
-  margin-bottom: 24px;
-  width: 100%;
-    border-radius: 5px;
+    margin-bottom: 24px;
+    width: 100%;
+    border-radius: 2px;
     box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
     -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
 }
@@ -1787,8 +1787,8 @@ a {
 }
 
 #scheme-Isolation .material-post .mdl-card{
-  width: 100%;
-  border-radius: 5px;
+    width: 100%;
+    border-radius: 2px;
 }
 
 #scheme-Isolation .material-nav a{

diff --git a/source/css/style.min.css b/source/css/style.min.css