From da71ead913ca402108f17b58ab0ea2587f4bc4d0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 10 Nov 2020 10:31:56 +0200 Subject: [PATCH 1/5] Update _syntax.scss --- site/assets/scss/_syntax.scss | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/site/assets/scss/_syntax.scss b/site/assets/scss/_syntax.scss index bca6aad83bb7..f7461239b0c0 100644 --- a/site/assets/scss/_syntax.scss +++ b/site/assets/scss/_syntax.scss @@ -1,21 +1,23 @@ // stylelint-disable comment-empty-line-before, declaration-block-single-line-max-declarations, selector-class-pattern /* NEW Background .chroma { background-color: #f0f0f0; } */ +/* NEW_NEW Other .chroma .x { } */ /* NEW Error .chroma .err { } */ /* NEW LineTableTD .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } */ /* NEW LineTable .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; } */ /* NEW LineHighlight .chroma .hl { display: block; width: 100%; background-color: #ffffcc; } */ -/* NEW LineNumbersTable .chroma .lnt { margin-right: .4em; padding: 0 .4em; } */ -/* NEW LineNumbers .chroma .ln { margin-right: .4em; padding: 0 .4em; } */ +/* NEW LineNumbersTable .chroma .lnt { margin-right: .4em; padding: 0 .4em; color: #7f7f7f; } */ +/* NEW LineNumbers .chroma .ln { margin-right: .4em; padding: 0 .4em; color: #7f7f7f; } */ /* LiteralStringDelimiter */ .chroma .dl { color: #4070a0; } /* NEW */ /* Comment */ .chroma .c { color: #727272; } -/* CommentMultiline */ .chroma .c1 { color: #727272; } /* CommentHashbang */ .chroma .ch { font-style: italic; color: #60a0b0; } /* NEW */ /* CommentMultiline */ .chroma .cm { color: #727272; } /* CommentPreproc */ .chroma .cp { color: #008085; } /* CommentPreprocFile */ .chroma .cpf { color: #007020; } /* NEW */ +/* CommentSingle */ .chroma .c1 { color: #727272; } /* CommentSpecial */ .chroma .cs { color: #727272; } +/* Generic .chroma .g { } */ /* NEW_NEW */ /* GenericDeleted */ .chroma .gd { background-color: #fcc; border: 1px solid #c00; } /* GenericEmph */ .chroma .ge { font-style: italic; } /* GenericHeading */ .chroma .gh { color: #030; } @@ -35,6 +37,8 @@ /* KeywordPseudo */ .chroma .kp { color: #069; } /* KeywordReserved */ .chroma .kr { color: #069; } /* KeywordType */ .chroma .kt { color: #078; } +/* Literal .chroma .l { } */ /* NEW_NEW */ +/* LiteralDate .chroma .ld { color: #c24f19 } */ /* NEW_NEW */ /* LiteralNumber */ .chroma .m { color: #c24f19; } /* LiteralNumberFloat */ .chroma .mf { color: #c24f19; } /* LiteralNumberBin */ .chroma .mb { color: #40a070; } /* NEW */ @@ -43,16 +47,25 @@ /* LiteralNumberOct */ .chroma .mo { color: #c24f19; } /* NameAttribute */ .chroma .na { color: #006ee0; } /* NameBuiltin */ .chroma .nb { color: #366; } +/* NameBuiltinPseudo .chroma .bp { } */ /* NEW_NEW */ /* NameClass */ .chroma .nc { color: #168174; } +/* Name .chroma .n { } */ /* NEW_NEW */ /* NameDecorator */ .chroma .nd { color: #6b62de; } /* NameException */ .chroma .ne { color: #c00; } /* NameFunction */ .chroma .nf { color: #b715f4; } /* NameEntity */ .chroma .ni { color: #727272; } +/* NameFunctionMagic .chroma .fm { } */ /* NEW_NEW */ /* NameLabel */ .chroma .nl { color: #6b62de; } /* NameNamespace */ .chroma .nn { color: #007ca5; } /* NameConstant */ .chroma .no { color: #360; } +/* NameOther .chroma .nx { } */ /* NEW_NEW */ +/* NameProperty .chroma .py { } */ /* NEW_NEW */ /* NameTag */ .chroma .nt { color: #2f6f9f; } /* NameVariable */ .chroma .nv { color: #033; } +/* NameVariableClass .chroma .vc { } */ /* NEW_NEW */ +/* NameVariableGlobal .chroma .vg { } */ /* NEW_NEW */ +/* NameVariableInstance .chroma .vi { } */ /* NEW_NEW */ +/* NameVariableMagic .chroma .vm { } */ /* NEW_NEW */ /* Operator */ .chroma .o { color: #555; } /* OperatorWord */ .chroma .ow { color: #000; } /* LiteralString */ .chroma .s { color: #d73038; } @@ -68,6 +81,7 @@ /* LiteralStringRegex */ .chroma .sr { color: #337e7e; } /* LiteralStringSymbol */ .chroma .ss { color: #fc3; } /* LiteralStringOther */ .chroma .sx { color: #c30; } +/* Punctuation .chroma .p { } */ /* NEW_NEW */ /* TextWhitespace */ .chroma .w { color: #bbb; } .chroma { From 8b978d8f938b38db6e74169a8f2e7916ad7d8a16 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 12 Nov 2020 16:52:57 +0200 Subject: [PATCH 2/5] Sort selectors --- site/assets/scss/_syntax.scss | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/site/assets/scss/_syntax.scss b/site/assets/scss/_syntax.scss index f7461239b0c0..2ede921c06eb 100644 --- a/site/assets/scss/_syntax.scss +++ b/site/assets/scss/_syntax.scss @@ -9,7 +9,6 @@ /* NEW LineNumbersTable .chroma .lnt { margin-right: .4em; padding: 0 .4em; color: #7f7f7f; } */ /* NEW LineNumbers .chroma .ln { margin-right: .4em; padding: 0 .4em; color: #7f7f7f; } */ -/* LiteralStringDelimiter */ .chroma .dl { color: #4070a0; } /* NEW */ /* Comment */ .chroma .c { color: #727272; } /* CommentHashbang */ .chroma .ch { font-style: italic; color: #60a0b0; } /* NEW */ /* CommentMultiline */ .chroma .cm { color: #727272; } @@ -20,16 +19,15 @@ /* Generic .chroma .g { } */ /* NEW_NEW */ /* GenericDeleted */ .chroma .gd { background-color: #fcc; border: 1px solid #c00; } /* GenericEmph */ .chroma .ge { font-style: italic; } +/* GenericError */ .chroma .gr { color: #f00; } /* GenericHeading */ .chroma .gh { color: #030; } /* GenericInserted */ .chroma .gi { background-color: #cfc; border: 1px solid #0c0; } -/* GenericUnderline */ .chroma .gl { text-decoration: underline; } /* NEW */ /* GenericOutput */ .chroma .go { color: #aaa; } /* GenericPrompt */ .chroma .gp { color: #009; } -/* GenericError */ .chroma .gr { color: #f00; } /* GenericStrong */ .chroma .gs { font-weight: 700; } /* NEW */ -/* GenericTraceback */ .chroma .gt { color: #9c6; } /* GenericSubheading */ .chroma .gu { color: #030; } -/* LiteralNumberIntegerLong */ .chroma .il { color: #c24f19; } +/* GenericTraceback */ .chroma .gt { color: #9c6; } +/* GenericUnderline */ .chroma .gl { text-decoration: underline; } /* NEW */ /* Keyword */ .chroma .k { color: #069; } /* KeywordConstant */ .chroma .kc { color: #069; } /* KeywordDeclaration */ .chroma .kd { color: #069; } @@ -40,24 +38,39 @@ /* Literal .chroma .l { } */ /* NEW_NEW */ /* LiteralDate .chroma .ld { color: #c24f19 } */ /* NEW_NEW */ /* LiteralNumber */ .chroma .m { color: #c24f19; } -/* LiteralNumberFloat */ .chroma .mf { color: #c24f19; } /* LiteralNumberBin */ .chroma .mb { color: #40a070; } /* NEW */ +/* LiteralNumberFloat */ .chroma .mf { color: #c24f19; } /* LiteralNumberHex */ .chroma .mh { color: #c24f19; } /* LiteralNumberInteger */ .chroma .mi { color: #c24f19; } +/* LiteralNumberIntegerLong */ .chroma .il { color: #c24f19; } /* LiteralNumberOct */ .chroma .mo { color: #c24f19; } +/* LiteralString */ .chroma .s { color: #d73038; } +/* LiteralStringAffix */ .chroma .sa { color: #4070a0; } /* NEW */ +/* LiteralStringBacktick */ .chroma .sb { color: #c30; } +/* LiteralStringChar */ .chroma .sc { color: #c30; } +/* LiteralStringDelimiter */ .chroma .dl { color: #4070a0; } /* NEW */ +/* LiteralStringDoc */ .chroma .sd { font-style: italic; color: #c30; } +/* LiteralStringDouble */ .chroma .s2 { color: #c30; } +/* LiteralStringEscape */ .chroma .se { color: #c30; } +/* LiteralStringHeredoc */ .chroma .sh { color: #c30; } +/* LiteralStringInterpol */ .chroma .si { color: #a00; } +/* LiteralStringOther */ .chroma .sx { color: #c30; } +/* LiteralStringRegex */ .chroma .sr { color: #337e7e; } +/* LiteralStringSingle */ .chroma .s1 { color: #c30; } +/* LiteralStringSymbol */ .chroma .ss { color: #fc3; } +/* Name .chroma .n { } */ /* NEW_NEW */ /* NameAttribute */ .chroma .na { color: #006ee0; } /* NameBuiltin */ .chroma .nb { color: #366; } /* NameBuiltinPseudo .chroma .bp { } */ /* NEW_NEW */ /* NameClass */ .chroma .nc { color: #168174; } -/* Name .chroma .n { } */ /* NEW_NEW */ +/* NameConstant */ .chroma .no { color: #360; } /* NameDecorator */ .chroma .nd { color: #6b62de; } +/* NameEntity */ .chroma .ni { color: #727272; } /* NameException */ .chroma .ne { color: #c00; } /* NameFunction */ .chroma .nf { color: #b715f4; } -/* NameEntity */ .chroma .ni { color: #727272; } /* NameFunctionMagic .chroma .fm { } */ /* NEW_NEW */ /* NameLabel */ .chroma .nl { color: #6b62de; } /* NameNamespace */ .chroma .nn { color: #007ca5; } -/* NameConstant */ .chroma .no { color: #360; } /* NameOther .chroma .nx { } */ /* NEW_NEW */ /* NameProperty .chroma .py { } */ /* NEW_NEW */ /* NameTag */ .chroma .nt { color: #2f6f9f; } @@ -68,19 +81,6 @@ /* NameVariableMagic .chroma .vm { } */ /* NEW_NEW */ /* Operator */ .chroma .o { color: #555; } /* OperatorWord */ .chroma .ow { color: #000; } -/* LiteralString */ .chroma .s { color: #d73038; } -/* LiteralStringSingle */ .chroma .s1 { color: #c30; } -/* LiteralStringDouble */ .chroma .s2 { color: #c30; } -/* LiteralStringAffix */ .chroma .sa { color: #4070a0; } /* NEW */ -/* LiteralStringBacktick */ .chroma .sb { color: #c30; } -/* LiteralStringChar */ .chroma .sc { color: #c30; } -/* LiteralStringDoc */ .chroma .sd { font-style: italic; color: #c30; } -/* LiteralStringEscape */ .chroma .se { color: #c30; } -/* LiteralStringHeredoc */ .chroma .sh { color: #c30; } -/* LiteralStringInterpol */ .chroma .si { color: #a00; } -/* LiteralStringRegex */ .chroma .sr { color: #337e7e; } -/* LiteralStringSymbol */ .chroma .ss { color: #fc3; } -/* LiteralStringOther */ .chroma .sx { color: #c30; } /* Punctuation .chroma .p { } */ /* NEW_NEW */ /* TextWhitespace */ .chroma .w { color: #bbb; } From 325ad9383c9ae107301fcca265f1447f4ad46a3a Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 12 Nov 2020 16:53:18 +0200 Subject: [PATCH 3/5] Remove no longer needed chrom workaround --- site/assets/scss/_syntax.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/site/assets/scss/_syntax.scss b/site/assets/scss/_syntax.scss index 2ede921c06eb..b5bd91b00b9b 100644 --- a/site/assets/scss/_syntax.scss +++ b/site/assets/scss/_syntax.scss @@ -92,12 +92,6 @@ content: "$ "; user-select: none; } - - // This is just to work around a Chroma bug; - // should be removed when fixed upstream - .m { - color: inherit; - } } .language-powershell::before { From df3bade5baa3ef01bac6963262983a3f8b6d026f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 12 Nov 2020 16:54:09 +0200 Subject: [PATCH 4/5] Squash me --- site/assets/scss/_syntax.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/assets/scss/_syntax.scss b/site/assets/scss/_syntax.scss index b5bd91b00b9b..08be09fd9f34 100644 --- a/site/assets/scss/_syntax.scss +++ b/site/assets/scss/_syntax.scss @@ -6,8 +6,8 @@ /* NEW LineTableTD .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } */ /* NEW LineTable .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; } */ /* NEW LineHighlight .chroma .hl { display: block; width: 100%; background-color: #ffffcc; } */ -/* NEW LineNumbersTable .chroma .lnt { margin-right: .4em; padding: 0 .4em; color: #7f7f7f; } */ -/* NEW LineNumbers .chroma .ln { margin-right: .4em; padding: 0 .4em; color: #7f7f7f; } */ +/* NEW LineNumbersTable .chroma .lnt { margin-right: .4em; padding: 0 .4em; } */ +/* NEW LineNumbers .chroma .ln { margin-right: .4em; padding: 0 .4em; } */ /* Comment */ .chroma .c { color: #727272; } /* CommentHashbang */ .chroma .ch { font-style: italic; color: #60a0b0; } /* NEW */ From 04507feaca2ef3bff3556142cf1849aef8616188 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 14 Nov 2020 16:21:32 +0200 Subject: [PATCH 5/5] remove comments --- site/assets/scss/_syntax.scss | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/site/assets/scss/_syntax.scss b/site/assets/scss/_syntax.scss index 08be09fd9f34..8120bbef2c74 100644 --- a/site/assets/scss/_syntax.scss +++ b/site/assets/scss/_syntax.scss @@ -1,22 +1,22 @@ // stylelint-disable comment-empty-line-before, declaration-block-single-line-max-declarations, selector-class-pattern -/* NEW Background .chroma { background-color: #f0f0f0; } */ -/* NEW_NEW Other .chroma .x { } */ -/* NEW Error .chroma .err { } */ -/* NEW LineTableTD .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } */ -/* NEW LineTable .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; } */ -/* NEW LineHighlight .chroma .hl { display: block; width: 100%; background-color: #ffffcc; } */ -/* NEW LineNumbersTable .chroma .lnt { margin-right: .4em; padding: 0 .4em; } */ -/* NEW LineNumbers .chroma .ln { margin-right: .4em; padding: 0 .4em; } */ +/* Background .chroma { background-color: #f0f0f0; } */ +/* Other .chroma .x { } */ +/* Error .chroma .err { } */ +/* LineTableTD .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } */ +/* LineTable .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; } */ +/* LineHighlight .chroma .hl { display: block; width: 100%; background-color: #ffffcc; } */ +/* LineNumbersTable .chroma .lnt { margin-right: .4em; padding: 0 .4em; } */ +/* LineNumbers .chroma .ln { margin-right: .4em; padding: 0 .4em; } */ /* Comment */ .chroma .c { color: #727272; } -/* CommentHashbang */ .chroma .ch { font-style: italic; color: #60a0b0; } /* NEW */ +/* CommentHashbang */ .chroma .ch { font-style: italic; color: #60a0b0; } /* CommentMultiline */ .chroma .cm { color: #727272; } /* CommentPreproc */ .chroma .cp { color: #008085; } -/* CommentPreprocFile */ .chroma .cpf { color: #007020; } /* NEW */ +/* CommentPreprocFile */ .chroma .cpf { color: #007020; } /* CommentSingle */ .chroma .c1 { color: #727272; } /* CommentSpecial */ .chroma .cs { color: #727272; } -/* Generic .chroma .g { } */ /* NEW_NEW */ +/* Generic .chroma .g { } */ /* GenericDeleted */ .chroma .gd { background-color: #fcc; border: 1px solid #c00; } /* GenericEmph */ .chroma .ge { font-style: italic; } /* GenericError */ .chroma .gr { color: #f00; } @@ -24,10 +24,10 @@ /* GenericInserted */ .chroma .gi { background-color: #cfc; border: 1px solid #0c0; } /* GenericOutput */ .chroma .go { color: #aaa; } /* GenericPrompt */ .chroma .gp { color: #009; } -/* GenericStrong */ .chroma .gs { font-weight: 700; } /* NEW */ +/* GenericStrong */ .chroma .gs { font-weight: 700; } /* GenericSubheading */ .chroma .gu { color: #030; } /* GenericTraceback */ .chroma .gt { color: #9c6; } -/* GenericUnderline */ .chroma .gl { text-decoration: underline; } /* NEW */ +/* GenericUnderline */ .chroma .gl { text-decoration: underline; } /* Keyword */ .chroma .k { color: #069; } /* KeywordConstant */ .chroma .kc { color: #069; } /* KeywordDeclaration */ .chroma .kd { color: #069; } @@ -35,20 +35,20 @@ /* KeywordPseudo */ .chroma .kp { color: #069; } /* KeywordReserved */ .chroma .kr { color: #069; } /* KeywordType */ .chroma .kt { color: #078; } -/* Literal .chroma .l { } */ /* NEW_NEW */ -/* LiteralDate .chroma .ld { color: #c24f19 } */ /* NEW_NEW */ +/* Literal .chroma .l { } */ +/* LiteralDate .chroma .ld { color: #c24f19 } */ /* LiteralNumber */ .chroma .m { color: #c24f19; } -/* LiteralNumberBin */ .chroma .mb { color: #40a070; } /* NEW */ +/* LiteralNumberBin */ .chroma .mb { color: #40a070; } /* LiteralNumberFloat */ .chroma .mf { color: #c24f19; } /* LiteralNumberHex */ .chroma .mh { color: #c24f19; } /* LiteralNumberInteger */ .chroma .mi { color: #c24f19; } /* LiteralNumberIntegerLong */ .chroma .il { color: #c24f19; } /* LiteralNumberOct */ .chroma .mo { color: #c24f19; } /* LiteralString */ .chroma .s { color: #d73038; } -/* LiteralStringAffix */ .chroma .sa { color: #4070a0; } /* NEW */ +/* LiteralStringAffix */ .chroma .sa { color: #4070a0; } /* LiteralStringBacktick */ .chroma .sb { color: #c30; } /* LiteralStringChar */ .chroma .sc { color: #c30; } -/* LiteralStringDelimiter */ .chroma .dl { color: #4070a0; } /* NEW */ +/* LiteralStringDelimiter */ .chroma .dl { color: #4070a0; } /* LiteralStringDoc */ .chroma .sd { font-style: italic; color: #c30; } /* LiteralStringDouble */ .chroma .s2 { color: #c30; } /* LiteralStringEscape */ .chroma .se { color: #c30; } @@ -58,30 +58,30 @@ /* LiteralStringRegex */ .chroma .sr { color: #337e7e; } /* LiteralStringSingle */ .chroma .s1 { color: #c30; } /* LiteralStringSymbol */ .chroma .ss { color: #fc3; } -/* Name .chroma .n { } */ /* NEW_NEW */ +/* Name .chroma .n { } */ /* NameAttribute */ .chroma .na { color: #006ee0; } /* NameBuiltin */ .chroma .nb { color: #366; } -/* NameBuiltinPseudo .chroma .bp { } */ /* NEW_NEW */ +/* NameBuiltinPseudo .chroma .bp { } */ /* NameClass */ .chroma .nc { color: #168174; } /* NameConstant */ .chroma .no { color: #360; } /* NameDecorator */ .chroma .nd { color: #6b62de; } /* NameEntity */ .chroma .ni { color: #727272; } /* NameException */ .chroma .ne { color: #c00; } /* NameFunction */ .chroma .nf { color: #b715f4; } -/* NameFunctionMagic .chroma .fm { } */ /* NEW_NEW */ +/* NameFunctionMagic .chroma .fm { } */ /* NameLabel */ .chroma .nl { color: #6b62de; } /* NameNamespace */ .chroma .nn { color: #007ca5; } -/* NameOther .chroma .nx { } */ /* NEW_NEW */ -/* NameProperty .chroma .py { } */ /* NEW_NEW */ +/* NameOther .chroma .nx { } */ +/* NameProperty .chroma .py { } */ /* NameTag */ .chroma .nt { color: #2f6f9f; } /* NameVariable */ .chroma .nv { color: #033; } -/* NameVariableClass .chroma .vc { } */ /* NEW_NEW */ -/* NameVariableGlobal .chroma .vg { } */ /* NEW_NEW */ -/* NameVariableInstance .chroma .vi { } */ /* NEW_NEW */ -/* NameVariableMagic .chroma .vm { } */ /* NEW_NEW */ +/* NameVariableClass .chroma .vc { } */ +/* NameVariableGlobal .chroma .vg { } */ +/* NameVariableInstance .chroma .vi { } */ +/* NameVariableMagic .chroma .vm { } */ /* Operator */ .chroma .o { color: #555; } /* OperatorWord */ .chroma .ow { color: #000; } -/* Punctuation .chroma .p { } */ /* NEW_NEW */ +/* Punctuation .chroma .p { } */ /* TextWhitespace */ .chroma .w { color: #bbb; } .chroma {