Skip to content

Commit f57adbc

Browse files
joshuafcolejoshuafcole
authored
Merge pull request #580 from dwsmorris/integrate-css-blocks
Integrate css blocks
2 parents f36a33f + 95fef05 commit f57adbc

File tree

8 files changed

+902
-20
lines changed

8 files changed

+902
-20
lines changed

‎assets/css/ide.css

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ body { justify-content: stretch; }
120120
.CodeMirror .STRONG { font-weight:bold; }
121121
.CodeMirror .EMPH { font-style:italic; }
122122
.CodeMirror .CODE { margin-left: 10px; margin-right:50px; border-left:5px solid #eaeaea; background: #f4f4f4; font-family: "Inconsolata", "Monaco", "Consolas", "Ubuntu Mono", monospace; }
123+
.CodeMirror .CODE.css { background: #f0f5ff; border-left-color: #e1ebff;}
123124
.CodeMirror .CODE-TEXT { line-height:19px; padding-left:30px; transition: opacity 0.3s; }
124125
.CodeMirror .CODE-TEXT.CODE-DISABLED { opacity: 0.6; }
125126
.CodeMirror span.CODE { color: #0076ce; background:none; margin:0; padding:0; border:none; }
@@ -129,9 +130,10 @@ body { justify-content: stretch; }
129130
.CodeMirror .CODE-BOTTOM { border-radius:0 0 3px 3px; padding-bottom:8px; }
130131

131132
.CodeMirror .CodeMirror-linewidget { overflow: visible; z-index: 3; }
132-
.CodeMirror .code-controls-widget { display: flex; flex-direction: row; justify-content: flex-end; margin-right: 50px; padding: 5px 10px; padding-bottom: 0; height: 15px; font-size: 1.2rem; opacity: 0.2; transition: opacity 0.3s; }
133-
.CodeMirror .code-controls-widget > * { cursor:pointer; }
134-
.CodeMirror .CodeMirror-linewidget:hover .code-controls-widget { opacity: 1; }
133+
.CodeMirror .code-controls-widget { display: flex; flex-direction: row; justify-content: flex-end; margin-right: 50px; padding: 3px 6px; padding-bottom: 0; height: 20px; font-size: 1.2rem; transition: opacity 0.3s; }
134+
.CodeMirror .code-controls-widget .enable-btn { cursor:pointer; opacity: 0.2; }
135+
.CodeMirror .CodeMirror-linewidget .code-controls-widget .enable-btn:hover { opacity: 1; }
136+
.CodeMirror .CodeMirror-linewidget .code-controls-widget .code-language-label {font-size: 1.0rem; margin-top: -2px; margin-right: 5px; opacity: 0.5;}
135137

136138
.CodeMirror .code-footer-widget { height: 15px; }
137139

@@ -177,7 +179,7 @@ body { justify-content: stretch; }
177179
* Format Bars
178180
\****************************************************************************/
179181
.editor-pane .new-block-bar { position: absolute; top: 0; left: 0; margin-left: -28px; display: flex; flex-direction: row; width: 28px; overflow: hidden; transition: width 0.15s; z-index: 5; color: #666; border-radius:5px; border:1px solid #ddd; font-size:10pt; background:white; }
180-
.editor-pane .new-block-bar.active { width: 246px; }
182+
.editor-pane .new-block-bar.active { width: 267px; }
181183

182184

183185
.editor-pane .new-block-bar > .new-block-bar-toggle,

‎index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515

1616
</style>
1717

18+
<style id="app-styles"></style>
19+
1820
<link rel="stylesheet" type="text/css" href="assets/css/ide.css">
1921
<link href="assets/favicon.png" rel="icon" type="image/png" />
2022
</head>
2123
<body>
2224
<script type="text/javascript" src="build/workspaces.js"></script>
2325
<script type="text/javascript" src="build/src/uuid.js"></script>
2426
<script type="text/javascript" src="build/src/codemirror.js"></script>
27+
<script type="text/javascript" src="build/src/css.js"></script>
2528
<script type="text/javascript" src="build/src/simplescrollbars.js"></script>
2629
<script type="text/javascript" src="build/src/annotatescrollbar.js"></script>
2730
<script type="text/javascript" src="build/src/commonmark.js"></script>

‎src/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ export class EveClient {
304304

305305
_parse(data) {
306306
if(!this.showIDE) return;
307-
this.ide.loadDocument(data.generation, data.text, data.spans, data.extraInfo); // @FIXME
307+
this.ide.loadDocument(data.generation, data.text, data.spans, data.extraInfo, data.css); // @FIXME
308308
}
309309

310310
_comments(data) {

0 commit comments

Comments
 (0)