From 1dcea0fe6a6d3263202635882437e3508c0cfe9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 9 May 2025 20:42:01 +0200 Subject: [PATCH 1/5] fix snippet editor button tooltip --- client/homebrew/editor/snippetbar/snippetbar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less index a0691f8b6..c53d4be8e 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.less +++ b/client/homebrew/editor/snippetbar/snippetbar.less @@ -51,7 +51,7 @@ &.meta { .tooltipLeft('Properties'); } - &.snip { + &.snippet { .tooltipLeft('Snippets'); } &.undo { @@ -93,7 +93,7 @@ &.editorTheme { .tooltipLeft('Editor Themes'); font-size : 0.75em; - color : black; + color : inherit; &.active { position : relative; background-color : #999999; From e774dfd97d71e78f920db9354258a5c39669c0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 9 May 2025 20:42:16 +0200 Subject: [PATCH 2/5] change darkbrewery's name --- .../customThemes/darkbrewery-v301.css | 129 ------------------ themes/codeMirror/editorThemes.json | 2 +- 2 files changed, 1 insertion(+), 130 deletions(-) delete mode 100644 themes/codeMirror/customThemes/darkbrewery-v301.css diff --git a/themes/codeMirror/customThemes/darkbrewery-v301.css b/themes/codeMirror/customThemes/darkbrewery-v301.css deleted file mode 100644 index 267c377f6..000000000 --- a/themes/codeMirror/customThemes/darkbrewery-v301.css +++ /dev/null @@ -1,129 +0,0 @@ -/* 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; -} - -/* HB DARK NAV START*/ - -/* Bars at the top */ -.snippetBar { - background-color: #2F393C; - color: white; -} -nav { - background-color: #293134; -} -nav .navItem { - background-color: #293134; -} -/* Fix for Homebrewery custom Snippet icons */ -.snippetBar .fac { - filter: invert(1); -} -.snippetBar .snippetGroup .dropdown { - background-color: #2F393C; -} -/* HB DARK NAV END */ - -/* 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 */ -/* ###Headings */ -.cm-s-default .cm-header { - color: #c51b1b; - -webkit-text-stroke-width: 0.1px; - -webkit-text-stroke-color: #000; -} -/* bold points */ -.cm-header, .cm-strong { - font-weight: bold; - color: #309dd2; -} -/* Link headings */ -.cm-s-default .cm-link { - color: #dd6300; -} -/* links */ -.cm-s-default .cm-string { - color: #aa8261; -} -/*@import*/ -.cm-s-default .cm-def { - color:#2986cc; -} -/* Bullets and such */ -.cm-s-default .cm-variable-2 { - color: #3cbf30; -} -/* blocks */ -.editor .codeEditor .block:not(.cm-comment) { - color: #e3e3e3; -} -/* inline blocks */ -.editor .codeEditor .inline-block { - color: #e3e3e3; -} -/* Tags (divs) */ -.cm-s-default .cm-tag { - color: #e3ff00; -} -.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; -} - -/* New page */ -.editor .codeEditor .pageLine { - background: #000; - color:#000; - border-bottom: 1px solid #fff; -} - -.cm-s-default .cm-builtin { - color:#fff; -} \ No newline at end of file diff --git a/themes/codeMirror/editorThemes.json b/themes/codeMirror/editorThemes.json index 679c6874b..d287c9810 100644 --- a/themes/codeMirror/editorThemes.json +++ b/themes/codeMirror/editorThemes.json @@ -15,7 +15,7 @@ "cobalt", "colorforth", "darcula", -"darkbrewery-v301", +"darkbrewery", "darkvision", "dracula", "duotone-dark", From e127a6a5574cb74f55c3b2ba1c01fb59807413ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 9 May 2025 20:42:23 +0200 Subject: [PATCH 3/5] refactor the theme --- .../codeMirror/customThemes/darkbrewery.css | 178 ++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 themes/codeMirror/customThemes/darkbrewery.css diff --git a/themes/codeMirror/customThemes/darkbrewery.css b/themes/codeMirror/customThemes/darkbrewery.css new file mode 100644 index 000000000..b046dde1a --- /dev/null +++ b/themes/codeMirror/customThemes/darkbrewery.css @@ -0,0 +1,178 @@ +/*stylelint-disable*/ + +.editor .snippetBar { + + color: white; + background-color: #2F393C; + + .dropdown { + background-color: #2F393C; + } + + .editors { + border-color: #ccc; + } +} + +/* Main BG color and normal text color */ +.CodeMirror { + --bg: #293134; + --highlight: #bcbcbc; + + color: #91A6AA; + background: var(--bg); + + .CodeMirror-scroll { + + .CodeMirror-gutters { + border-right: 1px solid #555; + background: var(--bg); + + .CodeMirror-gutter { + background-color: var(--bg); + + &.CodeMirror-foldgutter { + cursor: pointer; + border-left: 1px solid #555; + transition: background 0.1s; + + &:hover { + background: #555; + + } + } + } + } + + .CodeMirror-lines { + + /* Line numbers*/ + .CodeMirror-linenumber.CodeMirror-gutter-elt { + background-color: var(--bg); + color: #81969A; + } + + /* Blinking cursor */ + .CodeMirror-cursor { + border-left: 1px solid #E0E2E4; + } + + .pageLine { + color: #000000; + background: #000000; + border-bottom: 1px solid #FFFFFF; + } + + .CodeMirror-code .CodeMirror-line { + + &.columnSplit { + font-style: italic; + color: inherit; + background-color: #1F5763; + border-bottom: #229999 solid 1px; + } + + /*syntax*/ + + .cm-header { + font-weight: bold; + color: #C51B1B; + -webkit-text-stroke-width: 0.1px; + -webkit-text-stroke-color: #000000; + } + + .cm-strong { + color: #309DD2; + } + + .cm-em { + /*italics*/ + } + + .cm-link { + color: #DD6300; + } + + .cm-string { + color: #AA8261; + } + + /* @import */ + .cm-def { + color: #2986CC; + } + + /* Bullets and such */ + .cm-variable-2 { + color: #3CBF30; + } + + .block:not(.cm-comment) { + color: #E3E3E3; + } + + .inline-block { + color: #E3E3E3; + } + + .cm-tag { + color: #E3FF00; + } + + .cm-attribute { + color: #E3FF00; + } + + .cm-atom { + color: #c1939a; + } + + .cm-number { + color: #2986CC; + } + + .cm-property:not(.cm-error) ~ .cm-variable { + color:#9e1f9e; + } + + .cm-qualifier { + color: #EE1919; + } + + .cm-comment { + color: #BBC700; + } + + .cm-keyword { + color: white; + } + + .cm-error { + color: #C50202; + } + + .CodeMirror-foldmarker { + color: #F0FF00; + } + + .cm-builtin { + color: #FFFFFF; + } + + .dt-highlight { + background: #ffffff14; + } + + .dl-colon-highlight { + background: #ccc; + } + + .dl-highlight.dd-highlight { + color: #b5858d; + } + } + } + + + } +} \ No newline at end of file From 320fb025430edd3d20b96d48e555fb7160fbbd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 9 May 2025 20:44:59 +0200 Subject: [PATCH 4/5] remove empty lines in css --- .../codeMirror/customThemes/darkbrewery.css | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/themes/codeMirror/customThemes/darkbrewery.css b/themes/codeMirror/customThemes/darkbrewery.css index b046dde1a..6fba4001c 100644 --- a/themes/codeMirror/customThemes/darkbrewery.css +++ b/themes/codeMirror/customThemes/darkbrewery.css @@ -1,178 +1,134 @@ /*stylelint-disable*/ - .editor .snippetBar { - color: white; background-color: #2F393C; - .dropdown { background-color: #2F393C; } - .editors { border-color: #ccc; } } - /* Main BG color and normal text color */ .CodeMirror { --bg: #293134; --highlight: #bcbcbc; - color: #91A6AA; background: var(--bg); - .CodeMirror-scroll { - .CodeMirror-gutters { border-right: 1px solid #555; background: var(--bg); - .CodeMirror-gutter { background-color: var(--bg); - &.CodeMirror-foldgutter { cursor: pointer; border-left: 1px solid #555; transition: background 0.1s; - &:hover { background: #555; - } } } } - .CodeMirror-lines { - /* Line numbers*/ .CodeMirror-linenumber.CodeMirror-gutter-elt { background-color: var(--bg); color: #81969A; } - /* Blinking cursor */ .CodeMirror-cursor { border-left: 1px solid #E0E2E4; } - .pageLine { color: #000000; background: #000000; border-bottom: 1px solid #FFFFFF; } - .CodeMirror-code .CodeMirror-line { - &.columnSplit { font-style: italic; color: inherit; background-color: #1F5763; border-bottom: #229999 solid 1px; } - /*syntax*/ - .cm-header { font-weight: bold; color: #C51B1B; -webkit-text-stroke-width: 0.1px; -webkit-text-stroke-color: #000000; } - .cm-strong { color: #309DD2; } - .cm-em { /*italics*/ } - .cm-link { color: #DD6300; } - .cm-string { color: #AA8261; } - /* @import */ .cm-def { color: #2986CC; } - /* Bullets and such */ .cm-variable-2 { color: #3CBF30; } - .block:not(.cm-comment) { color: #E3E3E3; } - .inline-block { color: #E3E3E3; } - .cm-tag { color: #E3FF00; } - .cm-attribute { color: #E3FF00; } - .cm-atom { color: #c1939a; } - .cm-number { color: #2986CC; } - .cm-property:not(.cm-error) ~ .cm-variable { color:#9e1f9e; } - .cm-qualifier { color: #EE1919; } - .cm-comment { color: #BBC700; } - .cm-keyword { color: white; } - .cm-error { color: #C50202; } - .CodeMirror-foldmarker { color: #F0FF00; } - .cm-builtin { color: #FFFFFF; } - .dt-highlight { background: #ffffff14; } - .dl-colon-highlight { background: #ccc; } - .dl-highlight.dd-highlight { color: #b5858d; } } } - - } } \ No newline at end of file From 3fdedd88610ae125d4352d6c8b503095c04567eb Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sun, 11 May 2025 15:08:20 -0500 Subject: [PATCH 5/5] Correct missed Font Awesome Reference versions --- .../pages/basePages/listPage/brewItem/brewItem.less | 2 +- client/homebrew/pages/basePages/listPage/listPage.less | 6 +++--- client/homebrew/pages/basePages/uiPage/uiPage.less | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 0d45e8537..f57ce303d 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -64,7 +64,7 @@ border-radius : 4px; &::before { margin-right : 3px; - font-family : 'Font Awesome 5 Free'; + font-family : 'Font Awesome 6 Free'; font-size : 12px; } &.type { diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index bf899bc71..e368dfac7 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -30,7 +30,7 @@ h1:hover { cursor : pointer; } .active::before, .inactive::before { padding-right : 0.5em; - font-family : 'Font Awesome 5 Free'; + font-family : 'Font Awesome 6 Free'; font-size : 0.6cm; font-weight : 900; } @@ -130,12 +130,12 @@ border-radius : 3px; &::before { margin-right : 3px; - font-family : 'Font Awesome 5 Free'; + font-family : 'Font Awesome 6 Free'; font-size : 12px; } &::after { margin-left : 3px; - font-family : 'Font Awesome 5 Free'; + font-family : 'Font Awesome 6 Free'; font-size : 12px; content : '\f00d'; } diff --git a/client/homebrew/pages/basePages/uiPage/uiPage.less b/client/homebrew/pages/basePages/uiPage/uiPage.less index 27f079e20..39ccf1d74 100644 --- a/client/homebrew/pages/basePages/uiPage/uiPage.less +++ b/client/homebrew/pages/basePages/uiPage/uiPage.less @@ -28,7 +28,7 @@ background-color : #00000077; &::before { margin-right : 5px; - font-family : 'FONT AWESOME 5 FREE'; + font-family : 'Font Awesome 6 Free'; content : '\f00c'; } }