Fixing merge

1 files changed, 68 insertions, 31 deletions

diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index 307060ac3..b9acd8b5b 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -16,43 +16,77 @@
 #post-list {
     .markdown-inline-img {
         -moz-force-broken-image-icon: 1;
-        max-height: 500px;
         height: 500px;
+        max-height: 500px;
     }
 }
 
 .post-body--code {
+    overflow-x: auto;
+    overflow-y: hidden;
     position: relative;
 
     pre {
-        margin-bottom: 0;
-        word-break: normal;
-        overflow: auto;
-        word-wrap: normal;
+        border: 1px solid rgba(221,221,221,0.2);
+        border-radius: .25em;
+        margin: 0;
+        padding: 0px;
+        text-align: left;
+        white-space: nowrap;
+    }
+
+    code {
+        border: none;
+        white-space: pre;
+    }
+
+    td {
+        padding: 0 .5em;
+        vertical-align: top;
+    }
+
+    &:hover .post-body--code__language {
+        @include opacity(1);
     }
 }
 
 .post-body--code__language {
-    -webkit-transform: translate3d(0,0,0);
+    @include opacity(0);
+    @include translate3d(0, 0, 0);
+    background: #21586d;
+    border-radius: 0 .25em;
+    color: $white;
+    padding: 4px 10px 5px;
     position: absolute;
-    top: 0;
     right: 0;
-    color: #fff;
-    background: #21586d;
-    padding: 4px 10px 5px 10px;
-    font-size: 13px;
-    opacity: .7;
+    top: 0;
+    -webkit-transition: opacity 0.6s;
+    -moz-transition: opacity 0.6s;
+    -o-transition: opacity 0.6s;
+    transition: opacity 0.6s;
     z-index: 5;
 }
 
+.post-body--code__lineno {
+    border-right: 1px solid #aaa;
+    color: #aaa;
+    margin-right: .5em;
+    text-align: right;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -o-user-select: none;
+    user-select: none;
+}
+
 .post__body {
     hr {
-        height: 4px;
-        padding: 0;
-        margin: 15px 0 16px;
+        @include opacity(.2);
         background-color: #e7e7e7;
         border: 0 none;
-        @include opacity(.2);
+        height: 4px;
+        margin: 15px 0 16px;
+        padding: 0;
     }
 
     code {
@@ -67,50 +101,53 @@
 }
 
 .markdown__table {
-    background: #fff;
+    background: $white;
     margin: 5px 0 10px;
 
     th,
     td {
-        padding: 6px 13px;
         border: 1px solid #ddd;
+        padding: 6px 13px;
     }
 
     tbody tr {
-        background: #fff;
+        background: $white;
 
         &:nth-child(2n) {
             background-color: #f8f8f8;
         }
     }
 }
+
 blockquote {
     border: none;
-    position: relative;
     font-size: 16px;
-    padding: 10px 10px 10px 38px;
     margin-bottom: 0;
+    padding: 10px 10px 10px 38px;
+    position: relative;
 
     &:before {
+        @include opacity(.6);
+        content: '\f10d';
+        display: inline-block;
         font-family: FontAwesome;
-        font-weight: normal;
+        font-size: 20px;
         font-style: normal;
-        display: inline-block;
-        text-decoration: inherit;
-        content: '\f10d';
+        font-weight: normal;
         left: 8px;
-        top: 5px;
         position: absolute;
-        font-size: 20px;
-        @include opacity(.6);
+        text-decoration: inherit;
+        top: 5px;
     }
 }
+
 pre {
-    border: none;
-    margin: 5px 0;
     color: inherit;
+    margin: 5px 0;
+    padding: 0;
 }
+
 code {
-    background: #fff;
+    background: $white;
     color: inherit;
 }