Commit 1ea4795
Changed files (21)
assets/code.css
@@ -0,0 +1,2 @@
+@import "lightCode.css" screen and (prefers-color-scheme: light);
+@import "darkCode.css" screen and (prefers-color-scheme: dark);
pkg/templates/css/markdown_dark.css → assets/markdown.css
@@ -1,3 +1,27 @@
+:root {
+ color-scheme: light dark;
+ --borderColor-default: light-dark(#d1d9e0, #3d444d);
+ --borderColor-muted: light-dark(#d1d9e0b3, #3d444db3);
+ --borderColor-neutral-muted: var(--borderColor-muted);
+ --bgColor-attention-muted: light-dark(#fff8c5, #bb800926);
+ --bgColor-default: light-dark(#ffffff, #0d1117);
+ --bgColor-muted: light-dark(#f6f8fa, #151b23);
+ --bgColor-neutral-muted: light-dark(#818b981f, #656c7633);
+ --fgColor-danger: light-dark(#d1242f, #f85149);
+ --fgColor-default: light-dark(#1f2328, #f0f6fc);
+ --fgColor-muted: light-dark(#59636e, #9198a1);
+ --focus-outlineColor: light-dark(#0969da, #1f6feb);
+ --fgColor-accent: light-dark(#0969da, #4493f8);
+ --fgColor-attention: light-dark(#9a6700, #d29922);
+ --fgColor-done: light-dark(#8250df, #ab7df8);
+ --fgColor-success: light-dark(#1a7f37, #3fb950);
+ --borderColor-accent-emphasis: light-dark(#0969da, #1f6feb);
+ --borderColor-attention-emphasis: light-dark(#9a6700, #9e6a03);
+ --borderColor-danger-emphasis: light-dark(#cf222e, #da3633);
+ --borderColor-done-emphasis: light-dark(#8250df, #8957e5);
+ --borderColor-success-emphasis: light-dark(#1a7f37, #238636);
+}
+
.markdown-body details,
.markdown-body figcaption,
.markdown-body figure {
@@ -36,12 +60,12 @@
font-weight: 600;
padding-bottom: .3em;
font-size: 2em;
- border-bottom: 1px solid #3d444db3;
+ border-bottom: 1px solid var(--borderColor-muted);
}
.markdown-body mark {
- background-color: #bb800926;
- color: #f0f6fc;
+ background-color: var(--bgColor-attention-muted);
+ color: var(--fgColor-default);
}
.markdown-body small {
@@ -85,11 +109,11 @@
.markdown-body hr {
box-sizing: content-box;
overflow: hidden;
- border-bottom: 1px solid #3d444db3;
+ border-bottom: 1px solid var(--borderColor-muted);
height: .25em;
padding: 0;
margin: 1.5rem 0;
- background-color: #3d444d;
+ background-color: var(--borderColor-default);
}
.markdown-body input {
@@ -139,7 +163,7 @@
}
.markdown-body ::placeholder {
- color: #9198a1;
+ color: var(--fgColor-muted);
opacity: 1;
}
@@ -177,7 +201,7 @@
.markdown-body [role=button]:focus,
.markdown-body input[type=radio]:focus,
.markdown-body input[type=checkbox]:focus {
- outline: 2px solid #1f6feb;
+ outline: 2px solid var(--focus-outlineColor);
outline-offset: -2px;
box-shadow: none;
}
@@ -193,7 +217,7 @@
.markdown-body [role=button]:focus-visible,
.markdown-body input[type=radio]:focus-visible,
.markdown-body input[type=checkbox]:focus-visible {
- outline: 2px solid #1f6feb;
+ outline: 2px solid var(--focus-outlineColor);
outline-offset: -2px;
box-shadow: none;
}
@@ -212,12 +236,13 @@
padding: 0.25rem;
font: 11px ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
line-height: 10px;
- color: #f0f6fc;
+ color: var(--fgColor-default);
vertical-align: middle;
- background-color: #151b23;
- border: solid 1px #3d444db3;
+ background-color: var(--bgColor-muted);
+ border: solid 1px var(--borderColor-neutral-muted);
+ border-bottom-color: var(--borderColor-neutral-muted);
border-radius: 6px;
- box-shadow: inset 0 -1px 0 #3d444db3;
+ box-shadow: inset 0 -1px 0 var(--borderColor-neutral-muted);
}
.markdown-body h1,
@@ -236,7 +261,7 @@
font-weight: 600;
padding-bottom: .3em;
font-size: 1.5em;
- border-bottom: 1px solid #3d444db3;
+ border-bottom: 1px solid var(--borderColor-muted);
}
.markdown-body h3 {
@@ -257,7 +282,7 @@
.markdown-body h6 {
font-weight: 600;
font-size: .85em;
- color: #9198a1;
+ color: var(--fgColor-muted);
}
.markdown-body p {
@@ -268,8 +293,8 @@
.markdown-body blockquote {
margin: 0;
padding: 0 1em;
- color: #9198a1;
- border-left: .25em solid #3d444d;
+ color: var(--fgColor-muted);
+ border-left: .25em solid var(--borderColor-default);
}
.markdown-body ul,
@@ -310,13 +335,6 @@
word-wrap: normal;
}
-.markdown-body .octicon {
- display: inline-block;
- overflow: visible !important;
- vertical-align: text-bottom;
- fill: currentColor;
-}
-
.markdown-body input::-webkit-outer-spin-button,
.markdown-body input::-webkit-inner-spin-button {
margin: 0;
@@ -352,7 +370,7 @@
}
.markdown-body .absent {
- color: #f85149;
+ color: var(--fgColor-danger);
}
.markdown-body .anchor {
@@ -505,7 +523,7 @@
.markdown-body table th,
.markdown-body table td {
padding: 6px 13px;
- border: 1px solid #3d444d;
+ border: 1px solid var(--borderColor-default);
}
.markdown-body table td > :last-child {
@@ -513,12 +531,12 @@
}
.markdown-body table tr {
- background-color: #0d1117;
- border-top: 1px solid #3d444db3;
+ background-color: var(--bgColor-default);
+ border-top: 1px solid var(--borderColor-neutral-muted);
}
.markdown-body table tr:nth-child(2n) {
- background-color: #151b23;
+ background-color: var(--bgColor-muted);
}
.markdown-body table img {
@@ -551,7 +569,7 @@
padding: 7px;
margin: 13px 0 0;
overflow: hidden;
- border: 1px solid #3d444d;
+ border: 1px solid var(--borderColor-default);
}
.markdown-body span.frame span img {
@@ -563,7 +581,7 @@
display: block;
padding: 5px 0 0;
clear: both;
- color: #f0f6fc;
+ color: var(--fgColor-default);
}
.markdown-body span.align-center {
@@ -633,7 +651,7 @@
margin: 0;
font-size: 85%;
white-space: break-spaces;
- background-color: #656c7633;
+ background-color: var(--bgColor-neutral-muted);
border-radius: 6px;
}
@@ -678,15 +696,14 @@
overflow: auto;
font-size: 85%;
line-height: 1.45;
- color: #f0f6fc;
- background-color: #151b23;
+ color: var(--fgColor-default);
+ background-color: var(--bgColor-muted);
border-radius: 6px;
}
.markdown-body pre code,
.markdown-body pre tt {
display: inline;
- max-width: auto;
padding: 0;
margin: 0;
overflow: visible;
@@ -709,7 +726,7 @@
.markdown-body .csv-data .blob-num {
padding: 10px 0.5rem 9px;
text-align: right;
- background: #0d1117;
+ background: var(--bgColor-default);
border: 0;
}
@@ -719,7 +736,7 @@
.markdown-body .csv-data th {
font-weight: 600;
- background: #151b23;
+ background: var(--bgColor-muted);
border-top: 0;
}
@@ -733,8 +750,8 @@
.markdown-body .footnotes {
font-size: 12px;
- color: #9198a1;
- border-top: 1px solid #3d444d;
+ color: var(--fgColor-muted);
+ border-top: 1px solid var(--borderColor-default);
}
.markdown-body .footnotes ol {
@@ -759,142 +776,18 @@
left: calc(1.5rem * -1);
pointer-events: none;
content: "";
- border: 2px solid #1f6feb;
+ border: 2px solid var(--focus-outlineColor);
border-radius: 6px;
}
.markdown-body .footnotes li:target {
- color: #f0f6fc;
+ color: var(--fgColor-default);
}
.markdown-body .footnotes .data-footnote-backref g-emoji {
font-family: monospace;
}
-.markdown-body body:has(:modal) {
- padding-right: var(--dialog-scrollgutter) !important;
-}
-
-.markdown-body .pl-c {
- color: #9198a1;
-}
-
-.markdown-body .pl-c1,
-.markdown-body .pl-s .pl-v {
- color: #79c0ff;
-}
-
-.markdown-body .pl-e,
-.markdown-body .pl-en {
- color: #d2a8ff;
-}
-
-.markdown-body .pl-smi,
-.markdown-body .pl-s .pl-s1 {
- color: #f0f6fc;
-}
-
-.markdown-body .pl-ent {
- color: #7ee787;
-}
-
-.markdown-body .pl-k {
- color: #ff7b72;
-}
-
-.markdown-body .pl-s,
-.markdown-body .pl-pds,
-.markdown-body .pl-s .pl-pse .pl-s1,
-.markdown-body .pl-sr,
-.markdown-body .pl-sr .pl-cce,
-.markdown-body .pl-sr .pl-sre,
-.markdown-body .pl-sr .pl-sra {
- color: #a5d6ff;
-}
-
-.markdown-body .pl-v,
-.markdown-body .pl-smw {
- color: #ffa657;
-}
-
-.markdown-body .pl-bu {
- color: #f85149;
-}
-
-.markdown-body .pl-ii {
- color: #f0f6fc;
- background-color: #8e1519;
-}
-
-.markdown-body .pl-c2 {
- color: #f0f6fc;
- background-color: #b62324;
-}
-
-.markdown-body .pl-sr .pl-cce {
- font-weight: bold;
- color: #7ee787;
-}
-
-.markdown-body .pl-ml {
- color: #f2cc60;
-}
-
-.markdown-body .pl-mh,
-.markdown-body .pl-mh .pl-en,
-.markdown-body .pl-ms {
- font-weight: bold;
- color: #1f6feb;
-}
-
-.markdown-body .pl-mi {
- font-style: italic;
- color: #f0f6fc;
-}
-
-.markdown-body .pl-mb {
- font-weight: bold;
- color: #f0f6fc;
-}
-
-.markdown-body .pl-md {
- color: #ffdcd7;
- background-color: #67060c;
-}
-
-.markdown-body .pl-mi1 {
- color: #aff5b4;
- background-color: #033a16;
-}
-
-.markdown-body .pl-mc {
- color: #ffdfb6;
- background-color: #5a1e02;
-}
-
-.markdown-body .pl-mi2 {
- color: #f0f6fc;
- background-color: #1158c7;
-}
-
-.markdown-body .pl-mdr {
- font-weight: bold;
- color: #d2a8ff;
-}
-
-.markdown-body .pl-ba {
- color: #9198a1;
-}
-
-.markdown-body .pl-sg {
- color: #3d444d;
-}
-
-.markdown-body .pl-corl {
- text-decoration: underline;
- color: #a5d6ff;
-}
-
.markdown-body [role=button]:focus:not(:focus-visible),
.markdown-body [role=tabpanel][tabindex="0"]:focus:not(:focus-visible),
.markdown-body button:focus:not(:focus-visible),
@@ -975,7 +868,7 @@
padding: 0.5rem 1rem;
margin-bottom: 1rem;
color: inherit;
- border-left: .25em solid #3d444d;
+ border-left: .25em solid var(--borderColor-default);
}
.markdown-body .markdown-alert > :first-child {
@@ -994,43 +887,43 @@
}
.markdown-body .markdown-alert.markdown-alert-note {
- border-left-color: #1f6feb;
+ border-left-color: var(--borderColor-accent-emphasis);
}
.markdown-body .markdown-alert.markdown-alert-note .markdown-alert-title {
- color: #4493f8;
+ color: var(--fgColor-accent);
}
.markdown-body .markdown-alert.markdown-alert-important {
- border-left-color: #8957e5;
+ border-left-color: var(--borderColor-done-emphasis);
}
.markdown-body .markdown-alert.markdown-alert-important .markdown-alert-title {
- color: #ab7df8;
+ color: var(--fgColor-done);
}
.markdown-body .markdown-alert.markdown-alert-warning {
- border-left-color: #9e6a03;
+ border-left-color: var(--borderColor-attention-emphasis);
}
.markdown-body .markdown-alert.markdown-alert-warning .markdown-alert-title {
- color: #d29922;
+ color: var(--fgColor-attention);
}
.markdown-body .markdown-alert.markdown-alert-tip {
- border-left-color: #238636;
+ border-left-color: var(--borderColor-success-emphasis);
}
.markdown-body .markdown-alert.markdown-alert-tip .markdown-alert-title {
- color: #3fb950;
+ color: var(--fgColor-success);
}
.markdown-body .markdown-alert.markdown-alert-caution {
- border-left-color: #da3633;
+ border-left-color: var(--borderColor-danger-emphasis);
}
.markdown-body .markdown-alert.markdown-alert-caution .markdown-alert-title {
- color: #f85149;
+ color: var(--fgColor-danger);
}
.markdown-body > *:first-child > .heading-element:first-child {
pkg/templates/css/markdown_light.css
@@ -1,1059 +0,0 @@
-.markdown-body details,
-.markdown-body figcaption,
-.markdown-body figure {
- display: block;
-}
-
-.markdown-body summary {
- display: list-item;
-}
-
-.markdown-body [hidden] {
- display: none !important;
-}
-
-.markdown-body a {
- background-color: transparent;
- text-decoration: none;
-}
-
-.markdown-body abbr[title] {
- border-bottom: none;
- text-decoration: underline dotted;
-}
-
-.markdown-body b,
-.markdown-body strong {
- font-weight: 600;
-}
-
-.markdown-body dfn {
- font-style: italic;
-}
-
-.markdown-body h1 {
- margin: .67em 0;
- font-weight: 600;
- padding-bottom: .3em;
- font-size: 2em;
- border-bottom: 1px solid #d1d9e0b3;
-}
-
-.markdown-body mark {
- background-color: #fff8c5;
- color: #1f2328;
-}
-
-.markdown-body small {
- font-size: 90%;
-}
-
-.markdown-body sub,
-.markdown-body sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-
-.markdown-body sub {
- bottom: -0.25em;
-}
-
-.markdown-body sup {
- top: -0.5em;
-}
-
-.markdown-body img {
- border-style: none;
- max-width: 100%;
- box-sizing: content-box;
-}
-
-.markdown-body code,
-.markdown-body kbd,
-.markdown-body pre,
-.markdown-body samp {
- font-family: monospace;
- font-size: 1em;
-}
-
-.markdown-body figure {
- margin: 1em 2.5rem;
-}
-
-.markdown-body hr {
- box-sizing: content-box;
- overflow: hidden;
- border-bottom: 1px solid #d1d9e0b3;
- height: .25em;
- padding: 0;
- margin: 1.5rem 0;
- background-color: #d1d9e0;
-}
-
-.markdown-body input {
- font: inherit;
- margin: 0;
- overflow: visible;
- line-height: inherit;
-}
-
-.markdown-body [type=button],
-.markdown-body [type=reset],
-.markdown-body [type=submit] {
- -webkit-appearance: button;
- appearance: button;
-}
-
-.markdown-body [type=checkbox],
-.markdown-body [type=radio] {
- box-sizing: border-box;
- padding: 0;
-}
-
-.markdown-body [type=number]::-webkit-inner-spin-button,
-.markdown-body [type=number]::-webkit-outer-spin-button {
- height: auto;
-}
-
-.markdown-body [type=search]::-webkit-search-cancel-button,
-.markdown-body [type=search]::-webkit-search-decoration {
- -webkit-appearance: none;
- appearance: none;
-}
-
-.markdown-body ::-webkit-input-placeholder {
- color: inherit;
- opacity: .54;
-}
-
-.markdown-body ::-webkit-file-upload-button {
- -webkit-appearance: button;
- appearance: button;
- font: inherit;
-}
-
-.markdown-body a:hover {
- text-decoration: underline;
-}
-
-.markdown-body ::placeholder {
- color: #59636e;
- opacity: 1;
-}
-
-.markdown-body hr::before {
- display: table;
- content: "";
-}
-
-.markdown-body hr::after {
- display: table;
- clear: both;
- content: "";
-}
-
-.markdown-body table {
- border-spacing: 0;
- border-collapse: collapse;
- display: block;
- width: max-content;
- max-width: 100%;
- overflow: auto;
- font-variant: tabular-nums;
-}
-
-.markdown-body td,
-.markdown-body th {
- padding: 0;
-}
-
-.markdown-body details summary {
- cursor: pointer;
-}
-
-.markdown-body a:focus,
-.markdown-body [role=button]:focus,
-.markdown-body input[type=radio]:focus,
-.markdown-body input[type=checkbox]:focus {
- outline: 2px solid #0969da;
- outline-offset: -2px;
- box-shadow: none;
-}
-
-.markdown-body a:focus:not(:focus-visible),
-.markdown-body [role=button]:focus:not(:focus-visible),
-.markdown-body input[type=radio]:focus:not(:focus-visible),
-.markdown-body input[type=checkbox]:focus:not(:focus-visible) {
- outline: solid 1px transparent;
-}
-
-.markdown-body a:focus-visible,
-.markdown-body [role=button]:focus-visible,
-.markdown-body input[type=radio]:focus-visible,
-.markdown-body input[type=checkbox]:focus-visible {
- outline: 2px solid #0969da;
- outline-offset: -2px;
- box-shadow: none;
-}
-
-.markdown-body a:not([class]):focus,
-.markdown-body a:not([class]):focus-visible,
-.markdown-body input[type=radio]:focus,
-.markdown-body input[type=radio]:focus-visible,
-.markdown-body input[type=checkbox]:focus,
-.markdown-body input[type=checkbox]:focus-visible {
- outline-offset: 0;
-}
-
-.markdown-body kbd {
- display: inline-block;
- padding: 0.25rem;
- font: 11px ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
- line-height: 10px;
- color: #1f2328;
- vertical-align: middle;
- background-color: #f6f8fa;
- border: solid 1px #d1d9e0b3;
- border-bottom-color: #d1d9e0b3;
- border-radius: 6px;
- box-shadow: inset 0 -1px 0 #d1d9e0b3;
-}
-
-.markdown-body h1,
-.markdown-body h2,
-.markdown-body h3,
-.markdown-body h4,
-.markdown-body h5,
-.markdown-body h6 {
- margin-top: 1.5rem;
- margin-bottom: 1rem;
- font-weight: 600;
- line-height: 1.25;
-}
-
-.markdown-body h2 {
- font-weight: 600;
- padding-bottom: .3em;
- font-size: 1.5em;
- border-bottom: 1px solid #d1d9e0b3;
-}
-
-.markdown-body h3 {
- font-weight: 600;
- font-size: 1.25em;
-}
-
-.markdown-body h4 {
- font-weight: 600;
- font-size: 1em;
-}
-
-.markdown-body h5 {
- font-weight: 600;
- font-size: .875em;
-}
-
-.markdown-body h6 {
- font-weight: 600;
- font-size: .85em;
- color: #59636e;
-}
-
-.markdown-body p {
- margin-top: 0;
- margin-bottom: 10px;
-}
-
-.markdown-body blockquote {
- margin: 0;
- padding: 0 1em;
- color: #59636e;
- border-left: .25em solid #d1d9e0;
-}
-
-.markdown-body ul,
-.markdown-body ol {
- margin-top: 0;
- margin-bottom: 0;
- padding-left: 2em;
-}
-
-.markdown-body ol ol,
-.markdown-body ul ol {
- list-style-type: lower-roman;
-}
-
-.markdown-body ul ul ol,
-.markdown-body ul ol ol,
-.markdown-body ol ul ol,
-.markdown-body ol ol ol {
- list-style-type: lower-alpha;
-}
-
-.markdown-body dd {
- margin-left: 0;
-}
-
-.markdown-body tt,
-.markdown-body code,
-.markdown-body samp {
- font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
- font-size: 12px;
-}
-
-.markdown-body pre {
- margin-top: 0;
- margin-bottom: 0;
- font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
- font-size: 12px;
- word-wrap: normal;
-}
-
-.markdown-body .octicon {
- display: inline-block;
- overflow: visible !important;
- vertical-align: text-bottom;
- fill: currentColor;
-}
-
-.markdown-body input::-webkit-outer-spin-button,
-.markdown-body input::-webkit-inner-spin-button {
- margin: 0;
- appearance: none;
-}
-
-.markdown-body .mr-2 {
- margin-right: 0.5rem !important;
-}
-
-.markdown-body::before {
- display: table;
- content: "";
-}
-
-.markdown-body::after {
- display: table;
- clear: both;
- content: "";
-}
-
-.markdown-body > *:first-child {
- margin-top: 0 !important;
-}
-
-.markdown-body > *:last-child {
- margin-bottom: 0 !important;
-}
-
-.markdown-body a:not([href]) {
- color: inherit;
- text-decoration: none;
-}
-
-.markdown-body .absent {
- color: #d1242f;
-}
-
-.markdown-body .anchor {
- float: left;
- padding-right: 0.25rem;
- margin-left: -20px;
- line-height: 1;
-}
-
-.markdown-body .anchor:focus {
- outline: none;
-}
-
-.markdown-body p,
-.markdown-body blockquote,
-.markdown-body ul,
-.markdown-body ol,
-.markdown-body dl,
-.markdown-body table,
-.markdown-body pre,
-.markdown-body details {
- margin-top: 0;
- margin-bottom: 1rem;
-}
-
-.markdown-body blockquote > :first-child {
- margin-top: 0;
-}
-
-.markdown-body blockquote > :last-child {
- margin-bottom: 0;
-}
-
-.markdown-body h1 .octicon-link,
-.markdown-body h2 .octicon-link,
-.markdown-body h3 .octicon-link,
-.markdown-body h4 .octicon-link,
-.markdown-body h5 .octicon-link,
-.markdown-body h6 .octicon-link {
- color: #1f2328;
- vertical-align: middle;
- visibility: hidden;
-}
-
-.markdown-body h1:hover .anchor,
-.markdown-body h2:hover .anchor,
-.markdown-body h3:hover .anchor,
-.markdown-body h4:hover .anchor,
-.markdown-body h5:hover .anchor,
-.markdown-body h6:hover .anchor {
- text-decoration: none;
-}
-
-.markdown-body h1:hover .anchor .octicon-link,
-.markdown-body h2:hover .anchor .octicon-link,
-.markdown-body h3:hover .anchor .octicon-link,
-.markdown-body h4:hover .anchor .octicon-link,
-.markdown-body h5:hover .anchor .octicon-link,
-.markdown-body h6:hover .anchor .octicon-link {
- visibility: visible;
-}
-
-.markdown-body h1 tt,
-.markdown-body h1 code,
-.markdown-body h2 tt,
-.markdown-body h2 code,
-.markdown-body h3 tt,
-.markdown-body h3 code,
-.markdown-body h4 tt,
-.markdown-body h4 code,
-.markdown-body h5 tt,
-.markdown-body h5 code,
-.markdown-body h6 tt,
-.markdown-body h6 code {
- padding: 0 .2em;
- font-size: inherit;
-}
-
-.markdown-body summary h1,
-.markdown-body summary h2,
-.markdown-body summary h3,
-.markdown-body summary h4,
-.markdown-body summary h5,
-.markdown-body summary h6 {
- display: inline-block;
-}
-
-.markdown-body summary h1 .anchor,
-.markdown-body summary h2 .anchor,
-.markdown-body summary h3 .anchor,
-.markdown-body summary h4 .anchor,
-.markdown-body summary h5 .anchor,
-.markdown-body summary h6 .anchor {
- margin-left: -40px;
-}
-
-.markdown-body summary h1,
-.markdown-body summary h2 {
- padding-bottom: 0;
- border-bottom: 0;
-}
-
-.markdown-body ul.no-list,
-.markdown-body ol.no-list {
- padding: 0;
- list-style-type: none;
-}
-
-.markdown-body ol[type="a s"] {
- list-style-type: lower-alpha;
-}
-
-.markdown-body ol[type="A s"] {
- list-style-type: upper-alpha;
-}
-
-.markdown-body ol[type="i s"] {
- list-style-type: lower-roman;
-}
-
-.markdown-body ol[type="I s"] {
- list-style-type: upper-roman;
-}
-
-.markdown-body ol[type="1"] {
- list-style-type: decimal;
-}
-
-.markdown-body div > ol:not([type]) {
- list-style-type: decimal;
-}
-
-.markdown-body ul ul,
-.markdown-body ul ol,
-.markdown-body ol ol,
-.markdown-body ol ul {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-.markdown-body li > p {
- margin-top: 1rem;
-}
-
-.markdown-body li + li {
- margin-top: .25em;
-}
-
-.markdown-body dl {
- padding: 0;
-}
-
-.markdown-body dl dt {
- padding: 0;
- margin-top: 1rem;
- font-size: 1em;
- font-style: italic;
- font-weight: 600;
-}
-
-.markdown-body dl dd {
- padding: 0 1rem;
- margin-bottom: 1rem;
-}
-
-.markdown-body table th {
- font-weight: 600;
-}
-
-.markdown-body table th,
-.markdown-body table td {
- padding: 6px 13px;
- border: 1px solid #d1d9e0;
-}
-
-.markdown-body table td > :last-child {
- margin-bottom: 0;
-}
-
-.markdown-body table tr {
- background-color: #ffffff;
- border-top: 1px solid #d1d9e0b3;
-}
-
-.markdown-body table tr:nth-child(2n) {
- background-color: #f6f8fa;
-}
-
-.markdown-body table img {
- background-color: transparent;
-}
-
-.markdown-body img[align=right] {
- padding-left: 20px;
-}
-
-.markdown-body img[align=left] {
- padding-right: 20px;
-}
-
-.markdown-body .emoji {
- max-width: none;
- vertical-align: text-top;
- background-color: transparent;
-}
-
-.markdown-body span.frame {
- display: block;
- overflow: hidden;
-}
-
-.markdown-body span.frame > span {
- display: block;
- float: left;
- width: auto;
- padding: 7px;
- margin: 13px 0 0;
- overflow: hidden;
- border: 1px solid #d1d9e0;
-}
-
-.markdown-body span.frame span img {
- display: block;
- float: left;
-}
-
-.markdown-body span.frame span span {
- display: block;
- padding: 5px 0 0;
- clear: both;
- color: #1f2328;
-}
-
-.markdown-body span.align-center {
- display: block;
- overflow: hidden;
- clear: both;
-}
-
-.markdown-body span.align-center > span {
- display: block;
- margin: 13px auto 0;
- overflow: hidden;
- text-align: center;
-}
-
-.markdown-body span.align-center span img {
- margin: 0 auto;
- text-align: center;
-}
-
-.markdown-body span.align-right {
- display: block;
- overflow: hidden;
- clear: both;
-}
-
-.markdown-body span.align-right > span {
- display: block;
- margin: 13px 0 0;
- overflow: hidden;
- text-align: right;
-}
-
-.markdown-body span.align-right span img {
- margin: 0;
- text-align: right;
-}
-
-.markdown-body span.float-left {
- display: block;
- float: left;
- margin-right: 13px;
- overflow: hidden;
-}
-
-.markdown-body span.float-left span {
- margin: 13px 0 0;
-}
-
-.markdown-body span.float-right {
- display: block;
- float: right;
- margin-left: 13px;
- overflow: hidden;
-}
-
-.markdown-body span.float-right > span {
- display: block;
- margin: 13px auto 0;
- overflow: hidden;
- text-align: right;
-}
-
-.markdown-body code,
-.markdown-body tt {
- padding: .2em .4em;
- margin: 0;
- font-size: 85%;
- white-space: break-spaces;
- background-color: #818b981f;
- border-radius: 6px;
-}
-
-.markdown-body code br,
-.markdown-body tt br {
- display: none;
-}
-
-.markdown-body del code {
- text-decoration: inherit;
-}
-
-.markdown-body samp {
- font-size: 85%;
-}
-
-.markdown-body pre code {
- font-size: 100%;
-}
-
-.markdown-body pre > code {
- padding: 0;
- margin: 0;
- word-break: normal;
- white-space: pre;
- background: transparent;
- border: 0;
-}
-
-.markdown-body .highlight {
- margin-bottom: 1rem;
-}
-
-.markdown-body .highlight pre {
- margin-bottom: 0;
- word-break: normal;
-}
-
-.markdown-body .highlight pre,
-.markdown-body pre {
- padding: 1rem;
- overflow: auto;
- font-size: 85%;
- line-height: 1.45;
- color: #1f2328;
- background-color: #f6f8fa;
- border-radius: 6px;
-}
-
-.markdown-body pre code,
-.markdown-body pre tt {
- display: inline;
- max-width: auto;
- padding: 0;
- margin: 0;
- overflow: visible;
- line-height: inherit;
- word-wrap: normal;
- background-color: transparent;
- border: 0;
-}
-
-.markdown-body .csv-data td,
-.markdown-body .csv-data th {
- padding: 5px;
- overflow: hidden;
- font-size: 12px;
- line-height: 1;
- text-align: left;
- white-space: nowrap;
-}
-
-.markdown-body .csv-data .blob-num {
- padding: 10px 0.5rem 9px;
- text-align: right;
- background: #ffffff;
- border: 0;
-}
-
-.markdown-body .csv-data tr {
- border-top: 0;
-}
-
-.markdown-body .csv-data th {
- font-weight: 600;
- background: #f6f8fa;
- border-top: 0;
-}
-
-.markdown-body [data-footnote-ref]::before {
- content: "[";
-}
-
-.markdown-body [data-footnote-ref]::after {
- content: "]";
-}
-
-.markdown-body .footnotes {
- font-size: 12px;
- color: #59636e;
- border-top: 1px solid #d1d9e0;
-}
-
-.markdown-body .footnotes ol {
- padding-left: 1rem;
-}
-
-.markdown-body .footnotes ol ul {
- display: inline-block;
- padding-left: 1rem;
- margin-top: 1rem;
-}
-
-.markdown-body .footnotes li {
- position: relative;
-}
-
-.markdown-body .footnotes li:target::before {
- position: absolute;
- top: calc(0.5rem * -1);
- right: calc(0.5rem * -1);
- bottom: calc(0.5rem * -1);
- left: calc(1.5rem * -1);
- pointer-events: none;
- content: "";
- border: 2px solid #0969da;
- border-radius: 6px;
-}
-
-.markdown-body .footnotes li:target {
- color: #1f2328;
-}
-
-.markdown-body .footnotes .data-footnote-backref g-emoji {
- font-family: monospace;
-}
-
-.markdown-body .pl-c {
- color: #59636e;
-}
-
-.markdown-body .pl-c1,
-.markdown-body .pl-s .pl-v {
- color: #0550ae;
-}
-
-.markdown-body .pl-e,
-.markdown-body .pl-en {
- color: #6639ba;
-}
-
-.markdown-body .pl-smi,
-.markdown-body .pl-s .pl-s1 {
- color: #1f2328;
-}
-
-.markdown-body .pl-ent {
- color: #0550ae;
-}
-
-.markdown-body .pl-k {
- color: #cf222e;
-}
-
-.markdown-body .pl-s,
-.markdown-body .pl-pds,
-.markdown-body .pl-s .pl-pse .pl-s1,
-.markdown-body .pl-sr,
-.markdown-body .pl-sr .pl-cce,
-.markdown-body .pl-sr .pl-sre,
-.markdown-body .pl-sr .pl-sra {
- color: #0a3069;
-}
-
-.markdown-body .pl-v,
-.markdown-body .pl-smw {
- color: #953800;
-}
-
-.markdown-body .pl-bu {
- color: #82071e;
-}
-
-.markdown-body .pl-ii {
- color: #f6f8fa;
- background-color: #82071e;
-}
-
-.markdown-body .pl-c2 {
- color: #f6f8fa;
- background-color: #cf222e;
-}
-
-.markdown-body .pl-sr .pl-cce {
- font-weight: bold;
- color: #116329;
-}
-
-.markdown-body .pl-ml {
- color: #3b2300;
-}
-
-.markdown-body .pl-mh,
-.markdown-body .pl-mh .pl-en,
-.markdown-body .pl-ms {
- font-weight: bold;
- color: #0550ae;
-}
-
-.markdown-body .pl-mi {
- font-style: italic;
- color: #1f2328;
-}
-
-.markdown-body .pl-mb {
- font-weight: bold;
- color: #1f2328;
-}
-
-.markdown-body .pl-md {
- color: #82071e;
- background-color: #ffebe9;
-}
-
-.markdown-body .pl-mi1 {
- color: #116329;
- background-color: #dafbe1;
-}
-
-.markdown-body .pl-mc {
- color: #953800;
- background-color: #ffd8b5;
-}
-
-.markdown-body .pl-mi2 {
- color: #d1d9e0;
- background-color: #0550ae;
-}
-
-.markdown-body .pl-mdr {
- font-weight: bold;
- color: #8250df;
-}
-
-.markdown-body .pl-ba {
- color: #59636e;
-}
-
-.markdown-body .pl-sg {
- color: #818b98;
-}
-
-.markdown-body .pl-corl {
- text-decoration: underline;
- color: #0a3069;
-}
-
-.markdown-body [role=button]:focus:not(:focus-visible),
-.markdown-body [role=tabpanel][tabindex="0"]:focus:not(:focus-visible),
-.markdown-body button:focus:not(:focus-visible),
-.markdown-body summary:focus:not(:focus-visible),
-.markdown-body a:focus:not(:focus-visible) {
- outline: none;
- box-shadow: none;
-}
-
-.markdown-body [tabindex="0"]:focus:not(:focus-visible),
-.markdown-body details-dialog:focus:not(:focus-visible) {
- outline: none;
-}
-
-.markdown-body g-emoji {
- display: inline-block;
- min-width: 1ch;
- font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- font-size: 1em;
- font-style: normal !important;
- font-weight: 400;
- line-height: 1;
- vertical-align: -0.075em;
-}
-
-.markdown-body g-emoji img {
- width: 1em;
- height: 1em;
-}
-
-.markdown-body .task-list-item {
- list-style-type: none;
-}
-
-.markdown-body .task-list-item label {
- font-weight: 400;
-}
-
-.markdown-body .task-list-item.enabled label {
- cursor: pointer;
-}
-
-.markdown-body .task-list-item + .task-list-item {
- margin-top: 0.25rem;
-}
-
-.markdown-body .task-list-item .handle {
- display: none;
-}
-
-.markdown-body .task-list-item-checkbox {
- margin: 0 .2em .25em -1.4em;
- vertical-align: middle;
-}
-
-.markdown-body ul:dir(rtl) .task-list-item-checkbox {
- margin: 0 -1.6em .25em .2em;
-}
-
-.markdown-body ol:dir(rtl) .task-list-item-checkbox {
- margin: 0 -1.6em .25em .2em;
-}
-
-.markdown-body .contains-task-list:hover .task-list-item-convert-container,
-.markdown-body .contains-task-list:focus-within .task-list-item-convert-container {
- display: block;
- width: auto;
- height: 24px;
- overflow: visible;
- clip: auto;
-}
-
-.markdown-body ::-webkit-calendar-picker-indicator {
- filter: invert(50%);
-}
-
-.markdown-body .markdown-alert {
- padding: 0.5rem 1rem;
- margin-bottom: 1rem;
- color: inherit;
- border-left: .25em solid #d1d9e0;
-}
-
-.markdown-body .markdown-alert > :first-child {
- margin-top: 0;
-}
-
-.markdown-body .markdown-alert > :last-child {
- margin-bottom: 0;
-}
-
-.markdown-body .markdown-alert .markdown-alert-title {
- display: flex;
- font-weight: 500;
- align-items: center;
- line-height: 1;
-}
-
-.markdown-body .markdown-alert.markdown-alert-note {
- border-left-color: #0969da;
-}
-
-.markdown-body .markdown-alert.markdown-alert-note .markdown-alert-title {
- color: #0969da;
-}
-
-.markdown-body .markdown-alert.markdown-alert-important {
- border-left-color: #8250df;
-}
-
-.markdown-body .markdown-alert.markdown-alert-important .markdown-alert-title {
- color: #8250df;
-}
-
-.markdown-body .markdown-alert.markdown-alert-warning {
- border-left-color: #9a6700;
-}
-
-.markdown-body .markdown-alert.markdown-alert-warning .markdown-alert-title {
- color: #9a6700;
-}
-
-.markdown-body .markdown-alert.markdown-alert-tip {
- border-left-color: #1a7f37;
-}
-
-.markdown-body .markdown-alert.markdown-alert-tip .markdown-alert-title {
- color: #1a7f37;
-}
-
-.markdown-body .markdown-alert.markdown-alert-caution {
- border-left-color: #cf222e;
-}
-
-.markdown-body .markdown-alert.markdown-alert-caution .markdown-alert-title {
- color: #d1242f;
-}
-
-.markdown-body > *:first-child > .heading-element:first-child {
- margin-top: 0 !important;
-}
-
-.markdown-body .highlight pre:has(+.zeroclipboard-container) {
- min-height: 52px;
-}
pkg/templates/blob.gohtml
@@ -1,8 +1,7 @@
{{- /*gotype: github.com/antonmedv/gitmal/pkg/templates.BlobParams */ -}}
{{ define "head" }}
+ <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/markdown.css">
<style>
- {{ .CSS }}
-
[id] {
scroll-margin-top: var(--header-height);
}
@@ -57,6 +56,7 @@
height: auto;
}
</style>
+ <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/code.css">
{{ end }}
{{ define "body" }}
@@ -69,4 +69,3 @@
{{ .Content }}
{{ end }}
{{ end }}
-
pkg/templates/commit.gohtml
@@ -214,9 +214,8 @@
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
}
-
- {{ .DiffCSS }}
</style>
+ <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/code.css">
{{ end }}
{{ define "body" }}
pkg/templates/layout.gohtml
@@ -6,49 +6,25 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ .Title }}</title>
<style>
- {{ if .Dark }}
:root {
- --c-indigo-1: #a8b1ff;
- --c-indigo-2: #5c73e7;
- --c-indigo-3: #3e63dd;
- --c-green: #57ab5a;
- --c-red: #e5534b;
- --c-yellow: #c69026;
- --c-dir: #9198a1;
- --c-gray-soft: rgba(101, 117, 133, .16);
- --c-bg: #1b1b1f;
- --c-bg-alt: #161618;
- --c-bg-elv: #202127;
- --c-text-1: rgba(255, 255, 245, .86);
- --c-text-2: rgba(235, 235, 245, .6);
- --c-text-3: rgba(235, 235, 245, .38);
- --c-border: #3c3f44;
- --c-divider: #2e2e32;
- }
-
- {{ else }}
- :root {
- --c-indigo-1: #3451b2;
- --c-indigo-2: #3a5ccc;
- --c-indigo-3: #5672cd;
- --c-green: #1a7f37;
- --c-red: #c53030;
- --c-yellow: #9a6700;
- --c-dir: #54aeff;
- --c-gray-soft: rgba(142, 150, 170, .14);
- --c-bg: #ffffff;
- --c-bg-alt: #f6f6f7;
- --c-bg-elv: #ffffff;
- --c-text-1: rgba(60, 60, 67);
- --c-text-2: rgba(60, 60, 67, .78);
- --c-text-3: rgba(60, 60, 67, .56);
- --c-border: #c2c2c4;
- --c-divider: #e2e2e3;
- }
-
- {{ end }}
+ color-scheme: light dark;
+ --c-indigo-1: light-dark(#3451b2, #a8b1ff);
+ --c-indigo-2: light-dark(#3a5ccc, #5c73e7);
+ --c-indigo-3: light-dark(#5672cd, #3e63dd);
+ --c-green: light-dark(#1a7f37, #57ab5a);
+ --c-red: light-dark(#c53030, #e5534b);
+ --c-yellow: light-dark(#9a6700, #c69026);
+ --c-dir: light-dark(#54aeff, #9198a1);
+ --c-gray-soft: light-dark(rgba(142, 150, 170, .14), rgba(101, 117, 133, .16));
+ --c-bg: light-dark(#ffffff, #1b1b1f);
+ --c-bg-alt: light-dark(#f6f6f7, #161618);
+ --c-bg-elv: light-dark(#ffffff, #202127);
+ --c-text-1: light-dark(rgba(60, 60, 67), rgba(255, 255, 245, .86));
+ --c-text-2: light-dark(rgba(60, 60, 67, .78), rgba(235, 235, 245, .6));
+ --c-text-3: light-dark(rgba(60, 60, 67, .56), rgba(235, 235, 245, .38));
+ --c-border: light-dark(#c2c2c4, #3c3f44);
+ --c-divider: light-dark(#e2e2e3, #2e2e32);
- :root {
--c-brand-1: var(--c-indigo-1);
--c-brand-2: var(--c-indigo-2);
--c-brand-3: var(--c-indigo-3);
pkg/templates/list.gohtml
@@ -1,5 +1,6 @@
{{- /*gotype: github.com/antonmedv/gitmal/pkg/templates.ListParams*/ -}}
{{ define "head" }}
+ <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/markdown.css">
<style>
.files {
border: 1px solid var(--c-border);
@@ -82,8 +83,6 @@
padding: 16px;
}
}
-
- {{.CSSMarkdown}}
{{ end }}
</style>
{{ end }}
@@ -142,4 +141,3 @@
</div>
{{ end }}
{{ end }}
-
pkg/templates/markdown.gohtml
@@ -1,5 +1,6 @@
{{- /*gotype: github.com/antonmedv/gitmal/pkg/templates.MarkdownParams*/ -}}
{{ define "head" }}
+ <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/markdown.css">
<style>
[id] {
scroll-margin-top: var(--header-height);
@@ -29,8 +30,6 @@
padding: 16px;
}
}
-
- {{.CSSMarkdown}}
</style>
{{ end }}
@@ -42,4 +41,3 @@
</div>
</article>
{{ end }}
-
pkg/templates/templates.go
@@ -23,12 +23,6 @@ var funcs = FuncMap{
},
}
-//go:embed css/markdown_light.css
-var CSSMarkdownLight string
-
-//go:embed css/markdown_dark.css
-var CSSMarkdownDark string
-
//go:embed layout.gohtml header.gohtml file_tree.gohtml svg.gohtml
var layoutContent embed.FS
var layout = Must(New("layout").Funcs(funcs).ParseFS(layoutContent, "*.gohtml"))
@@ -68,8 +62,6 @@ var PreviewTemplate = Must(New("preview").Parse(previewContent))
type LayoutParams struct {
Title string
Name string
- Dark bool
- CSSMarkdown CSS
RootHref string
CurrentRefDir string
Selected string
@@ -91,7 +83,6 @@ type Breadcrumb struct {
type BlobParams struct {
LayoutParams
HeaderParams
- CSS CSS
Blob git.Blob
IsImage bool
IsBinary bool
@@ -160,7 +151,6 @@ type CommitsListParams struct {
type CommitParams struct {
LayoutParams
Commit git.Commit
- DiffCSS CSS
FileTree []*FileTree
FileViews []FileView
}
assets.go
@@ -0,0 +1,32 @@
+package main
+
+import (
+ _ "embed"
+ "os"
+ "path/filepath"
+)
+
+//go:embed assets/markdown.css
+var MarkdownCSS []byte
+
+//go:embed assets/code.css
+var CodeCSS []byte
+
+func copyAssets(params Params) error {
+ outDir := filepath.Join(params.OutputDir, "assets")
+ if err := os.MkdirAll(outDir, 0o755); err != nil {
+ return err
+ }
+
+ markdownCSSpath := filepath.Join(outDir, "markdown.css")
+ if e := os.WriteFile(markdownCSSpath, MarkdownCSS, 0o644); e != nil {
+ return e
+ }
+
+ codeCSSpath := filepath.Join(outDir, "code.css")
+ if e := os.WriteFile(codeCSSpath, CodeCSS, 0o644); e != nil {
+ return e
+ }
+
+ return nil
+}
blob.go
@@ -23,10 +23,9 @@ import (
func generateBlobs(files []git.Blob, params Params) error {
// Prepare shared, read-only resources
- var css strings.Builder
- style := styles.Get(params.Style)
- if style == nil {
- return fmt.Errorf("unknown style: %s", params.Style)
+ lightStyle := styles.Get(params.LightStyle)
+ if lightStyle == nil {
+ return fmt.Errorf("unknown style: %s", params.LightStyle)
}
formatterOptions := []html.Option{
@@ -36,11 +35,6 @@ func generateBlobs(files []git.Blob, params Params) error {
html.WithCSSComments(false),
}
- // Use a temporary formatter to render CSS once
- if err := html.New(formatterOptions...).WriteCSS(&css, style); err != nil {
- return err
- }
-
dirsSet := links.BuildDirSet(files)
filesSet := links.BuildFileSet(files)
@@ -63,7 +57,7 @@ func generateBlobs(files []git.Blob, params Params) error {
defer wg.Done()
// Per-worker instances
- md := createMarkdown(params.Style)
+ md := createMarkdown(params.LightStyle)
formatter := html.New(formatterOptions...)
check := func(err error) bool {
@@ -151,8 +145,6 @@ func generateBlobs(files []git.Blob, params Params) error {
err = templates.MarkdownTemplate.ExecuteTemplate(f, "layout.gohtml", templates.MarkdownParams{
LayoutParams: templates.LayoutParams{
Title: fmt.Sprintf("%s/%s at %s", params.Name, blob.Path, params.Ref),
- Dark: params.Dark,
- CSSMarkdown: cssMarkdown(params.Dark),
Name: params.Name,
RootHref: rootHref,
CurrentRefDir: params.Ref.DirName(),
@@ -180,7 +172,7 @@ func generateBlobs(files []git.Blob, params Params) error {
lx = lexers.Fallback
}
iterator, _ := lx.Tokenise(nil, content)
- if err := formatter.Format(&b, style, iterator); check(err) {
+ if err := formatter.Format(&b, lightStyle, iterator); check(err) {
return
}
contentHTML = template.HTML(b.String())
@@ -194,7 +186,6 @@ func generateBlobs(files []git.Blob, params Params) error {
err = templates.BlobTemplate.ExecuteTemplate(f, "layout.gohtml", templates.BlobParams{
LayoutParams: templates.LayoutParams{
Title: fmt.Sprintf("%s/%s at %s", params.Name, blob.Path, params.Ref),
- Dark: params.Dark,
Name: params.Name,
RootHref: rootHref,
CurrentRefDir: params.Ref.DirName(),
@@ -205,7 +196,6 @@ func generateBlobs(files []git.Blob, params Params) error {
Breadcrumbs: breadcrumbs(params.Name, blob.Path, true),
RawHref: rawHref,
},
- CSS: template.CSS(css.String()),
Blob: blob,
IsBinary: isBin,
IsImage: isImg,
branches.go
@@ -50,7 +50,6 @@ func generateBranches(branches []git.Ref, defaultBranch string, params Params) e
LayoutParams: templates.LayoutParams{
Title: fmt.Sprintf("Branches %s %s", dot, params.Name),
Name: params.Name,
- Dark: params.Dark,
RootHref: rootHref,
CurrentRefDir: params.DefaultRef.DirName(),
Selected: "branches",
commit.go
@@ -23,6 +23,55 @@ import (
"github.com/antonmedv/gitmal/pkg/templates"
)
+// generate the stylesheet for a particular named style
+func generateStyleCSS(outPath string, styleName string) error {
+
+ style := styles.Get(styleName)
+ if style == nil {
+ return fmt.Errorf("unknown style: %s", styleName)
+ }
+
+ formatter := html.New(
+ html.WithClasses(true),
+ html.WithAllClasses(true),
+ html.WithCSSComments(false),
+ html.WithCustomCSS(map[chroma.TokenType]string{
+ chroma.GenericInserted: "display: block;",
+ chroma.GenericDeleted: "display: block;",
+ }),
+ )
+
+ f, err := os.Create(outPath)
+ if err != nil {
+ return err
+ }
+
+ if err := formatter.WriteCSS(f, style); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func generateCommitsCSS(params Params) error {
+ outDir := filepath.Join(params.OutputDir, "assets")
+ if err := os.MkdirAll(outDir, 0o755); err != nil {
+ return err
+ }
+
+ lightPath := filepath.Join(outDir, "lightCode.css")
+ if err := generateStyleCSS(lightPath, params.LightStyle); err != nil {
+ return err
+ }
+
+ darkPath := filepath.Join(outDir, "darkCode.css")
+ if err := generateStyleCSS(darkPath, params.DarkStyle); err != nil {
+ return err
+ }
+
+ return nil
+}
+
func generateCommits(commits map[string]git.Commit, params Params) error {
outDir := filepath.Join(params.OutputDir, "commit")
if err := os.MkdirAll(outDir, 0o755); err != nil {
@@ -116,9 +165,9 @@ func generateCommitPage(commit git.Commit, params Params) error {
return err
}
- style := styles.Get(params.Style)
+ style := styles.Get(params.LightStyle)
if style == nil {
- return fmt.Errorf("unknown style: %s", params.Style)
+ return fmt.Errorf("unknown style: %s", params.LightStyle)
}
formatter := html.New(
@@ -130,11 +179,6 @@ func generateCommitPage(commit git.Commit, params Params) error {
}),
)
- var cssBuf bytes.Buffer
- if err := formatter.WriteCSS(&cssBuf, style); err != nil {
- return err
- }
-
lexer := lexers.Get("diff")
if lexer == nil {
return fmt.Errorf("failed to get lexer for diff")
@@ -238,13 +282,11 @@ func generateCommitPage(commit git.Commit, params Params) error {
LayoutParams: templates.LayoutParams{
Title: fmt.Sprintf("%s %s %s@%s", commit.Subject, dot, params.Name, commit.ShortHash),
Name: params.Name,
- Dark: params.Dark,
RootHref: rootHref,
CurrentRefDir: currentRef.DirName(),
Selected: "commits",
},
Commit: commit,
- DiffCSS: template.CSS(cssBuf.String()),
FileTree: fileTree,
FileViews: filesViews,
})
commits_list.go
@@ -64,7 +64,6 @@ func generateLogForBranch(allCommits []git.Commit, params Params) error {
LayoutParams: templates.LayoutParams{
Title: fmt.Sprintf("Commits %s %s", dot, params.Name),
Name: params.Name,
- Dark: params.Dark,
RootHref: rootHref,
CurrentRefDir: params.Ref.DirName(),
Selected: "commits",
index.go
@@ -102,8 +102,6 @@ func generateIndex(files []git.Blob, params Params) error {
LayoutParams: templates.LayoutParams{
Title: title,
Name: params.Name,
- Dark: params.Dark,
- CSSMarkdown: cssMarkdown(params.Dark),
RootHref: rootHref,
CurrentRefDir: params.Ref.DirName(),
Selected: "code",
list.go
@@ -3,7 +3,6 @@ package main
import (
"context"
"fmt"
- "html/template"
"os"
"path/filepath"
"runtime"
@@ -176,17 +175,11 @@ func generateLists(files []git.Blob, params Params) error {
rootHref := strings.Repeat("../", depth+2)
readmeHTML := readme(di.files, dirsSet, filesSet, params, rootHref)
- var CSSMarkdown template.CSS
- if readmeHTML != "" {
- CSSMarkdown = cssMarkdown(params.Dark)
- }
err = templates.ListTemplate.ExecuteTemplate(f, "layout.gohtml", templates.ListParams{
LayoutParams: templates.LayoutParams{
Title: title,
Name: params.Name,
- Dark: params.Dark,
- CSSMarkdown: CSSMarkdown,
RootHref: rootHref,
CurrentRefDir: params.Ref.DirName(),
Selected: "code",
main.go
@@ -19,7 +19,8 @@ var (
flagOutput string
flagBranches string
flagDefaultBranch string
- flagTheme string
+ flagLightTheme string
+ flagDarkTheme string
flagPreviewThemes bool
flagMinify bool
flagGzip bool
@@ -31,8 +32,8 @@ type Params struct {
RepoDir string
Ref git.Ref
OutputDir string
- Style string
- Dark bool
+ LightStyle string
+ DarkStyle string
DefaultRef git.Ref
}
@@ -64,7 +65,8 @@ func main() {
flag.StringVar(&flagOutput, "output", "output", "Output directory for generated HTML files")
flag.StringVar(&flagBranches, "branches", "", "Regex for branches to include")
flag.StringVar(&flagDefaultBranch, "default-branch", "", "Default branch to use (autodetect master or main)")
- flag.StringVar(&flagTheme, "theme", "github", "Style theme")
+ flag.StringVar(&flagLightTheme, "light-theme", "github", "Style theme, light mode")
+ flag.StringVar(&flagDarkTheme, "dark-theme", "github-dark", "Style theme, dark mode")
flag.BoolVar(&flagPreviewThemes, "preview-themes", false, "Preview available themes")
flag.BoolVar(&flagMinify, "minify", false, "Minify all generated HTML files")
flag.BoolVar(&flagGzip, "gzip", false, "Compress all generated HTML files")
@@ -101,9 +103,20 @@ func main() {
flagName = strings.TrimSuffix(flagName, ".git")
}
- themeColor, ok := themeStyles[flagTheme]
+ themeColorLight, ok := themeStyles[flagLightTheme]
if !ok {
- panic("Invalid theme: " + flagTheme)
+ panic("Invalid theme: " + flagLightTheme)
+ }
+ if themeColorLight != "light" {
+ panic("Specified light theme (" + flagLightTheme + ") is not a light theme")
+ }
+
+ themeColorDark, ok := themeStyles[flagDarkTheme]
+ if !ok {
+ panic("Invalid theme: " + flagDarkTheme)
+ }
+ if themeColorDark != "dark" {
+ panic("Specified dark theme (" + flagLightTheme + ") is not a dark theme")
}
branchesFilter, err := regexp.Compile(flagBranches)
@@ -150,8 +163,8 @@ func main() {
Name: flagName,
RepoDir: input,
OutputDir: outputDir,
- Style: flagTheme,
- Dark: themeColor == "dark",
+ LightStyle: flagLightTheme,
+ DarkStyle: flagDarkTheme,
DefaultRef: git.NewRef(flagDefaultBranch),
}
@@ -233,7 +246,11 @@ func main() {
params.Ref = git.NewRef(flagDefaultBranch)
// Commits pages generation
- echo("> generating commits...")
+ echo("> generating commit pages...")
+ err = generateCommitsCSS(params)
+ if err != nil {
+ panic(err)
+ }
err = generateCommits(commits, params)
if err != nil {
panic(err)
@@ -255,9 +272,15 @@ func main() {
}
}
+ echo("> copying assets...")
+ err = copyAssets(params)
+ if err != nil {
+ panic(err)
+ }
+
if flagMinify || flagGzip {
- echo("> post-processing HTML...")
- if err := postProcessHTML(params.OutputDir, flagMinify, flagGzip); err != nil {
+ echo("> post-processing...")
+ if err := postProcess(params.OutputDir, flagMinify, flagGzip); err != nil {
panic(err)
}
}
markdown.go
@@ -1,15 +1,11 @@
package main
import (
- "html/template"
-
"github.com/yuin/goldmark"
highlighting "github.com/yuin/goldmark-highlighting/v2"
"github.com/yuin/goldmark/extension"
"github.com/yuin/goldmark/parser"
gmhtml "github.com/yuin/goldmark/renderer/html"
-
- "github.com/antonmedv/gitmal/pkg/templates"
)
func createMarkdown(style string) goldmark.Markdown {
@@ -18,6 +14,8 @@ func createMarkdown(style string) goldmark.Markdown {
extension.GFM,
extension.Typographer,
highlighting.NewHighlighting(
+ // This assumes that the classes stay the same,
+ // regardless of style, which should be true
highlighting.WithStyle(style),
),
),
@@ -29,10 +27,3 @@ func createMarkdown(style string) goldmark.Markdown {
),
)
}
-
-func cssMarkdown(dark bool) template.CSS {
- if dark {
- return template.CSS(templates.CSSMarkdownDark)
- }
- return template.CSS(templates.CSSMarkdownLight)
-}
post_process.go
@@ -19,9 +19,10 @@ import (
"github.com/antonmedv/gitmal/pkg/progress_bar"
)
-func postProcessHTML(root string, doMinify bool, doGzip bool) error {
- // 1) Collect all HTML files first
- var files []string
+func postProcess(root string, doMinify bool, doGzip bool) error {
+ // 1) Collect all HTML and CSS files first
+ var html_files []string
+ var css_files []string
if err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
@@ -30,14 +31,17 @@ func postProcessHTML(root string, doMinify bool, doGzip bool) error {
return nil
}
if strings.HasSuffix(d.Name(), ".html") {
- files = append(files, path)
+ html_files = append(html_files, path)
+ }
+ if strings.HasSuffix(d.Name(), ".css") {
+ css_files = append(css_files, path)
}
return nil
}); err != nil {
return err
}
- if len(files) == 0 {
+ if len(html_files) == 0 && len(css_files) == 0 {
return nil
}
@@ -49,7 +53,7 @@ func postProcessHTML(root string, doMinify bool, doGzip bool) error {
if doGzip {
labels = append(labels, "gzip")
}
- pb := progress_bar.NewProgressBar(strings.Join(labels, " + "), len(files))
+ pb := progress_bar.NewProgressBar(strings.Join(labels, " + "), len(html_files)+len(css_files))
defer pb.Done()
// 3) Worker pool
@@ -57,12 +61,13 @@ func postProcessHTML(root string, doMinify bool, doGzip bool) error {
if workers < 1 {
workers = 1
}
- jobs := make(chan string, workers*2)
+ html_jobs := make(chan string, workers*2)
+ css_jobs := make(chan string, workers*2)
var wg sync.WaitGroup
var mu sync.Mutex
var firstErr error
- workerFn := func() {
+ workerFn := func(minifyType string, queue chan string) {
defer wg.Done()
var m *minify.M
if doMinify {
@@ -71,10 +76,10 @@ func postProcessHTML(root string, doMinify bool, doGzip bool) error {
m.AddFunc("text/css", css.Minify)
m.AddFunc("image/svg+xml", svg.Minify)
}
- for path := range jobs {
+ for path := range queue {
data, err := os.ReadFile(path)
if err == nil && doMinify {
- if md, e := m.Bytes("text/html", data); e == nil {
+ if md, e := m.Bytes(minifyType, data); e == nil {
data = md
} else {
err = e
@@ -82,19 +87,19 @@ func postProcessHTML(root string, doMinify bool, doGzip bool) error {
}
if err == nil {
if doGzip {
- // write to file.html.gz
+ // write to file.html.gz / file.css.gz as appropriate
+ // retain original in case serving to client that doesn't support compression
gzPath := path + ".gz"
if e := writeGzip(gzPath, data); e != nil {
err = e
- } else if e := os.Remove(path); e != nil { // remove original .html
- err = e
- }
- } else {
- if e := os.WriteFile(path, data, 0o644); e != nil {
- err = e
}
}
}
+ if err == nil {
+ if e := os.WriteFile(path, data, 0o644); e != nil {
+ err = e
+ }
+ }
if err != nil {
mu.Lock()
@@ -109,12 +114,22 @@ func postProcessHTML(root string, doMinify bool, doGzip bool) error {
wg.Add(workers)
for i := 0; i < workers; i++ {
- go workerFn()
+ go workerFn("text/html", html_jobs)
+ }
+ for _, f := range html_files {
+ html_jobs <- f
+ }
+ close(html_jobs)
+ wg.Wait()
+
+ wg.Add(workers)
+ for i := 0; i < workers; i++ {
+ go workerFn("text/css", css_jobs)
}
- for _, f := range files {
- jobs <- f
+ for _, f := range css_files {
+ css_jobs <- f
}
- close(jobs)
+ close(css_jobs)
wg.Wait()
return firstErr
readme.go
@@ -12,7 +12,7 @@ import (
func readme(files []git.Blob, dirsSet, filesSet links.Set, params Params, rootHref string) template.HTML {
var readmeHTML template.HTML
- md := createMarkdown(params.Style)
+ md := createMarkdown(params.LightStyle)
for _, b := range files {
nameLower := strings.ToLower(b.FileName)