1 files changed, 54 insertions, 23 deletions

diff --git a/assets/sass/pages/_single.scss b/assets/sass/pages/_single.scss
index 57e0262..aa0f01a 100644
--- a/assets/sass/pages/_single.scss
+++ b/assets/sass/pages/_single.scss
@@ -57,8 +57,8 @@
       overflow: hidden;
     }
 
-    & > p > a {
-      text-decoration: underline;
+    & > p {
+      margin: 0 0 1rem 0;
     }
 
     margin: 1rem 0;
@@ -135,11 +135,14 @@
 
       @include themify($themes) {
         border-top: 1px solid themed('border-line-color');
-        border-bottom: 1px solid themed('border-line-color');
 
         @include webkit-scrollbars(themed('custom-scrollbar-foreground-color'), themed('custom-scrollbar-background-color'));
         @include moz-scrollbars(themed('custom-scrollbar-foreground-color'), themed('custom-scrollbar-background-color'));
       }
+
+      @include themify($codeblock) {
+        background-color: themed('content-pre-background-color');
+      }
     }
 
     pre:not(.chroma) {
@@ -147,7 +150,7 @@
       margin: 1rem 0;
 
       @include themify($codeblock) {
-        border-left: 4px solid themed('content-pre-border-background-color');
+        border: 1px solid themed('content-pre-border-background-color');
       }
     }
 
@@ -165,6 +168,7 @@
       padding: 0.25rem 0.5rem;
       @include themify($codeblock) {
         color: themed('content-code-color');
+        background-color: themed('content-code-background-color');
       }
     }
 
@@ -179,13 +183,19 @@
       position: relative;
       
       @include themify($themes) {
-          border-left: 5px solid themed("single-blockquote-border-color");
+        border-left: 5px solid themed("single-blockquote-border-color");
       }
 
       code:not([class^=language]) {
         padding: 3px 7px;
         margin: 0 0.25rem;
         @include themify($codeblock) {
+          color: themed('content-code-in-pre-color');
+        }
+      }
+
+      p > code:not([class^=language]) {
+        @include themify($codeblock) {
           color: themed('content-code-color');
         }
       }
@@ -198,7 +208,6 @@
     }
 
     p {
-      margin: 0 0 10px 0;
       padding: 0 1rem;      
 
       code:not([class^=language]) {
@@ -224,23 +233,38 @@
 
     &[data-dir="ltr"] {
       li {
-        margin-left: 2rem;
+        margin-left: 3rem;
       }
     }
 
     &[data-dir="rtl"] {
       li {
-        margin-right: 2rem;
+        margin-right: 3rem;
       }
     }
 
     li {
       & > code {
         padding: 2px 7px;
+
+        @include themify($codeblock) {
+          color: themed('content-code-color') !important;
+          background-color: themed('content-code-background-color');
+        }
+      }
+
+      & > p {
+        padding: 0 0.4rem;
       }
 
       code:not([class^=language]) {
         @include themify($codeblock) {
+          color: themed('content-code-in-pre-color');
+        }
+      }
+      
+      p > code:not([class^=language]) {
+        @include themify($codeblock) {
           color: themed('content-code-color');
         }
       }
@@ -298,12 +322,17 @@
           }
 
           th {
-            color: themed('content-pre-header-color');            
+            color: themed('content-pre-header-color');
           }
 
           th, td {
             padding: 0.25rem 0.5rem;
             border: 1px double themed('content-pre-border-background-color');
+
+            code {
+              color: themed('content-code-color') !important;
+              background-color: themed('content-code-background-color');
+            }
           }
         }
       }
@@ -312,6 +341,12 @@
         padding: 3px 7px;
         margin: 0 0.25rem;
         @include themify($codeblock) {
+          color: themed('content-code-in-pre-color');
+        }
+      }
+
+      p > code:not([class^=language]) {
+        @include themify($codeblock) {
           color: themed('content-code-color');
         }
       }
@@ -332,7 +367,7 @@
 }
 
 code, pre {
-  padding: 0.25rem 0.5rem;
+  padding: 0.25rem 1rem;
   line-height: 1.5;
   font-family: $code-font-stack;
   overflow: auto;
@@ -363,7 +398,7 @@ code:not([class^=language]) {
   padding: 3px 0;
   border-radius: 4px;
   @include themify($codeblock) {
-    color: themed('content-code-color');
+    color: themed('content-code-in-pre-color');
   }
 }
 
@@ -390,15 +425,14 @@ pre:not(.chroma) {
     left: 0;
     padding: 2px 7px;
     width: 100%;
-    height: 20px;
     z-index: z('toc'); 
     border-top-left-radius: 0.25rem;
     border-top-right-radius: 0.25rem;
     content: '';
 
     @include themify($codeblock) {
-        color: themed('content-pre-header-color');
-        background: themed('content-pre-header-background-color');
+      color: themed('content-pre-header-color');
+      background: themed('content-pre-header-background-color');
     }
   }
 }
@@ -424,7 +458,7 @@ pre:not(.chroma) {
       top: 0;
       right: 0;
       z-index: z('grid');
-      height: 25px;
+      height: 26px;
       width: 100%;
       display: inline-block;
       text-align: right;
@@ -442,19 +476,18 @@ pre:not(.chroma) {
       right: 0;
       z-index: z('clipboard');
       padding: 0.125rem 0.25rem;
-      height: 25px;
+      height: 26px;
       font-family: $title-font;
       font-weight: bold;
       font-size: 0.85rem;
       line-height: 1.5;
       display: inline-block;
-      text-transform: capitalize;
       border-top-left-radius: 0.2rem;
       content: attr(data-lang);
 
       @include themify($themes) {
-        border-top: 1px solid themed('hr-color');
-        border-left: 1px solid themed('hr-color');
+        border: 1px solid themed('border-line-color');
+        border-bottom: none;
       }
 
       @include themify($codeblock) {
@@ -499,9 +532,7 @@ pre:not(.chroma) {
     }
 
     @include themify($codeblock) {
-      td:first-child {
-        border-left: 4px solid themed('content-pre-border-background-color');
-      }
+      border: 1px solid themed('content-pre-border-background-color');
     }
   }
 }
@@ -528,4 +559,4 @@ table:not(.lntable) {
       padding: 2px 7px !important;
     }
   }
-}
\ No newline at end of file
+}