diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index 8e643a837..50237b914 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -150,6 +150,7 @@ const Snippetbar = createClass({ renderSnippetGroups : function(){ const snippets = this.state.snippets.filter((snippetGroup)=>snippetGroup.view === this.props.view); + if(snippets.length === 0) return null; return
{_.map(snippets, (snippetGroup)=>{ @@ -206,21 +207,16 @@ const Snippetbar = createClass({ renderEditorButtons : function(){ if(!this.props.showEditButtons) return; - let foldButtons; - if(this.props.view == 'text'){ - foldButtons = - <> -
- -
-
- -
- ; - - } + const foldButtons = <> +
+ +
+
+ +
+ ; return
diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less index a4d273bbf..319cd0cad 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.less +++ b/client/homebrew/editor/snippetbar/snippetbar.less @@ -7,19 +7,23 @@ display : flex; flex-wrap : wrap-reverse; justify-content : space-between; - min-width : 331px; height : auto; color : black; background-color : #DDDDDD; .snippets { display : flex; - justify-content : space-evenly; + justify-content : flex-start; + min-width : 327.58px; } .editors { display : flex; - justify-content : space-between; + justify-content : flex-end; + min-width : 225px; + + &:only-child { margin-left : auto; } + >div { display : flex; flex : 1; @@ -59,12 +63,14 @@ &.foldAll { .tooltipLeft('Fold All'); font-size : 0.75em; - color : inherit; + color : grey; + &.active { color : inherit; } } &.unfoldAll { .tooltipLeft('Unfold All'); font-size : 0.75em; - color : inherit; + color : grey; + &.active { color : inherit; } } &.history { .tooltipLeft('History'); @@ -218,9 +224,18 @@ } } } - @container editor (width < 553px) { - .editors,.snippets { flex : 1; } - .editors { border-bottom : 1px solid;} - .snippetBar .editors > div.history > .dropdown { right : unset; } + .snippetBar { + .editors { + flex : 1; + justify-content : space-between; + border-bottom : 1px solid; + } + .snippets { + flex : 1; + justify-content : space-evenly; + } + .editors > div.history > .dropdown { right : unset; } + } } + diff --git a/package-lock.json b/package-lock.json index 00cd61421..43f8936f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "MIT", "dependencies": { "@babel/core": "^7.25.9", - "@babel/plugin-transform-runtime": "^7.25.7", + "@babel/plugin-transform-runtime": "^7.25.9", "@babel/preset-env": "^7.25.9", "@babel/preset-react": "^7.25.9", "@googleapis/drive": "^8.14.0", @@ -1411,12 +1411,12 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.7.tgz", - "integrity": "sha512-Y9p487tyTzB0yDYQOtWnC+9HGOuogtP3/wNpun1xJXEEvI6vip59BSBTsHnekZLqxmPcgsrAKt46HAAb//xGhg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz", + "integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==", "dependencies": { - "@babel/helper-module-imports": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", "babel-plugin-polyfill-corejs2": "^0.4.10", "babel-plugin-polyfill-corejs3": "^0.10.6", "babel-plugin-polyfill-regenerator": "^0.6.1", diff --git a/package.json b/package.json index 92f7f3a7b..5a3857b73 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ }, "dependencies": { "@babel/core": "^7.25.9", - "@babel/plugin-transform-runtime": "^7.25.7", + "@babel/plugin-transform-runtime": "^7.25.9", "@babel/preset-env": "^7.25.9", "@babel/preset-react": "^7.25.9", "@googleapis/drive": "^8.14.0",