diff --git a/client/homebrew/brewRenderer/toolBar/toolBar.less b/client/homebrew/brewRenderer/toolBar/toolBar.less
index c2f4ff148..c787a6f6b 100644
--- a/client/homebrew/brewRenderer/toolBar/toolBar.less
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.less
@@ -115,10 +115,10 @@
color : #D3D3D3;
accent-color : #D3D3D3;
- &::-webkit-slider-thumb, &::-moz-slider-thumb {
+ &::-webkit-slider-thumb, &::-moz-range-thumb {
width : 5px;
height : 5px;
- cursor : pointer;
+ cursor : ew-resize;
outline : none;
}
diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx
index 50237b914..f7d9508f8 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -207,19 +207,11 @@ const Snippetbar = createClass({
renderEditorButtons : function(){
if(!this.props.showEditButtons) return;
- const foldButtons = <>
-
-
+ return (
+
+ {this.props.view !== 'meta' && <>
@@ -235,14 +227,21 @@ const Snippetbar = createClass({
- {foldButtons}
-
+
+
+
+
+
+
{this.state.themeSelector && this.renderThemeSelector()}
-
-
+
>}
+
;
+
+ )
},
render : function(){
diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less
index 319cd0cad..7d56dc718 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -22,7 +22,7 @@
justify-content : flex-end;
min-width : 225px;
- &:only-child { margin-left : auto; }
+ &:only-child { margin-left : auto;min-width:unset;}
>div {
display : flex;
@@ -38,6 +38,11 @@
line-height : @menuHeight;
text-align : center;
cursor : pointer;
+
+ &.editorTool:not(.active) {
+ cursor:not-allowed;
+ }
+
&:hover,&.selected { background-color : #999999; }
&.text {
.tooltipLeft('Brew Editor');
diff --git a/shared/naturalcrit/codeEditor/codeEditor.less b/shared/naturalcrit/codeEditor/codeEditor.less
index cb73b0a88..84a5c63f1 100644
--- a/shared/naturalcrit/codeEditor/codeEditor.less
+++ b/shared/naturalcrit/codeEditor/codeEditor.less
@@ -11,49 +11,54 @@
@import (less) './themes/fonts/iconFonts/fontAwesome.less';
@keyframes sourceMoveAnimation {
- 50% {background-color: red; color: white;}
- 100% {background-color: unset; color: unset;}
+ 50% { color : white;background-color : red;}
+ 100% { color : unset;background-color : unset;}
}
-.codeEditor{
- @media screen and (pointer : coarse) {
- font-size : 16px;
- }
- .CodeMirror-foldmarker {
- font-family: inherit;
- text-shadow: none;
- font-weight: 600;
- color: grey;
- }
+.codeEditor {
+ @media screen and (pointer : coarse) {
+ font-size : 16px;
+ }
+ .CodeMirror-foldmarker {
+ font-family : inherit;
+ font-weight : 600;
+ color : grey;
+ text-shadow : none;
+ }
- .sourceMoveFlash .CodeMirror-line{
- animation-name: sourceMoveAnimation;
- animation-duration: 0.4s;
- }
+ .CodeMirror-foldgutter {
+ cursor : pointer;
+ border-left : 1px solid #EEEEEE;
+ transition : background 0.1s;
+ &:hover { background : #DDDDDD; }
+ }
- .CodeMirror-vscrollbar {
- &::-webkit-scrollbar {
- width: 20px;
- }
- &::-webkit-scrollbar-thumb {
- width: 20px;
- background: linear-gradient(90deg, #858585 15px, #808080 15px);
- }
- }
+ .sourceMoveFlash .CodeMirror-line {
+ animation-name : sourceMoveAnimation;
+ animation-duration : 0.4s;
+ }
+
+ .CodeMirror-vscrollbar {
+ &::-webkit-scrollbar { width : 20px; }
+ &::-webkit-scrollbar-thumb {
+ width : 20px;
+ background : linear-gradient(90deg, #858585 15px, #808080 15px);
+ }
+ }
- //.cm-tab {
- // background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
- //}
+ //.cm-tab {
+ // background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
+ //}
- //.cm-trailingspace {
- // .cm-space {
- // background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAQAgMAAABW5NbuAAAACVBMVEVHcEwAAAAAAAAWawmTAAAAA3RSTlMAPBJ6PMxpAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAFUlEQVQI12NgwACcCQysASAEZGAAACMuAX06aCQUAAAAAElFTkSuQmCC) no-repeat right;
- // }
- //}
+ //.cm-trailingspace {
+ // .cm-space {
+ // background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAQAgMAAABW5NbuAAAACVBMVEVHcEwAAAAAAAAWawmTAAAAA3RSTlMAPBJ6PMxpAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAFUlEQVQI12NgwACcCQysASAEZGAAACMuAX06aCQUAAAAAElFTkSuQmCC) no-repeat right;
+ // }
+ //}
}
.emojiPreview {
- font-size: 1.5em;
- line-height: 1.2em;
+ font-size : 1.5em;
+ line-height : 1.2em;
}
\ No newline at end of file
diff --git a/shared/naturalcrit/styles/core.less b/shared/naturalcrit/styles/core.less
index 21a2687bc..3248269c5 100644
--- a/shared/naturalcrit/styles/core.less
+++ b/shared/naturalcrit/styles/core.less
@@ -43,5 +43,6 @@ html,body, #reactRoot{
}
&:disabled{
background-color : @silver !important;
+ cursor:not-allowed;
}
}