Merge pull request #1379 from processing/missing-nonfile-frame

catarak · web-flow · commit 55faf45a3e6c · 2020-04-08T16:29:18.000-04:00
Add frane to code editor when selected folder or media file
diff --git a/client/styles/components/_editor.scss b/client/styles/components/_editor.scss
@@ -1,7 +1,4 @@
 .CodeMirror {
-  @include themify() {
-  	border: 1px solid getThemifyVariable('ide-border-color');
-  }
   font-family: Inconsolata, monospace;
   height: 100%;
 }
@@ -328,7 +325,10 @@ pre.CodeMirror-line {
   height: calc(100% - #{29 / $base-font-size}rem);
   width: 100%;
   position: absolute;
-  &.editor-holder--hidden {
+  @include themify() {
+    border: 1px solid getThemifyVariable('ide-border-color');
+  }
+  &.editor-holder--hidden .CodeMirror {
     display: none;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`.CodeMirror {`
`2`		`- @include themify() {`
`3`		`- border: 1px solid getThemifyVariable('ide-border-color');`
`4`		`- }`
`5`	`2`	`font-family: Inconsolata, monospace;`
`6`	`3`	`height: 100%;`
`7`	`4`	`}`
`@@ -328,7 +325,10 @@ pre.CodeMirror-line {`
`328`	`325`	`height: calc(100% - #{29 / $base-font-size}rem);`
`329`	`326`	`width: 100%;`
`330`	`327`	`position: absolute;`
`331`		`- &.editor-holder--hidden {`
	`328`	`+ @include themify() {`
	`329`	`+ border: 1px solid getThemifyVariable('ide-border-color');`
	`330`	`+ }`
	`331`	`+ &.editor-holder--hidden .CodeMirror {`
`332`	`332`	`display: none;`
`333`	`333`	`}`
`334`	`334`	`}`