Skip to content

Commit 2b708f2

Browse files
samelhusseinisamelhusseini
authored
Remove custom.css (microsoft#4132)
* Remove custom.css file and move CSS to relevant files * Remove need for Blockly.css in monaco editor
1 parent 84b493a commit 2b708f2

12 files changed

Lines changed: 576 additions & 536 deletions

File tree

‎theme/blockly-core.less‎

Lines changed: 104 additions & 304 deletions
Large diffs are not rendered by default.

‎theme/common.less‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,22 @@
99
Layout
1010
*******************************/
1111

12+
html {
13+
height: 100%;
14+
width: 100%;
15+
overflow: hidden;
16+
font-size:16px;
17+
}
18+
19+
body {
20+
height: 100%;
21+
padding: 0;
22+
overflow: auto;
23+
margin: 0;
24+
-webkit-overflow-scrolling: touch;
25+
overflow-scrolling: touch;
26+
}
27+
1228
* {
1329
min-height: 0;
1430
min-width: 0;
@@ -506,6 +522,33 @@ Avatar
506522
padding: 1rem;
507523
}
508524

525+
.rtl #fileNameInput {
526+
text-align: right;
527+
}
528+
529+
/* Simulator effects */
530+
531+
.grayscale {
532+
-moz-filter: grayscale(1);
533+
-webkit-filter: grayscale(1);
534+
filter: grayscale(1);
535+
}
536+
537+
.sepia {
538+
-webkit-filter: sepia(1);
539+
filter: sepia(1);
540+
}
541+
542+
.blur {
543+
-moz-filter: blur(1);
544+
-webkit-filter: blur(1);
545+
filter: blur(1);
546+
}
547+
548+
.highlight {
549+
border-bottom: 2px solid #FFC107;
550+
}
551+
509552
/* Modulator */
510553
#modulatorWrapper, #modulatorAudioOutput {
511554
display: none;

‎theme/debugger.less‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
}
6868
}
6969

70+
/* Old debugger view */
71+
#root .debuggerview h4 {
72+
margin: 0.9em 0 0 0;
73+
}
74+
7075
/* <= Tablet (Mobile + Tablet) */
7176
@media only screen and (max-width: @largestTabletScreen) {
7277
.debugtoolbar {

‎theme/monaco.less‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,54 @@
163163
color: inherit !important;
164164
}
165165

166+
/*******************************
167+
(Do not override)
168+
*******************************/
169+
170+
#monacoEditor {
171+
direction:ltr;
172+
}
173+
174+
/* Monaco Editor Errors */
175+
.monaco-editor .error-view-zone {
176+
font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
177+
width: initial !important;
178+
}
179+
.monaco-editor.vs-dark .error-view-zone {
180+
color:white;
181+
}
182+
.monaco-editor .error-view-zone .marker-widget {
183+
border-radius: 2px !important;
184+
padding-left: 10px !important;
185+
padding-right: 20px !important;
186+
}
187+
188+
/* Fix for monaco editor Signature bug in Safari */
189+
.monaco-editor .parameter-hints-widget {
190+
flex-direction: row !important;
191+
}
192+
193+
.line-numbers {
194+
display:none;
195+
}
196+
197+
.monacoToolboxDiv {
198+
position: absolute;
199+
display: inline-block;
200+
overflow-x: visible;
201+
overflow-y: auto;
202+
vertical-align: top;
203+
}
204+
.monacoToolboxDiv.hide {
205+
display: none;
206+
}
207+
208+
#monacoEditorInner {
209+
position: relative !important;
210+
display: inline-block;
211+
float: right;
212+
}
213+
166214
/*******************************
167215
Monaco Accessibility
168216
*******************************/

‎theme/pxt.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@import 'serial';
1313
@import 'docs';
1414
@import 'debugger';
15+
@import 'toolbox';
1516

1617
@import 'light';
1718
@import 'accessibility';

‎theme/themes/pxt/globals/site.variables‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@
180180
--------------------*/
181181

182182
@blocklyToolboxColor: white;
183+
@blocklyToolboxText: #575E75;
183184
@trashIconColor: @primaryColor;
184185

185186
/*-------------------

0 commit comments

Comments
 (0)