Skip to content
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

style: 默认主题和暗黑主题样式精调 #845

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
Open

style: 默认主题和暗黑主题样式精调 #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5fd9b7c
style: 更改默认主题工具栏颜色
heshuyue Jul 11, 2024
75400ec
style: 更改默认主题行内代码样式
heshuyue Jul 11, 2024
f14d216
style: 更改了编辑区选中区域的颜色
heshuyue Jul 11, 2024
6b7bb04
style: 更改光标空行联想按钮样式
heshuyue Jul 11, 2024
487fd71
style: 调整超链接样式
heshuyue Jul 14, 2024
d6a648a
Merge branch 'dev' of github.com:he-weilai/cherry-markdown into dev
heshuyue Jul 14, 2024
f76cf90
style: 调整行内代码样式
heshuyue Jul 14, 2024
d34403a
Merge branch 'Tencent:dev' into dev
heshuyue Aug 13, 2024
785479c
Merge branch 'Tencent:dev' into dev
heshuyue Aug 15, 2024
728b04d
Merge branch 'Tencent:dev' into dev
heshuyue Aug 29, 2024
8e69e4d
style:暗黑主题样式优化
heshuyue Sep 5, 2024
4b3227f
Merge branch 'Tencent:dev' into dev
heshuyue Sep 5, 2024
a64c6df
Merge branch 'dev' of github.com:he-weilai/cherry-markdown into dev
heshuyue Sep 5, 2024
74637f6
style:默认主题样式优化
heshuyue Sep 7, 2024
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
2 changes: 1 addition & 1 deletion src/sass/cherry.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
}

&:hover {
background: rgba(0, 0, 0, 0.05);
background: #ced4da;

.ch-icon {
color: $toolbarBtnColorLight;
Expand Down
5 changes: 3 additions & 2 deletions src/sass/markdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,9 @@
padding: 0.1em;
border-radius: 0.3em;
white-space: normal;
color: #f85353;
background-color: #e5e5e5;
color: #495057;
background-color: #e9ecef;
border: 1px solid #ced4da;

[data-inline-code-theme='black'] & {
color: #3f4a56;
Expand Down
30 changes: 16 additions & 14 deletions src/sass/themes/dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ $sidebarShadow: $shadow;
$editorBg: rgb(37, 37, 38);
$editorColor: rgb(200, 200, 200);
$editorSelectedBg: $toolbarBtnBgHover;
$editorUrlBg: rgba(81,56,56,1);
$editorUrlBg: #343a40;
$editorCursorColor: rgb(255,255,255);
$editorImportantColor: rgb(247, 133, 83);
$editorCodeColor: rgb(255, 203, 107);
$editorImportantColor: #e9ecef;
$editorCodeColor: $editorImportantColor;
/** 预览区域样式 */
$previewBg: rgb(51, 51, 51);
$previewMobileBgColor: $editorBg;
/** markdown样式 */
$mdColor: $editorColor;
$mdHeaderColor: $editorImportantColor;
$mdLineColor: rgb(105, 105, 105);
$mdAColor: $editorCodeColor;
$mdAColor: #ced4da;
$mdAHoverColor: $editorImportantColor;
$mdInlineCodeColor: $editorCodeColor;
$mdInlineCodeBg: $editorUrlBg;
$mdInlineCodeColor: $editorColor;
$mdInlineCodeBg: #212529;
$mdSvgTextColor: rgb(250, 160, 0);
/** 编辑器样式 */
.cherry.theme__dark {
Expand Down Expand Up @@ -144,20 +144,21 @@ $mdSvgTextColor: rgb(250, 160, 0);
.cherry-toc-head {
i {
&:hover {
color: $toolbarColorItemHoverBorderColor;
color: $toolbarBtnHoverColor;
}
}
}
.cherry-toc-list {
.cherry-toc-one-a {
border-left-color: rgb(247, 133, 83, 0.3);
color:#343a40;
border-left-color: #868e96;
&.current {
border-left-color: rgb(255, 100, 33);
color: rgb(255, 100, 33);
border-left-color: $toolbarBtnHoverColor;
color: #000;
}
&:hover {
border-left-color: rgb(247, 162, 14);
color: rgb(255, 100, 33);
border-left-color: #ced4da;
color: #000;
}
}
}
Expand All @@ -180,7 +181,7 @@ $mdSvgTextColor: rgb(250, 160, 0);
}
.ch-icon-chevronsLeft {
display: inline;
color: rgb(255, 100, 33);
color: $toolbarBtnHoverColor;
}
}
.cherry-toc-list {
Expand Down Expand Up @@ -332,7 +333,7 @@ $mdSvgTextColor: rgb(250, 160, 0);
}

a {
text-decoration: none;
text-decoration: underline;
color: $mdAColor;
&:hover {
color: $mdAHoverColor;
Expand Down Expand Up @@ -463,6 +464,7 @@ $mdSvgTextColor: rgb(250, 160, 0);
color: $mdColor;
&:hover {
color: $mdAHoverColor;
text-decoration: underline;
}
}
}
Expand Down
12 changes: 10 additions & 2 deletions src/sass/themes/default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,16 @@
}
}

// 更改编辑区域选中文字区域的背景色
// 覆盖了 codemirror.css 中的默认样式
.CodeMirror-focused .CodeMirror-selected { background: #bac8ff; }
.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #bac8ff; }
.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #bac8ff; }


/** 光标focus到空行时联想出的按钮 */
.cherry-floatmenu {

background-color: #e9ecef;
}

.cherry-editor {
Expand Down Expand Up @@ -135,7 +141,9 @@
}

a {

&:hover {
text-decoration: underline;
}
}

strong {
Expand Down
4 changes: 2 additions & 2 deletions src/sass/variable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $editorBg: #f8fafb;
$previewBg: #f8fafb;
$fontColor: #3f4a56;
$linkColor: #3582fb;
$linkHoverColor: #056bad;
$linkHoverColor: #364fc7;
$borderColor: #dfe6ee;
$toolbarSplitColor: #dfe6ee;
$fullWidthColor: #d71616;
Expand Down Expand Up @@ -66,7 +66,7 @@ $editorKeywordColor: $fontColor;

// 工具栏
// 暗色
$toolbarBgDark: #20304b;
$toolbarBgDark: $linkHoverColor;
$toolbarShadowDark: $shadow;
$toolbarBtnBgDark: transparent;
$toolbarBtnColorDark: #d7e6fe;
Expand Down
Loading