Fix #491

4 files changed, 23 insertions, 17 deletions

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index db4aad2283..5429d01264 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -294,6 +294,12 @@ img.avatar-100 {
 .markdown li:first-child {
   margin-top: 0;
 }
+.markdown code {
+  padding: 0.2em 0.5em;
+  margin: 0;
+  background-color: rgba(0, 0, 0, 0.04);
+  border-radius: 3px;
+}
 .markdown > pre {
   font-size: 14px;
   line-height: 1.6;
@@ -304,6 +310,10 @@ img.avatar-100 {
   padding: 10px;
   background-color: #f8f8f8;
 }
+.markdown > pre code {
+  padding: 0;
+  background-color: inherit;
+}
 .markdown img {
   padding: 10px 0;
   max-width: 100%;
diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css
index 7c385c1349..f3f6eded79 100644
--- a/public/ng/css/ui.css
+++ b/public/ng/css/ui.css
@@ -151,8 +151,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
+  font: 14px Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
 .text-left {
   text-align: left;
@@ -277,9 +276,6 @@ hr {
   border-bottom: 1px solid #dddddd;
   margin-bottom: .75em;
 }
-p code {
-  color: #b63b2c;
-}
 .radius {
   border-radius: .25em;
 }
diff --git a/public/ng/less/gogs/markdown.less b/public/ng/less/gogs/markdown.less
index ee69fab8b4..72cd610aae 100644
--- a/public/ng/less/gogs/markdown.less
+++ b/public/ng/less/gogs/markdown.less
@@ -26,7 +26,13 @@
             margin-top: 0;
         }
     }
-    > pre {
+    code {
+        padding: 0.2em 0.5em;
+        margin: 0;
+        background-color: rgba(0,0,0,0.04);
+        border-radius: 3px;
+    }
+    >pre {
         font-size: 14px;
         line-height: 1.6;
         overflow: auto;
@@ -35,6 +41,10 @@
         margin: 5px 0;
         padding: 10px;
         background-color: #f8f8f8;
+        code {
+            padding: 0;
+            background-color: inherit;
+        }
     }
     img {
         padding: 10px 0;
diff --git a/public/ng/less/ui/reset.less b/public/ng/less/ui/reset.less
index 36906ce5a7..8ff45d694d 100644
--- a/public/ng/less/ui/reset.less
+++ b/public/ng/less/ui/reset.less
@@ -193,8 +193,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
+    font: 14px Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
 
 .text-left {
@@ -342,15 +341,6 @@ hr {
   border-bottom: 1px solid @hrColor;
   margin-bottom: .75em;
 }
-
-// code element
-
-p {
-  code {
-    color: @inlineCodeColor;
-  }
-}
-
 // radius element
 
 .radius {