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

Jump to bottom

DOC-3881: Revert to Highlight.js, fix admonition issues #112

Merged
merged 2 commits into from
Feb 2, 2024
Merged

DOC-3881: Revert to Highlight.js, fix admonition issues #112

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
29fb252
Add highlight.js bundle to gcx, fix admonition errors with dark mode …
josuebran Jan 31, 2024
f62d768
update code styles for highlight.js
josuebran Feb 1, 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 gcx/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const cleanCSS = () => {
}

const bundleCSS = () =>
src(['styles/src/css/**/*.css', '!styles/src/css/**/helios-gcx.css', '!styles/src/css/**/highlight.css'])
src(['styles/src/css/**/*.css', '!styles/src/css/**/helios-gcx.css'])
.pipe(concat('siteTemp.css'))
.pipe(dest('styles/build/css'))

Expand Down
3 changes: 1 addition & 2 deletions gcx/styles/src/css/doc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,7 @@

.doc pre:not(.highlight),
.doc pre.highlight code {
/* background: var(--pre-background); */
box-shadow: inset 0 0 1.75px var(--pre-border-color);
background: none;
display: block;
overflow-x: auto;
padding: 0.75rem;
Expand Down
7 changes: 0 additions & 7 deletions gcx/styles/src/css/helios-gcx-alerts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@
border-radius: 6px;
}

.dark-mode .doc .admonitionblock.important tr {
display: block;
background: var(--color-white);
border: 2px solid var(--color-gray-neutral-500);
border-radius: 6px;
}

.doc .admonitionblock.important td.content {
color: var(--color-black);
}
Expand Down
4 changes: 3 additions & 1 deletion gcx/styles/src/css/helios-gcx-code.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@

.doc pre.highlight,
.doc pre:not(.highlight) {
/* background: #f7f8ff; */
background: var(--color-smoke-60);
display: block;
font-size: 14px;
padding: .75rem;
box-shadow: inset 0 0 1.75px #c9cef6;
border: 1px solid var(--color-prism-light-border);
border-radius: .375em;
overflow-x: auto
}

Expand Down
17 changes: 5 additions & 12 deletions gcx/styles/src/css/helios-gcx-icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,31 @@
padding: 0 1.5rem;;
}

.doc .admonitionblock.tip .icon,
.doc .admonitionblock.note .icon {
.doc .admonitionblock.tip > table > tbody > tr > .icon,
.doc .admonitionblock.note > table > tbody > tr > .icon {
color: var(--color-green-700);
background-color: var(--color-green-700);
border: 2px solid var(--color-green-700);
}

.doc .admonitionblock.warning .icon {
.doc .admonitionblock.warning > table > tbody > tr > .icon {
color: var(--color-red-500);
background-color: var(--color-red-500);
border: 2px solid var(--color-red-500);
}

.doc .admonitionblock.caution .icon {
.doc .admonitionblock.caution > table > tbody > tr > .icon {
color: #E64328;
background-color: #E64328;
border: 2px solid #E64328;
}

.doc .admonitionblock.important .icon {
.doc .admonitionblock.important > table > tbody > tr > .icon {
color: var(--color-gray-neutral-700);
background-color: var(--color-gray-neutral-700);
border: 2px solid var(--color-gray-neutral-700);
}

.dark-mode .doc .admonitionblock.important .icon {
color: var(--color-gray-neutral-500);
background-color: var(--color-gray-neutral-500);
border: 2px solid var(--color-gray-neutral-500);
}


.doc .admonitionblock .icon i::after {
color: white;
}
Expand Down
5 changes: 3 additions & 2 deletions gcx/styles/src/css/helios-gcx.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,12 @@ feedback-stars {

.doc pre.highlight,
.doc pre:not(.highlight) {
/* background: #f7f8ff; */
background: var(--color-smoke-60);
display: block;
font-size: 14px;
padding: .75rem;
box-shadow: inset 0 0 1.75px #c9cef6;
border: 1px solid var(--color-prism-light-border);
border-radius: .375em;
overflow-x: auto
}

Expand Down
14 changes: 10 additions & 4 deletions gcx/styles/src/css/highlight.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*! Adapted from the GitHub style by Vasily Polovnyov <vast@whiteants.net> */
/* .hljs-comment,
.hljs-comment,
.hljs-quote {
color: #998;
font-style: italic;
Expand All @@ -8,7 +8,7 @@
.hljs-keyword,
.hljs-selector-tag,
.hljs-subst {
color: #333;
color: var(--color-prism-light-purple);
font-weight: var(--monospace-font-weight-bold);
}

Expand All @@ -17,7 +17,7 @@
.hljs-variable,
.hljs-template-variable,
.hljs-tag .hljs-attr {
color: #008080;
color: var(--color-prism-light-orange);
}

.hljs-string,
Expand Down Expand Up @@ -199,6 +199,12 @@
font-weight: bold;
}

.dark-mode .doc pre.highlight,
.dark-mode .doc pre:not(.highlight) {
background: var(--color-prism-dark-background);
border: 1px solid var(--color-prism-dark-border);
}

pre code.hljs {
display: block;
overflow-x: auto;
Expand Down Expand Up @@ -272,7 +278,7 @@ code.hljs {
.hljs-addition,
.hljs-title.class_.inherited__,
.hljs-string {
color: #637200;
color: var(--color-prism-light-orange);
}

.hljs-built_in,
Expand Down
190 changes: 0 additions & 190 deletions gcx/styles/src/css/prism.css
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions gcx/styles/src/js/vendor/highlight.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading