Skip to content

Commit f916303

Browse files
committed
position
1 parent 334a6f5 commit f916303

File tree

2 files changed

+51
-45
lines changed

2 files changed

+51
-45
lines changed

client/modules/IDE/components/Header/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const Header = (props) => {
99
const project = useSelector((state) => state.project);
1010

1111
return (
12-
<header style={{ zIndex: 10 }}>
12+
<header>
1313
<Nav />
1414
<MediaQuery minWidth={770}>
1515
{(matches) => {

client/styles/components/_editor.scss

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
}
55

66
.CodeMirror-linenumbers {
7-
padding-right: #{10 / $base-font-size}rem;
8-
7+
padding-right: #{10 / $base-font-size}rem;
98
}
109

1110
.CodeMirror-linenumber {
12-
width: #{32 / $base-font-size}rem;
11+
width: #{32 / $base-font-size}rem;
1312
left: #{-3 / $base-font-size}rem !important;
1413
@include themify() {
15-
color: getThemifyVariable('inactive-text-color');
14+
color: getThemifyVariable("inactive-text-color");
1615
}
1716
}
1817

@@ -21,7 +20,7 @@
2120
}
2221

2322
pre.CodeMirror-line {
24-
padding-left: #{5 / $base-font-size}rem;
23+
padding-left: #{5 / $base-font-size}rem;
2524
}
2625

2726
.CodeMirror-gutter-wrapper {
@@ -30,15 +29,18 @@ pre.CodeMirror-line {
3029
bottom: 0;
3130
}
3231

33-
.CodeMirror-lint-marker-warning, .CodeMirror-lint-marker-error, .CodeMirror-lint-marker-multiple {
32+
.CodeMirror-lint-marker-warning,
33+
.CodeMirror-lint-marker-error,
34+
.CodeMirror-lint-marker-multiple {
3435
background-image: none;
3536
width: #{49 / $base-font-size}rem;
3637
position: absolute;
3738
height: 100%;
3839
right: 100%;
3940
}
4041

41-
.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
42+
.CodeMirror-lint-message-error,
43+
.CodeMirror-lint-message-warning {
4244
background-image: none;
4345
padding-left: inherit;
4446
}
@@ -61,19 +63,19 @@ pre.CodeMirror-line {
6163

6264
.CodeMirror-lint-tooltip {
6365
@include themify() {
64-
background-color: getThemifyVariable('modal-background-color');
65-
border: 1px solid getThemifyVariable('modal-border-color');
66-
box-shadow: 0 12px 12px getThemifyVariable('shadow-color');
67-
color: getThemifyVariable('primary-text-color');
66+
background-color: getThemifyVariable("modal-background-color");
67+
border: 1px solid getThemifyVariable("modal-border-color");
68+
box-shadow: 0 12px 12px getThemifyVariable("shadow-color");
69+
color: getThemifyVariable("primary-text-color");
6870
}
6971
border-radius: 2px;
7072
font-family: Montserrat, sans-serif;
7173
}
7274

7375
.CodeMirror-gutters {
7476
@include themify() {
75-
background-color: getThemifyVariable('editor-gutter-color');
76-
border-color: getThemifyVariable('ide-border-color');
77+
background-color: getThemifyVariable("editor-gutter-color");
78+
border-color: getThemifyVariable("ide-border-color");
7779
}
7880
// left: 0 !important;
7981
width: #{48 / $base-font-size}rem;
@@ -87,9 +89,9 @@ pre.CodeMirror-line {
8789
position: fixed;
8890
top: 0;
8991
left: 50%;
90-
margin-left: - #{552/2/$base-font-size}rem;
92+
margin-left: -#{552/2 / $base-font-size}rem;
9193

92-
z-index: 10;
94+
// z-index: 20;
9395

9496
width: 580px;
9597
font-family: Montserrat, sans-serif;
@@ -99,9 +101,9 @@ pre.CodeMirror-line {
99101
border-radius: 2px;
100102

101103
@include themify() {
102-
background-color: getThemifyVariable('modal-background-color');
103-
box-shadow: 0 12px 12px 0 getThemifyVariable('shadow-color');
104-
border: solid 0.5px getThemifyVariable('modal-border-color');
104+
background-color: getThemifyVariable("modal-background-color");
105+
box-shadow: 0 12px 12px 0 getThemifyVariable("shadow-color");
106+
border: solid 0.5px getThemifyVariable("modal-border-color");
105107
}
106108
}
107109

@@ -128,7 +130,7 @@ pre.CodeMirror-line {
128130
.CodeMirror-search-results {
129131
margin: 0 #{20 / $base-font-size}rem;
130132
width: #{75 / $base-font-size}rem;
131-
font-size: #{12/$base-font-size}rem;
133+
font-size: #{12 / $base-font-size}rem;
132134
}
133135

134136
.CodeMirror-find-controls {
@@ -177,14 +179,14 @@ pre.CodeMirror-line {
177179
.CodeMirror-search-field {
178180
display: block;
179181
width: 100%;
180-
max-width: #{166/$base-font-size}rem;
182+
max-width: #{166 / $base-font-size}rem;
181183
margin-bottom: #{4 / $base-font-size}rem;
182184
@include themify() {
183-
color: getThemifyVariable('input-text-color');
184-
background-color: getThemifyVariable('input-secondary-background-color');
185-
border: solid 0.5px getThemifyVariable('button-border-color');
185+
color: getThemifyVariable("input-text-color");
186+
background-color: getThemifyVariable("input-secondary-background-color");
187+
border: solid 0.5px getThemifyVariable("button-border-color");
186188
&::placeholder {
187-
color: getThemifyVariable('inactive-text-color');
189+
color: getThemifyVariable("inactive-text-color");
188190
}
189191
}
190192
}
@@ -221,7 +223,6 @@ pre.CodeMirror-line {
221223
&:hover {
222224
border-color: getThemifyVariable("button-border-color");
223225
}
224-
225226
}
226227
width: #{35 / $base-font-size}rem;
227228
height: #{35 / $base-font-size}rem;
@@ -266,26 +267,30 @@ pre.CodeMirror-line {
266267
border-top: #{1 / $base-font-size}rem solid orange;
267268
border-bottom: #{1 / $base-font-size}rem solid orange;
268269
box-sizing: border-box;
269-
opacity: .5;
270+
opacity: 0.5;
270271
}
271272

272273
/*
273274
Close button
274275
*/
275-
.CodeMirror-close-button-container {
276+
.CodeMirror-close-button-container {
276277
display: flex;
277278
align-items: center;
278279
}
279280

280281
// foldgutter
281282
.CodeMirror-foldmarker {
282-
text-shadow: -1px 0 #ed225d, 0 1px #ed225d, 1px 0 #ed225d, 0 -1px #ed225d;
283-
color: #FFF;
283+
text-shadow:
284+
-1px 0 #ed225d,
285+
0 1px #ed225d,
286+
1px 0 #ed225d,
287+
0 -1px #ed225d;
288+
color: #fff;
284289
/* background-color: rgba(237, 34, 93, 0.42); */
285290
/* border-radius: 3px; */
286291
font-weight: bold;
287292
font-family: arial;
288-
line-height: .3;
293+
line-height: 0.3;
289294
cursor: pointer;
290295
opacity: 0.75;
291296
}
@@ -297,7 +302,7 @@ pre.CodeMirror-line {
297302
cursor: pointer;
298303
padding-bottom: 0.4em;
299304
text-align: right;
300-
line-height: 1.0;
305+
line-height: 1;
301306
}
302307
.CodeMirror-foldgutter-open:after {
303308
content: "\25BE";
@@ -306,20 +311,21 @@ pre.CodeMirror-line {
306311
content: "\25B8";
307312
}
308313

309-
.CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded {
314+
.CodeMirror-foldgutter-open,
315+
.CodeMirror-foldgutter-folded {
310316
position: absolute;
311317
right: 100%;
312318
}
313319

314320
.CodeMirror-foldgutter-open:after {
315321
@include themify() {
316-
background-image: getThemifyVariable('codefold-icon-open');
322+
background-image: getThemifyVariable("codefold-icon-open");
317323
}
318324
}
319325

320326
.CodeMirror-foldgutter-folded:after {
321327
@include themify() {
322-
background-image: getThemifyVariable('codefold-icon-closed');
328+
background-image: getThemifyVariable("codefold-icon-closed");
323329
}
324330
}
325331

@@ -345,7 +351,6 @@ pre.CodeMirror-line {
345351
font-family: serif;
346352
}
347353

348-
349354
.line-runtime-error + .CodeMirror-activeline-gutter {
350355
background-color: rgb(255, 95, 82);
351356
opacity: 0.3;
@@ -361,7 +366,7 @@ pre.CodeMirror-line {
361366
width: 100%;
362367
position: absolute;
363368
@include themify() {
364-
border: 1px solid getThemifyVariable('ide-border-color');
369+
border: 1px solid getThemifyVariable("ide-border-color");
365370
}
366371
&.editor-holder--hidden .CodeMirror {
367372
display: none;
@@ -374,7 +379,7 @@ pre.CodeMirror-line {
374379

375380
.editor__file-name {
376381
@include themify() {
377-
color: getThemifyVariable('primary-text-color');
382+
color: getThemifyVariable("primary-text-color");
378383
}
379384
height: #{29 / $base-font-size}rem;
380385
padding-top: #{7 / $base-font-size}rem;
@@ -394,7 +399,7 @@ pre.CodeMirror-line {
394399
@extend %modal;
395400
position: absolute;
396401
@include themify() {
397-
background: getThemifyVariable('background-color');
402+
background: getThemifyVariable("background-color");
398403
}
399404
& .CodeMirror-lines {
400405
padding: 0;
@@ -408,21 +413,22 @@ pre.CodeMirror-line {
408413
}
409414

410415
.emmet-abbreviation-preview:not(.has-error) .emmet-abbreviation-preview-error {
411-
display: none;
416+
display: none;
412417
}
413418

414419
.emmet-abbreviation-preview.has-error .CodeMirror {
415-
display: none;
420+
display: none;
416421
}
417422

418423
.emmet-abbreviation-preview .CodeMirror-cursors {
419-
visibility: hidden !important;
424+
visibility: hidden !important;
420425
}
421426

422427
.emmet-abbreviation-preview .emmet-error-snippet-message {
423-
padding: 5px;
428+
padding: 5px;
424429
}
425430

426-
.emmet-open-tag, .emmet-close-tag {
427-
text-decoration: underline;
431+
.emmet-open-tag,
432+
.emmet-close-tag {
433+
text-decoration: underline;
428434
}

0 commit comments

Comments
 (0)