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.

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: make code block look prettier #146

Merged
merged 2 commits into from
Nov 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 48 additions & 28 deletions src/client/theme-default/styles/code.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ code {
margin: 0;
border-radius: 3px;
padding: .25rem .5rem;
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 14px;
font-family: var(--code-font-family);
font-size: var(--code-font-size);
color: var(--c-text-light);
background-color: rgba(27, 31, 35, .05);
background-color: var(--code-inline-bg-color);
}

code .token.deleted {
Expand All @@ -18,33 +18,34 @@ code .token.inserted {

div[class*='language-'] {
position: relative;
margin: 14px 0;
border-radius: 6px;
padding: .5rem 1.5rem;
line-height: 24px;
margin: 1rem -1.5rem;
background-color: var(--code-bg-color);
overflow-x: auto;
}

[class*='language-'] pre {
position: relative;
z-index: 1;
background: transparent;
li > div[class*='language-'] {
border-radius: 6px 0 0 6px;
margin: 1rem -1.5rem 1rem -1.25rem;
}

[class*='language-'] code {
padding: 0;
color: #eee;
@media (min-width: 420px) {
div[class*='language-'] {
margin: 1rem 0;
border-radius: 6px;
}

li > div[class*='language-'] {
margin: 1rem 0 1rem 0rem;
border-radius: 6px;
}
}

[class*='language-'] code,
[class*='language-'] pre {
[class*='language-'] pre,
[class*='language-'] code {
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 24px;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
Expand All @@ -54,17 +55,34 @@ div[class*='language-'] {
hyphens: none;
}

[class*='language-'] pre {
position: relative;
z-index: 1;
margin: 0;
padding: 1.25rem 1.5rem;
background: transparent;
overflow-x: auto;
}

[class*='language-'] code {
padding: 0;
line-height: var(--code-line-height);
font-size: var(--code-font-size);
color: #eee;
}

/* Line highlighting */

.highlight-lines {
position: absolute;
top: 0;
bottom: 0;
left: 0;
padding-top: var(--code-padding-vertical);
padding: 1.25rem 0;
width: 100%;
line-height: 24px;
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 14px;
line-height: var(--code-line-height);
font-family: var(--code-font-family);
font-size: var(--code-font-size);
user-select: none;
}

Expand All @@ -75,21 +93,23 @@ div[class*='language-'] {
/* Line numbers mode */

div[class*='language-'].line-numbers-mode {
padding-left: 5rem;
padding-left: 3.5rem;
}

.line-numbers-wrapper {
position: absolute;
top: 0;
bottom: 0;
left: 0;
z-index: 3;
border-right: 1px solid rgba(0, 0, 0, .5);
padding: var(--code-padding-vertical) 0;
padding: 1.25rem 0;
width: 3.5rem;
text-align: center;
line-height: 24px;
font-size: 16px;
line-height: var(--code-line-height);
font-family: var(--code-font-family);
font-size: var(--code-font-size);
color: #888;
z-index: 4;
}

/* Language marker */
Expand All @@ -98,7 +118,7 @@ div[class*='language-'].line-numbers-mode {
position: absolute;
top: .6em;
right: 1em;
z-index: 3;
z-index: 2;
font-size: .8rem;
color: #888;
}
Expand Down
3 changes: 2 additions & 1 deletion src/client/theme-default/styles/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
}

html {
line-height: 1.15;
line-height: 1.4;
font-size: 16px;
-webkit-text-size-adjust: 100%;
}

Expand Down
6 changes: 5 additions & 1 deletion src/client/theme-default/styles/vars.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* --------------------------------------------------------------------- */

--font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
--font-family-mono: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;

/**
* Z Indexes
Expand All @@ -46,7 +47,10 @@

--c-bg: var(--c-white);

--code-padding-vertical: 1.5rem;
--code-line-height: 24px;
--code-font-family: var(--font-family-mono);
--code-font-size: 14px;
--code-inline-bg-color: rgba(27, 31, 35, .05);
--code-bg-color: #282c34;

}