From 00f99422d23150f68cb90be926e76f500f098b70 Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Thu, 4 Apr 2024 15:15:14 -0500 Subject: [PATCH 1/5] align Beta tag --- client/homebrew/editor/snippetbar/snippetbar.jsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index 75fe0d7361..ce27b41162 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -234,11 +234,10 @@ const SnippetGroup = createClass({ {snippet.name} {snippet.experimental && beta} - {snippet.subsnippets && <> - -
- {this.renderSnippets(snippet.subsnippets)} -
} + +
+ {snippet.subsnippets ? this.renderSnippets(snippet.subsnippets) : null} +
; }); From 382206519bb43cd9206eb0a4839a1e59465a0789 Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Thu, 4 Apr 2024 17:26:45 -0500 Subject: [PATCH 2/5] turn beta tag into hyperlink --- client/homebrew/editor/snippetbar/snippetbar.jsx | 2 +- client/homebrew/editor/snippetbar/snippetbar.less | 10 +++++++++- themes/V3/Blank/snippets.js | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index ce27b41162..0afa11bc80 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -233,7 +233,7 @@ const SnippetGroup = createClass({ return
this.handleSnippetClick(e, snippet)}> {snippet.name} - {snippet.experimental && beta} + {snippet.experimental && beta}
{snippet.subsnippets ? this.renderSnippets(snippet.subsnippets) : null} diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less index e0a24fac99..4736cf45ac 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.less +++ b/client/homebrew/editor/snippetbar/snippetbar.less @@ -171,8 +171,16 @@ font-family : monospace; line-height : 1em; color : white; - background : grey; + background-color : grey; border-radius : 12px; + transition: background-color 0.3s ease; + &:hover { + background-color: rgb(190, 190, 190); + transition: background-color 0.3s ease; + } + a, a:visited { + color: inherit; + } } &:hover { background-color : #999999; diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js index 272368665c..a9d71d76a8 100644 --- a/themes/V3/Blank/snippets.js +++ b/themes/V3/Blank/snippets.js @@ -168,13 +168,13 @@ module.exports = [ name : 'Watercolor Center', icon : 'fac mask-center', gen : ImageMaskGen.center, - experimental : true, + experimental : { url: 'https://github.com/naturalcrit/homebrewery/pull/2373' }, }, { name : 'Watercolor Edge', icon : 'fac mask-edge', gen : ImageMaskGen.edge('bottom'), - experimental : true, + experimental : { url: 'https://github.com/naturalcrit/homebrewery/pull/2373' }, subsnippets : [ { name : 'Top', @@ -202,7 +202,7 @@ module.exports = [ name : 'Watercolor Corner', icon : 'fac mask-corner', gen : ImageMaskGen.corner, - experimental : true, + experimental : { url: 'https://github.com/naturalcrit/homebrewery/pull/2373' }, subsnippets : [ { name : 'Top-Left', From 2215f37437a6f203daa60bff3bb22fe7aece9dd4 Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Thu, 4 Apr 2024 17:32:11 -0500 Subject: [PATCH 3/5] remove old beta tags --- themes/V3/Blank/snippets.js | 95 ++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js index a9d71d76a8..9f1a43cd16 100644 --- a/themes/V3/Blank/snippets.js +++ b/themes/V3/Blank/snippets.js @@ -165,17 +165,15 @@ module.exports = [ gen : WatercolorGen, }, { - name : 'Watercolor Center', - icon : 'fac mask-center', - gen : ImageMaskGen.center, - experimental : { url: 'https://github.com/naturalcrit/homebrewery/pull/2373' }, + name : 'Watercolor Center', + icon : 'fac mask-center', + gen : ImageMaskGen.center, }, { - name : 'Watercolor Edge', - icon : 'fac mask-edge', - gen : ImageMaskGen.edge('bottom'), - experimental : { url: 'https://github.com/naturalcrit/homebrewery/pull/2373' }, - subsnippets : [ + name : 'Watercolor Edge', + icon : 'fac mask-edge', + gen : ImageMaskGen.edge('bottom'), + subsnippets : [ { name : 'Top', icon : 'fac position-top', @@ -199,11 +197,10 @@ module.exports = [ ] }, { - name : 'Watercolor Corner', - icon : 'fac mask-corner', - gen : ImageMaskGen.corner, - experimental : { url: 'https://github.com/naturalcrit/homebrewery/pull/2373' }, - subsnippets : [ + name : 'Watercolor Corner', + icon : 'fac mask-corner', + gen : ImageMaskGen.corner, + subsnippets : [ { name : 'Top-Left', icon : 'fac position-top-left', @@ -307,8 +304,8 @@ module.exports = [ /**************** FONTS *************/ { groupName : 'Fonts', - icon : 'fas fa-keyboard', - view : 'text', + icon : 'fas fa-keyboard', + view : 'text', snippets : [ { name : 'Open Sans', @@ -341,59 +338,59 @@ module.exports = [ gen : dedent`{{font-family:MrEavesRemake Dummy Text}}` }, { - name: 'Solbera Imitation', - icon: 'font SolberaImitationRemake', - gen: dedent`{{font-family:SolberaImitationRemake Dummy Text}}` + name : 'Solbera Imitation', + icon : 'font SolberaImitationRemake', + gen : dedent`{{font-family:SolberaImitationRemake Dummy Text}}` }, { - name: 'Scaly Sans Small Caps', - icon: 'font ScalySansSmallCapsRemake', - gen: dedent`{{font-family:ScalySansSmallCapsRemake Dummy Text}}` + name : 'Scaly Sans Small Caps', + icon : 'font ScalySansSmallCapsRemake', + gen : dedent`{{font-family:ScalySansSmallCapsRemake Dummy Text}}` }, { - name: 'Walter Turncoat', - icon: 'font WalterTurncoat', - gen: dedent`{{font-family:WalterTurncoat Dummy Text}}` + name : 'Walter Turncoat', + icon : 'font WalterTurncoat', + gen : dedent`{{font-family:WalterTurncoat Dummy Text}}` }, { - name: 'Lato', - icon: 'font Lato', - gen: dedent`{{font-family:Lato Dummy Text}}` + name : 'Lato', + icon : 'font Lato', + gen : dedent`{{font-family:Lato Dummy Text}}` }, { - name: 'Courier', - icon: 'font Courier', - gen: dedent`{{font-family:Courier Dummy Text}}` + name : 'Courier', + icon : 'font Courier', + gen : dedent`{{font-family:Courier Dummy Text}}` }, { - name: 'Nodesto Caps Condensed', - icon: 'font NodestoCapsCondensed', - gen: dedent`{{font-family:NodestoCapsCondensed Dummy Text}}` + name : 'Nodesto Caps Condensed', + icon : 'font NodestoCapsCondensed', + gen : dedent`{{font-family:NodestoCapsCondensed Dummy Text}}` }, { - name: 'Overpass', - icon: 'font Overpass', - gen: dedent`{{font-family:Overpass Dummy Text}}` + name : 'Overpass', + icon : 'font Overpass', + gen : dedent`{{font-family:Overpass Dummy Text}}` }, { - name: 'Davek', - icon: 'font Davek', - gen: dedent`{{font-family:Davek Dummy Text}}` + name : 'Davek', + icon : 'font Davek', + gen : dedent`{{font-family:Davek Dummy Text}}` }, { - name: 'Iokharic', - icon: 'font Iokharic', - gen: dedent`{{font-family:Iokharic Dummy Text}}` + name : 'Iokharic', + icon : 'font Iokharic', + gen : dedent`{{font-family:Iokharic Dummy Text}}` }, { - name: 'Rellanic', - icon: 'font Rellanic', - gen: dedent`{{font-family:Rellanic Dummy Text}}` + name : 'Rellanic', + icon : 'font Rellanic', + gen : dedent`{{font-family:Rellanic Dummy Text}}` }, { - name: 'Times New Roman', - icon: 'font TimesNewRoman', - gen: dedent`{{font-family:"Times New Roman" Dummy Text}}` + name : 'Times New Roman', + icon : 'font TimesNewRoman', + gen : dedent`{{font-family:"Times New Roman" Dummy Text}}` } ] }, From d991a9bff5d9dea0c6a25756c145611009406def Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Thu, 4 Apr 2024 17:37:56 -0500 Subject: [PATCH 4/5] add URL to index beta tag --- themes/V3/5ePHB/snippets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/V3/5ePHB/snippets.js b/themes/V3/5ePHB/snippets.js index c0933d70de..5580e52854 100644 --- a/themes/V3/5ePHB/snippets.js +++ b/themes/V3/5ePHB/snippets.js @@ -29,7 +29,7 @@ module.exports = [ name : 'Index', icon : 'fas fa-bars', gen : indexGen, - experimental : true + experimental : { url: 'https://github.com/naturalcrit/homebrewery/pull/2755' } } ] }, From 4da3245337aecd007cb0826b0d9cef9ca0b0b01f Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Thu, 4 Apr 2024 17:38:07 -0500 Subject: [PATCH 5/5] small style fix for dropdown caret --- client/homebrew/editor/snippetbar/snippetbar.less | 1 + 1 file changed, 1 insertion(+) diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less index 4736cf45ac..51e77b3ecd 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.less +++ b/client/homebrew/editor/snippetbar/snippetbar.less @@ -135,6 +135,7 @@ & ~ i { margin-right : 0; margin-left : 5px; + min-width : unset; } /* Fonts */ &.font {