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

fix(color): the text color selection does not show a checkmark #184

Merged
merged 1 commit into from
Jan 2, 2025
Merged

fix(color): the text color selection does not show a checkmark #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions packages/fluent-editor/src/assets/toolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,10 @@ $arrowWidth: 5px; // 下拉框箭头宽度
}
}

$colorGroup: #000000, #ffffff, #f3f6f8, #e3e5e9, #cacfd8, #959eb2, #5e6678, #f95f5b, #fce5e4, #ffc9c7, #ff8f8a,
#fb564e, #cb160e, #900701, #fecc55, #fff1d0, #fadf9e, #f2cd72, #edb83a, #be8c11, #7c5905, #3dcca6, #ccf7ec, #abf3e0,
#46e3b9, #12c898, #0c9f78, #06664d, #5090ff, #c7d9fa, #9cbffb, #659cfc, #387df4, #1457cd, #072c6e;
$colorGroup: '#000000', '#e60000', '#ff9900', '#ffff00', '#008a00', '#0066cc', '#9933ff', '#ffffff', '#facccc',
qwangry marked this conversation as resolved.
Show resolved Hide resolved
'#ffebcc', '#ffffcc', '#cce8cc', '#cce0f5', '#ebd6ff', '#bbbbbb', '#f06666', '#ffc266', '#ffff66', '#66b966',
'#66a3e0', '#c285ff', '#888888', '#a10000', '#b26b00', '#b2b200', '#006100', '#0047b2', '#6b24b2', '#444444',
'#5c0000', '#663d00', '#666600', '#003700', '#002966', '#3d1466';
qwangry marked this conversation as resolved.
Show resolved Hide resolved

.ql-toolbar {
.ql-picker.ql-expanded {
Expand Down Expand Up @@ -210,6 +211,9 @@ $arrowWidth: 5px; // 下拉框箭头宽度
'1',
'2',
'3',
'4',
'5',
'6',
// 标题下拉框
'songti',
'yahei',
Expand All @@ -227,13 +231,17 @@ $arrowWidth: 5px; // 下拉框箭头宽度
'13px',
'14px',
'16px',
'18px',
'19px',
'20px',
'22px',
'24px',
'29px',
'32px',
'36px',
'40px',
'48px',
'72px',
// 字号下拉框
'2.5',
'4',
Expand Down
Loading