Skip to content

Dark theme markdown fixes #7260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 21, 2019
Merged

Dark theme markdown fixes #7260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a0b3a1
fix colors in dark theme - tables inside rendered markdown
Cherrg Jun 20, 2019
f9afaf7
fix colors in dark theme - simpleMDE rendered preview
Cherrg Jun 20, 2019
2304949
Update public/less/themes/arc-green.less
Cherrg Jun 20, 2019
fdaeddb
add missing class name
Cherrg Jun 20, 2019
500faa3
Merge branch 'master' into dark_theme_markdown_fix
lafriks Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion public/css/theme-arc-green.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions public/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ function initWikiForm() {
"text": plainText
},
function (data) {
preview.innerHTML = '<div class="markdown">' + data + '</div>';
preview.innerHTML = '<div class="markdown ui segment">' + data + '</div>';
emojify.run($('.editor-preview')[0]);
}
);
Expand Down Expand Up @@ -1224,7 +1224,7 @@ function setSimpleMDE($editArea) {
"text": plainText
},
function (data) {
preview.innerHTML = '<div class="markdown">' + data + '</div>';
preview.innerHTML = '<div class="markdown ui segment">' + data + '</div>';
emojify.run($('.editor-preview')[0]);
}
);
Expand Down
31 changes: 30 additions & 1 deletion public/less/themes/arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down