From d14595514e35810fbcf1dc0d7e3ba8ada4f08c07 Mon Sep 17 00:00:00 2001 From: Cherrg Date: Fri, 21 Jun 2019 15:27:47 +0200 Subject: [PATCH] Dark theme markdown fixes (#7260) * fix colors in dark theme - tables inside rendered markdown Signed-off-by: Michael Gnehr * fix colors in dark theme - simpleMDE rendered preview Signed-off-by: Michael Gnehr * Update public/less/themes/arc-green.less remove scroll bar color, to add this globally on additional PR Co-Authored-By: Lauris BH Signed-off-by: Michael Gnehr * add missing class name Signed-off-by: Michael Gnehr --- public/css/theme-arc-green.css | 8 +++++++- public/js/index.js | 4 ++-- public/less/themes/arc-green.less | 31 ++++++++++++++++++++++++++++++- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/public/css/theme-arc-green.css b/public/css/theme-arc-green.css index dd2b13542a..05cc6e5ebb 100644 --- a/public/css/theme-arc-green.css +++ b/public/css/theme-arc-green.css @@ -92,7 +92,13 @@ footer{background:#2e323e;border-top:1px solid #313131} .markdown:not(code) h2{border-bottom:1px solid #304251} .hljs,.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#9daccc} .markdown:not(code) .highlight pre,.markdown:not(code) pre{background-color:#2a2e3a;border:1px solid #404552} -.markdown:not(code) table tr:nth-child(2n){background-color:#474d61} +.markdown:not(code) table tr:nth-child(2n){background-color:#2a2e39} +.markdown:not(code) table tr:nth-child(2n-1){background-color:#383b44} +.markdown:not(code) table thead tr:nth-child(2n-1){background-color:#464c5d!important} +.markdown:not(code) table td,.markdown:not(code) table th{border-color:#4c505c!important} +.repository.file.editor.edit,.repository.wiki.new .CodeMirror{border-right:1px solid rgba(187,187,187,.6);border-left:1px solid rgba(187,187,187,.6);border-bottom:1px solid rgba(187,187,187,.6)} +.repository.file.editor.edit .editor-preview,.repository.file.editor.edit .editor-preview-side,.repository.wiki.new .CodeMirror .editor-preview,.repository.wiki.new .CodeMirror .editor-preview-side{background:#353945} +.repository.file.editor.edit .editor-preview .markdown:not(code).ui.segment,.repository.file.editor.edit .editor-preview-side .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview .markdown:not(code).ui.segment,.repository.wiki.new .CodeMirror .editor-preview-side .markdown:not(code).ui.segment{border-width:0} .ui.dropdown .menu{background:#2c303a} .ui.dropdown .menu>.message:not(.ui){color:#636363} .ui.input{color:#dbdbdb} diff --git a/public/js/index.js b/public/js/index.js index 28023e1061..3b2527d986 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1144,7 +1144,7 @@ function initWikiForm() { "text": plainText }, function (data) { - preview.innerHTML = '
' + data + '
'; + preview.innerHTML = '
' + data + '
'; emojify.run($('.editor-preview')[0]); } ); @@ -1224,7 +1224,7 @@ function setSimpleMDE($editArea) { "text": plainText }, function (data) { - preview.innerHTML = '
' + data + '
'; + preview.innerHTML = '
' + data + '
'; emojify.run($('.editor-preview')[0]); } ); diff --git a/public/less/themes/arc-green.less b/public/less/themes/arc-green.less index 6d13bb2e52..d2fe2982d7 100644 --- a/public/less/themes/arc-green.less +++ b/public/less/themes/arc-green.less @@ -501,7 +501,36 @@ a.ui.basic.green.label:hover { } .markdown:not(code) table tr:nth-child(2n) { - background-color: #474d61; + background-color: #2a2e39; +} + +.markdown:not(code) table tr:nth-child(2n-1) { + background-color: #383b44; +} + +.markdown:not(code) table thead tr:nth-child(2n-1) { + background-color: #464c5d !important; +} + +.markdown:not(code) table td, +.markdown:not(code) table th { + border-color: #4c505c !important; +} + +.repository.file.editor.edit, +.repository.wiki.new .CodeMirror { + border-right: 1px solid rgba(187,187,187, 0.6); + border-left: 1px solid rgba(187,187,187, 0.6); + border-bottom: 1px solid rgba(187,187,187, 0.6); + + .editor-preview, + .editor-preview-side { + background: #353945; + + .markdown:not(code).ui.segment { + border-width: 0; + } + } } .ui.dropdown .menu {