From eb5d721202b065394ecfb421b9fbaa4bdcebaf01 Mon Sep 17 00:00:00 2001
From: Zihao Zhang <zzh8829@gmail.com>
Date: Wed, 6 Mar 2019 18:17:52 -0500
Subject: [PATCH] New style

---
 layouts/_default/list.html      |  4 ++--
 layouts/partials/post-list.html | 20 ++++++++++----------
 static/css/common.css           | 21 ++++++++++++++-------
 static/css/home.css             |  5 +----
 themes/cactus-plus-plus         |  2 +-
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 44b1255..c08ee80 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -10,8 +10,8 @@ <h3>{{ .Key }}</h3>
       <ul>
           {{ range where .Pages "Params.hidden" "ne" "true" }}
           <div class="post-item">
-            <div class="post-time">{{ .Date.Format "Jan 2" }}</div>
-            <a href="{{ .Permalink }}" class="post-link">
+            <a href="{{ .RelPermalink }}" class="post-link">
+              <div class="post-time">{{ .Date.Format "Jan 2" }}</div>
               {{ if .Site.Params.useDescriptionAsTitle }}
                   {{ .Description }}
               {{ else }}
diff --git a/layouts/partials/post-list.html b/layouts/partials/post-list.html
index 38d5745..273e162 100644
--- a/layouts/partials/post-list.html
+++ b/layouts/partials/post-list.html
@@ -1,12 +1,12 @@
 <ul id="post-list">
-    {{ range where .Paginator.Pages "Params.hidden" "ne" "true" }}
-        <li style="clear:both;">
-            <a href='{{ .RelPermalink }}'><aside class="dates">{{ .Date.Format "Jan 2, 06" }}</aside></a>
-            <a href='{{ .RelPermalink }}'> 
-              {{ .Title }}
-              <div class="summary"> {{ .Summary }} </div>
-            </a>
-            <a href='{{ .RelPermalink }}'><aside class="read-more" style="float:left;">Read more →</aside></a>
-        </li>
-    {{ end }}
+  {{ range where .Paginator.Pages "Params.hidden" "ne" "true" }}
+  <li style="clear:both;">
+    <a href='{{ .RelPermalink }}'>
+      <aside class="dates">{{ .Date.Format "Jan 2, 06" }}</aside>
+      {{ .Title }}
+      <div class="summary"> {{ .Summary }} </div>
+      <aside class="read-more" style="float:left;">Read more →</aside>
+    </a>
+  </li>
+  {{ end }}
 </ul>
diff --git a/static/css/common.css b/static/css/common.css
index 58ef274..a5bc242 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -1,5 +1,5 @@
 .wrapper:first-of-type {
-  padding-top: 100px;
+  padding-top: 60px;
 }
 
 #footer {
@@ -17,7 +17,6 @@
 }
 
 .post h2 {
-  margin-left: -5px;
   font-weight: bold;
   color: #333;
 }
@@ -26,22 +25,30 @@ ul {
   margin-bottom: 20px;
 }
 
-code {
+pre {
     font-family: Menlo, Monaco, Courier;
     font-size: 14px;
     font-weight: normal;
-    background-color: #F1F1F1;
-    padding: 0.3em;
+    background-color: #f5f2f0;
+    padding: .5rem;
     box-shadow: inset 0 0 0 1px #E4EBF2;
     border-radius: 3px;
+    margin: .5em 0;
 }
 
-.post h2 {
-  margin-bottom: 1em;
+code {
+    font-family: Menlo, Monaco, Courier;
+    font-size: 14px;
+    font-weight: normal;
+    background-color: #f5f2f0 !important;
+    border-radius: 3px;
+    padding: 0.4rem;
 }
 
+
 .post h2.headline {
   color: #555;
+  font-size: 1rem;
 }
 
 .archive .post-link {
diff --git a/static/css/home.css b/static/css/home.css
index 4f04ba9..fb85c20 100644
--- a/static/css/home.css
+++ b/static/css/home.css
@@ -17,7 +17,6 @@
   color: #111;
   max-width: 500px;
   margin-top: 2px;
-  margin-left: 10px;
 }
 
 #post-list .summary p {
@@ -28,13 +27,11 @@
   float: left;
   position: relative;
   font: 300 17px/1.8 "Helvetica Neue", helvetica, Arial, sans-serif;
-  color: #888;
+  color: #5badf0;
 }
 
 #post-list li:hover .read-more {
-  text-decoration: none;
   color: #5badf0;
-  color: #5694f1;
 }
 
 .scroll-down {
diff --git a/themes/cactus-plus-plus b/themes/cactus-plus-plus
index f6b0efd..e7e5bae 160000
--- a/themes/cactus-plus-plus
+++ b/themes/cactus-plus-plus
@@ -1 +1 @@
-Subproject commit f6b0efd221b7b98349f019a40d7fb0e0bed2c9ce
+Subproject commit e7e5baec5108baf1b433fbbc2eb71d0da8fb564a