From 242fcc1098f606f13e7d8e123c081e73a3d89366 Mon Sep 17 00:00:00 2001
From: Kia King Ishii <kia.king.08@gmail.com>
Date: Tue, 24 Nov 2020 22:50:25 +0900
Subject: [PATCH] fix: make code block look prettier (#146)

---
 src/client/theme-default/styles/code.css   | 76 ++++++++++++++--------
 src/client/theme-default/styles/layout.css |  3 +-
 src/client/theme-default/styles/vars.css   |  6 +-
 3 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/client/theme-default/styles/code.css b/src/client/theme-default/styles/code.css
index 0bed1198c690..861323e48546 100644
--- a/src/client/theme-default/styles/code.css
+++ b/src/client/theme-default/styles/code.css
@@ -2,10 +2,10 @@ code {
   margin: 0;
   border-radius: 3px;
   padding: .25rem .5rem;
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
-  font-size: 14px;
+  font-family: var(--code-font-family);
+  font-size: var(--code-font-size);
   color: var(--c-text-light);
-  background-color: rgba(27, 31, 35, .05);
+  background-color: var(--code-inline-bg-color);
 }
 
 code .token.deleted {
@@ -18,33 +18,34 @@ code .token.inserted {
 
 div[class*='language-'] {
   position: relative;
-  margin: 14px 0;
-  border-radius: 6px;
-  padding: .5rem 1.5rem;
-  line-height: 24px;
+  margin: 1rem -1.5rem;
   background-color: var(--code-bg-color);
-  overflow-x: auto;
 }
 
-[class*='language-'] pre {
-  position: relative;
-  z-index: 1;
-  background: transparent;
+li > div[class*='language-'] {
+  border-radius: 6px 0 0 6px;
+  margin: 1rem -1.5rem 1rem -1.25rem;
 }
 
-[class*='language-'] code {
-  padding: 0;
-  color: #eee;
+@media (min-width: 420px) {
+  div[class*='language-'] {
+    margin: 1rem 0;
+    border-radius: 6px;
+  }
+
+  li > div[class*='language-'] {
+    margin: 1rem 0 1rem 0rem;
+    border-radius: 6px;
+  }
 }
 
-[class*='language-'] code,
-[class*='language-'] pre {
+[class*='language-'] pre,
+[class*='language-'] code {
   text-align: left;
   white-space: pre;
   word-spacing: normal;
   word-break: normal;
   word-wrap: normal;
-  line-height: 24px;
   -moz-tab-size: 4;
   -o-tab-size: 4;
   tab-size: 4;
@@ -54,17 +55,34 @@ div[class*='language-'] {
   hyphens: none;
 }
 
+[class*='language-'] pre {
+  position: relative;
+  z-index: 1;
+  margin: 0;
+  padding: 1.25rem 1.5rem;
+  background: transparent;
+  overflow-x: auto;
+}
+
+[class*='language-'] code {
+  padding: 0;
+  line-height: var(--code-line-height);
+  font-size: var(--code-font-size);
+  color: #eee;
+}
+
 /* Line highlighting */
 
 .highlight-lines {
   position: absolute;
   top: 0;
+  bottom: 0;
   left: 0;
-  padding-top: var(--code-padding-vertical);
+  padding: 1.25rem 0;
   width: 100%;
-  line-height: 24px;
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
-  font-size: 14px;
+  line-height: var(--code-line-height);
+  font-family: var(--code-font-family);
+  font-size: var(--code-font-size);
   user-select: none;
 }
 
@@ -75,21 +93,23 @@ div[class*='language-'] {
 /* Line numbers mode */
 
 div[class*='language-'].line-numbers-mode {
-  padding-left: 5rem;
+  padding-left: 3.5rem;
 }
 
 .line-numbers-wrapper {
   position: absolute;
   top: 0;
+  bottom: 0;
   left: 0;
+  z-index: 3;
   border-right: 1px solid rgba(0, 0, 0, .5);
-  padding: var(--code-padding-vertical) 0;
+  padding: 1.25rem 0;
   width: 3.5rem;
   text-align: center;
-  line-height: 24px;
-  font-size: 16px;
+  line-height: var(--code-line-height);
+  font-family: var(--code-font-family);
+  font-size: var(--code-font-size);
   color: #888;
-  z-index: 4;
 }
 
 /* Language marker */
@@ -98,7 +118,7 @@ div[class*='language-'].line-numbers-mode {
   position: absolute;
   top: .6em;
   right: 1em;
-  z-index: 3;
+  z-index: 2;
   font-size: .8rem;
   color: #888;
 }
diff --git a/src/client/theme-default/styles/layout.css b/src/client/theme-default/styles/layout.css
index b189e42815d4..ad2733fd2659 100644
--- a/src/client/theme-default/styles/layout.css
+++ b/src/client/theme-default/styles/layout.css
@@ -5,7 +5,8 @@
 }
 
 html {
-  line-height: 1.15;
+  line-height: 1.4;
+  font-size: 16px;
   -webkit-text-size-adjust: 100%;
 }
 
diff --git a/src/client/theme-default/styles/vars.css b/src/client/theme-default/styles/vars.css
index c019a0179837..01fe3e055b0b 100644
--- a/src/client/theme-default/styles/vars.css
+++ b/src/client/theme-default/styles/vars.css
@@ -21,6 +21,7 @@
    * --------------------------------------------------------------------- */
 
   --font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  --font-family-mono: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
 
   /**
    * Z Indexes
@@ -46,7 +47,10 @@
 
   --c-bg: var(--c-white);
 
-  --code-padding-vertical: 1.5rem;
+  --code-line-height: 24px;
+  --code-font-family: var(--font-family-mono);
+  --code-font-size: 14px;
+  --code-inline-bg-color: rgba(27, 31, 35, .05);
   --code-bg-color: #282c34;
 
 }