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

feat: apply new styles #917

Merged
merged 2 commits into from
Apr 22, 2020
Merged

feat: apply new styles #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02ddf15
feat: apply design guide to markdown editor
seonim-ryu Apr 22, 2020
ebf9953
feat: apply design guide to viewer
seonim-ryu Apr 22, 2020
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
113 changes: 76 additions & 37 deletions apps/editor/src/css/contents.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
@charset "utf-8";
.CodeMirror {
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
}

.tui-editor-contents *:not(table) {
line-height: 160%;
box-sizing: content-box;
Expand All @@ -23,7 +19,7 @@

.tui-editor-contents p {
margin: 10px 0;
color: #555;
color: #222;
}

.tui-editor-contents > h1:first-of-type,
Expand All @@ -34,52 +30,72 @@
.tui-editor-contents h1,
.tui-editor-contents h2,
.tui-editor-contents h3,
.tui-editor-contents h5 {
.tui-editor-contents h4,
.tui-editor-contents h5,
.tui-editor-contents h6 {
font-weight: bold;
color: #222;
}

.tui-editor-contents h1 {
font-size: 1.6rem;
font-size: 24px;
line-height: 28px;
border-bottom: 3px double #999;
margin: 52px 0 15px 0;
padding-bottom: 7px;
color: #000;
}

.tui-editor-contents h2 {
font-size: 1.3rem;
font-size: 22px;
line-height: 23px;
border-bottom: 1px solid #dbdbdb;
margin: 30px 0 13px 0;
margin: 20px 0 13px 0;
padding-bottom: 7px;
color: #333;
}

.tui-editor-contents h3 {
font-size: 20px;
margin: 18px 0 2px;
}

.tui-editor-contents h4 {
font-size: 18px;
margin: 10px 0 2px;
}

.tui-editor-contents h3,
.tui-editor-contents h4 {
font-size: 1.2rem;
line-height: 18px;
margin: 20px 0 2px;
color: #333;
}

.tui-editor-contents h5 {
font-size: 16px;
}

.tui-editor-contents h6 {
font-size: 14px;
}

.tui-editor-contents h5,
.tui-editor-contents h6 {
font-size: 1rem;
line-height: 17px;
margin: 10px 0 -4px;
color: #333;
margin: 9px 0 -4px;
}

.tui-editor-contents blockquote {
margin: 15px 0;
.tui-editor-contents del {
color: #999;
}

.tui-editor-contents blockquote {
border-left: 4px solid #dddddd;
padding: 0 15px;
color: #777777;
margin: 14px 0;
border-left: 4px solid #e5e5e5;
padding: 0 12px;
}

.tui-editor-contents blockquote,
.tui-editor-contents blockquote ul,
.tui-editor-contents blockquote ol {
color: #999;
}

.tui-editor-contents blockquote > :first-child {
Expand All @@ -105,9 +121,11 @@
}

.tui-editor-contents code {
color: #c1788b;
padding: 4px 4px 2px 0;
color: #c1798b;
background-color: #f9f2f4;
padding: 2px 3px;
letter-spacing: -0.3px;
border-radius: 2px;
}

.tui-editor-contents pre code {
Expand All @@ -131,7 +149,7 @@

.tui-editor-contents table {
margin: 2px 0 14px;
color: #555;
color: #222;
width: auto;
border-collapse: collapse;
box-sizing: border-box;
Expand All @@ -144,13 +162,13 @@
}

.tui-editor-contents table td {
border: 1px solid #eaeaea;
border: 1px solid #e5e5e5;
}

.tui-editor-contents table th {
border: 1px solid #72777b;
border: 1px solid rgba(0, 0, 0, 0.1);
border-top: 0;
background-color: #7b8184;
background-color: #555;
font-weight: 300;
color: #fff;
padding-top: 6px;
Expand All @@ -161,14 +179,35 @@
.tui-editor-contents ol,
.tui-editor-contents dir {
display: block;
list-style-type: disc;
padding-left: 17px;
list-style-type: none;
padding-left: 15px;
margin: 6px 0 10px;
color: #555;
color: #222;
}

.tui-editor-contents ol {
list-style-type: decimal;
list-style-type: none;
counter-reset: li;
}

.tui-editor-contents ol li {
counter-increment: li;
}

.tui-editor-contents ul li::before,
.tui-editor-contents ol li::before {
color: #aaa;
display: inline-block;
width: 1em;
margin-left: -1em;
}

.tui-editor-contents ul li::before {
content: '\2022';
}

.tui-editor-contents ol li::before {
content: counter(li) '.';
}

.tui-editor-contents ul ul,
Expand Down Expand Up @@ -202,11 +241,11 @@ ol p {

.tui-editor-contents a {
text-decoration: underline;
color: #5286bc;
color: #00a9ff;
}

.tui-editor-contents a:hover {
color: #007cff;
color: #00a9ff;
}

.tui-editor-contents {
Expand All @@ -218,8 +257,8 @@ ol p {
.tui-editor-contents .task-list-item {
border: 0;
list-style: none;
padding-left: 22px;
margin-left: -22px;
padding-left: 23px;
margin-left: -18px;
min-height: 20px;
}

Expand All @@ -231,7 +270,7 @@ ol p {
height: 18px;
width: 18px;
position: absolute;
left: 0;
left: 14px;
top: 1px;
cursor: pointer;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAADdJREFUKBVjvHv37n8GMgALSI+SkhJJWu/du8fARJIOJMWjGpECA505GjjoIYLEB6dVUNojFQAA/1MJUFWet/4AAAAASUVORK5CYII=');
Expand Down
3 changes: 2 additions & 1 deletion apps/editor/src/css/editor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@
position: relative;
border: 1px solid #e5e5e5;
height: 100%;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', 'Arial', '나눔바른고딕',
'Nanum Barun Gothic', '맑은고딕', 'Malgun Gothic', sans-serif;
}

.tui-editor-defaultUI button {
Expand Down
47 changes: 38 additions & 9 deletions apps/editor/src/css/md-syntax-highlighting.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.te-md-container .CodeMirror {
color: #000;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', 'Arial', '나눔바른고딕',
'Nanum Barun Gothic', '맑은고딕', 'Malgun Gothic', sans-serif;
color: #222;
}

.tui-md-heading1 {
Expand Down Expand Up @@ -49,36 +50,64 @@
.tui-md-delimiter,
.tui-md-thematic-break,
.tui-md-link,
.tui-md-table,
.tui-md-table {
color: #ddd;
}

.tui-md-block-quote {
color: #ccc;
}

.tui-md-code-block.tui-md-meta {
color: #aaa;
}

.tui-md-meta,
.tui-md-link.tui-md-link-url.tui-md-marked-text {
color: #999;
}

.tui-md-block-quote.tui-md-marked-text {
.tui-md-block-quote.tui-md-marked-text,
.tui-md-list-item.tui-md-meta {
color: #555;
}

.tui-md-table.tui-md-marked-text {
color: #000;
color: #222;
}

.tui-md-link.tui-md-link-desc.tui-md-marked-text {
color: #00a9ff;
}

.tui-md-link.tui-md-link-desc.tui-md-marked-text,
.tui-md-list-item-odd.tui-md-list-item-bullet {
color: #5182b6;
color: #2885b5;
}

.tui-md-code.tui-md-marked-text,
.tui-md-list-item-even.tui-md-list-item-bullet {
color: #c1788b;
color: #cb4848;
}

.tui-md-code.tui-md-marked-text {
color: #c1798b;
}

.tui-md-code {
background-color: #f9f2f4;
padding: 2px 0;
letter-spacing: -0.3px;
}

.tui-md-code.tui-md-delimiter.start {
padding-left: 2px;
border-top-left-radius: 2px;
border-bottom-left-radius: 2px;
}

.tui-md-code.tui-md-delimiter.end {
padding-right: 2px;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
}

.tui-md-code-block.CodeMirror-linebackground {
Expand Down
2 changes: 1 addition & 1 deletion apps/editor/src/css/old/md-syntax-highlighting.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.te-md-container .CodeMirror {
color: #000;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
color: #000;
}

.tui-md-heading1 {
Expand Down