From 7efd23039e0a793a823d81324f41dcf9dd6fe53c Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Fri, 8 Sep 2023 15:20:06 +1200 Subject: [PATCH 1/7] Add DarkBrewery CSS file --- .../customThemes/darkbrewery-v301.css | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 themes/codeMirror/customThemes/darkbrewery-v301.css diff --git a/themes/codeMirror/customThemes/darkbrewery-v301.css b/themes/codeMirror/customThemes/darkbrewery-v301.css new file mode 100644 index 000000000..d03ee7296 --- /dev/null +++ b/themes/codeMirror/customThemes/darkbrewery-v301.css @@ -0,0 +1,118 @@ + /* Main BG color and normal text color */ + .CodeMirror { + background: #293134; + color: #91A6AA; +} + +/* Brew BG */ + .brewRenderer { + background-color: #293134; +} +/* Blinking cursor */ + .CodeMirror-cursor { + border-left: 1px solid #e0e2e4; +} +/* Bars at the top */ + .snippetBar { + background-color: #2F393C; + color: white; +} +nav { + background-color: #293134; +} +nav .navItem { + background-color: #293134; +} +.snippetBar .snippetGroup .dropdown { + background-color: #2F393C; +} +/* Line number stuff */ + .CodeMirror-gutter-elt { + color: #81969A; +} +.CodeMirror-linenumber { + background-color: #293134; +} +.CodeMirror-gutter { + background-color: #293134; +} +/* column splits */ +.editor .codeEditor .columnSplit { + font-style: italic; + color: inherit; + background-color:#1f5763; + border-bottom: #299 solid 1px; +} +/* Colors for headings and such */ +.cm-s-default .cm-header { + color: #c51b1b; + -webkit-text-stroke-width: 0.1px; + -webkit-text-stroke-color: #000; + /* ###Headings */ +} +.cm-header, .cm-strong { + font-weight: bold; + color: #309dd2; + /* bold points */ +} +.cm-s-default .cm-link { + color: #dd6300; + /* Link headings */ +} +.cm-s-default .cm-string { + color: #aa8261; + /* links */ +} +.cm-s-default .cm-def { + color:#2986cc; +} /*@import*/ +.cm-s-default .cm-variable-2 { + color: #3cbf30; + /* Bullets and such */ +} +.editor .codeEditor .block { + color: #e3e3e3; + /* blocks */ +} +.editor .codeEditor .inline-block { + color: #e3e3e3; + /* inline blocks */ +} +.cm-s-default .cm-tag { + color: #e3ff00; + /* Tags (divs) */ +} +.cm-s-default .cm-attribute { + color: #e3ff00; +} +.cm-s-default .cm-atom { + color:#000; +} +.cm-s-default .cm-qualifier{ + color:#ee1919; +} +.cm-s-default .cm-comment{ + color:#bbc700; +} +.cm-s-default .cm-keyword { + color:#c302df; + background-color:#b1b1b1; +} +.cm-s-default .cm-property.cm-error { + color:#c50202; +} + +.CodeMirror-foldmarker { + color:#f0ff00; +} + +.editor .codeEditor .pageLine { + /* New page */ + background: #000; + color:#000; + border-bottom: 1px solid #fff; +} + +.cm-s-default .cm-builtin { + color:#fff; +} \ No newline at end of file From 46a6ed4fcc20265985d677051de3260c3235556f Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Fri, 8 Sep 2023 15:21:51 +1200 Subject: [PATCH 2/7] Modify build script to include custom theme dir --- scripts/buildHomebrew.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/buildHomebrew.js b/scripts/buildHomebrew.js index e78759168..e2eae1e6c 100644 --- a/scripts/buildHomebrew.js +++ b/scripts/buildHomebrew.js @@ -101,7 +101,10 @@ fs.emptyDirSync('./build'); //v==---------------------------MOVE CM EDITOR THEMES -----------------------------==v// - editorThemeFiles = fs.readdirSync('./node_modules/codemirror/theme'); + const editorThemesBuildDir = './build/homebrew/cm-themes'; + await fs.copy('./node_modules/codemirror/theme', editorThemesBuildDir); + await fs.copy('./themes/codeMirror/customThemes', editorThemesBuildDir); + editorThemeFiles = fs.readdirSync(editorThemesBuildDir); const editorThemeFile = './themes/codeMirror/editorThemes.json'; if(fs.existsSync(editorThemeFile)) fs.rmSync(editorThemeFile); @@ -114,7 +117,7 @@ fs.emptyDirSync('./build'); stream.write('\n]\n'); stream.end(); - await fs.copy('./node_modules/codemirror/theme', './build/homebrew/cm-themes'); + await fs.copy('./themes/codeMirror', './build/homebrew/codeMirror'); //v==----------------------------- BUNDLE PACKAGES --------------------------------==v// From 7f1758364bb1f5b6df3f676499e5e198968d05af Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sat, 9 Sep 2023 13:42:25 +1200 Subject: [PATCH 3/7] Add darkbrewery to editorThemes.json --- themes/codeMirror/editorThemes.json | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/codeMirror/editorThemes.json b/themes/codeMirror/editorThemes.json index a4dd74470..384ce4602 100644 --- a/themes/codeMirror/editorThemes.json +++ b/themes/codeMirror/editorThemes.json @@ -15,6 +15,7 @@ "cobalt", "colorforth", "darcula", +"darkbrewery-v301", "dracula", "duotone-dark", "duotone-light", From 7870c763dfa51230c0818bd4bf306b1c3478afb0 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sat, 9 Sep 2023 13:42:35 +1200 Subject: [PATCH 4/7] Linter fix --- scripts/buildHomebrew.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildHomebrew.js b/scripts/buildHomebrew.js index e2eae1e6c..6706ab591 100644 --- a/scripts/buildHomebrew.js +++ b/scripts/buildHomebrew.js @@ -117,7 +117,7 @@ fs.emptyDirSync('./build'); stream.write('\n]\n'); stream.end(); - + await fs.copy('./themes/codeMirror', './build/homebrew/codeMirror'); //v==----------------------------- BUNDLE PACKAGES --------------------------------==v// From 216de73c93faf3925247dd8aa917a2c0061b47b6 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 14 Sep 2023 08:19:25 +1200 Subject: [PATCH 5/7] Fix from 5E-Cleric --- .../codeMirror/customThemes/darkbrewery-v301.css | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/themes/codeMirror/customThemes/darkbrewery-v301.css b/themes/codeMirror/customThemes/darkbrewery-v301.css index d03ee7296..c4e3c7b25 100644 --- a/themes/codeMirror/customThemes/darkbrewery-v301.css +++ b/themes/codeMirror/customThemes/darkbrewery-v301.css @@ -1,19 +1,19 @@ - /* Main BG color and normal text color */ - .CodeMirror { +/* Main BG color and normal text color */ +.CodeMirror { background: #293134; color: #91A6AA; } /* Brew BG */ - .brewRenderer { +.brewRenderer { background-color: #293134; } /* Blinking cursor */ - .CodeMirror-cursor { +.CodeMirror-cursor { border-left: 1px solid #e0e2e4; } /* Bars at the top */ - .snippetBar { +.snippetBar { background-color: #2F393C; color: white; } @@ -23,6 +23,10 @@ nav { nav .navItem { background-color: #293134; } +/* Fix for Homebrewery custom Snippet icons */ +.snippetBar .fac { + filter: invert(1); +} .snippetBar .snippetGroup .dropdown { background-color: #2F393C; } From d497c0094b42b04ffe0f71308518fdddb276c064 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 19 Oct 2023 17:51:02 +1300 Subject: [PATCH 6/7] Fix comments --- .../customThemes/darkbrewery-v301.css | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/themes/codeMirror/customThemes/darkbrewery-v301.css b/themes/codeMirror/customThemes/darkbrewery-v301.css index c4e3c7b25..82ddf98d3 100644 --- a/themes/codeMirror/customThemes/darkbrewery-v301.css +++ b/themes/codeMirror/customThemes/darkbrewery-v301.css @@ -31,7 +31,7 @@ nav .navItem { background-color: #2F393C; } /* Line number stuff */ - .CodeMirror-gutter-elt { +.CodeMirror-gutter-elt { color: #81969A; } .CodeMirror-linenumber { @@ -47,44 +47,46 @@ nav .navItem { background-color:#1f5763; border-bottom: #299 solid 1px; } + /* Colors for headings and such */ +/* ###Headings */ .cm-s-default .cm-header { color: #c51b1b; -webkit-text-stroke-width: 0.1px; -webkit-text-stroke-color: #000; - /* ###Headings */ } +/* bold points */ .cm-header, .cm-strong { font-weight: bold; color: #309dd2; - /* bold points */ } +/* Link headings */ .cm-s-default .cm-link { color: #dd6300; - /* Link headings */ } +/* links */ .cm-s-default .cm-string { color: #aa8261; - /* links */ } +/*@import*/ .cm-s-default .cm-def { color:#2986cc; -} /*@import*/ +} +/* Bullets and such */ .cm-s-default .cm-variable-2 { color: #3cbf30; - /* Bullets and such */ } +/* blocks */ .editor .codeEditor .block { color: #e3e3e3; - /* blocks */ } +/* inline blocks */ .editor .codeEditor .inline-block { color: #e3e3e3; - /* inline blocks */ } +/* Tags (divs) */ .cm-s-default .cm-tag { color: #e3ff00; - /* Tags (divs) */ } .cm-s-default .cm-attribute { color: #e3ff00; @@ -110,8 +112,8 @@ nav .navItem { color:#f0ff00; } +/* New page */ .editor .codeEditor .pageLine { - /* New page */ background: #000; color:#000; border-bottom: 1px solid #fff; From b5cb8ce834aa65b6a2a251abac97835f1a033f61 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 19 Oct 2023 18:20:50 +1300 Subject: [PATCH 7/7] Mark HB navigation changes --- themes/codeMirror/customThemes/darkbrewery-v301.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/themes/codeMirror/customThemes/darkbrewery-v301.css b/themes/codeMirror/customThemes/darkbrewery-v301.css index 82ddf98d3..267c377f6 100644 --- a/themes/codeMirror/customThemes/darkbrewery-v301.css +++ b/themes/codeMirror/customThemes/darkbrewery-v301.css @@ -12,6 +12,9 @@ .CodeMirror-cursor { border-left: 1px solid #e0e2e4; } + +/* HB DARK NAV START*/ + /* Bars at the top */ .snippetBar { background-color: #2F393C; @@ -30,6 +33,8 @@ nav .navItem { .snippetBar .snippetGroup .dropdown { background-color: #2F393C; } +/* HB DARK NAV END */ + /* Line number stuff */ .CodeMirror-gutter-elt { color: #81969A; @@ -77,7 +82,7 @@ nav .navItem { color: #3cbf30; } /* blocks */ -.editor .codeEditor .block { +.editor .codeEditor .block:not(.cm-comment) { color: #e3e3e3; } /* inline blocks */