Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate css blocks #580

Merged
merged 18 commits into from
Dec 12, 2016
Merged

Integrate css blocks #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c2f6143
support loading and display of css blocks and injection into dom
dwsmorris Nov 19, 2016
68ff47d
inject styles on document load and block checking/unchecking
dwsmorris Nov 19, 2016
1f3a587
Merge branch 'master' into integrate-css-blocks
dwsmorris Dec 2, 2016
caafbdf
send css to client as part of "parse" message
dwsmorris Dec 3, 2016
98db88e
extract syntax parsing logic from info into own function
dwsmorris Dec 3, 2016
9cb6338
apply codemirror syntax highlighting to css blocks
dwsmorris Dec 4, 2016
7955ace
switch css blocks from yellow to blue
dwsmorris Dec 4, 2016
e8c99bc
selector rewrite to limit scope of example's css
dwsmorris Dec 4, 2016
ed5c0cc
fix bug for empty extracted css blocks
dwsmorris Dec 4, 2016
ee62762
mark non-eve blocks with language name
dwsmorris Dec 4, 2016
9473326
tweak checkbox position and restore fixed length block-insertion bar …
dwsmorris Dec 4, 2016
0313edb
Merge branch 'master' of https://github.com/witheve/Eve into integrat…
dwsmorris Dec 10, 2016
43e1959
reapply merge conflict
dwsmorris Dec 10, 2016
b8b212c
correct merge
dwsmorris Dec 10, 2016
b164c99
support multiline css blocks and comma-separated selector specifications
dwsmorris Dec 10, 2016
ee9ab9e
comments for multlanguage styling + support css rewriting for multili…
dwsmorris Dec 10, 2016
bb5669e
exclude media queries, animations and associated fields
dwsmorris Dec 10, 2016
95fef05
apply fix to prevent crash in clearWidgets()
dwsmorris Dec 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions assets/css/ide.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ body { justify-content: stretch; }
.CodeMirror .STRONG { font-weight:bold; }
.CodeMirror .EMPH { font-style:italic; }
.CodeMirror .CODE { margin-left: 10px; margin-right:50px; border-left:5px solid #eaeaea; background: #f4f4f4; font-family: "Inconsolata", "Monaco", "Consolas", "Ubuntu Mono", monospace; }
.CodeMirror .CODE.css { background: #f0f5ff; border-left-color: #e1ebff;}
.CodeMirror .CODE-TEXT { line-height:19px; padding-left:30px; transition: opacity 0.3s; }
.CodeMirror .CODE-TEXT.CODE-DISABLED { opacity: 0.6; }
.CodeMirror span.CODE { color: #0076ce; background:none; margin:0; padding:0; border:none; }
Expand All @@ -129,9 +130,10 @@ body { justify-content: stretch; }
.CodeMirror .CODE-BOTTOM { border-radius:0 0 3px 3px; padding-bottom:8px; }

.CodeMirror .CodeMirror-linewidget { overflow: visible; z-index: 3; }
.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; }
.CodeMirror .code-controls-widget > * { cursor:pointer; }
.CodeMirror .CodeMirror-linewidget:hover .code-controls-widget { opacity: 1; }
.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; }
.CodeMirror .code-controls-widget .enable-btn { cursor:pointer; opacity: 0.2; }
.CodeMirror .CodeMirror-linewidget .code-controls-widget .enable-btn:hover { opacity: 1; }
.CodeMirror .CodeMirror-linewidget .code-controls-widget .code-language-label {font-size: 1.0rem; margin-top: -2px; margin-right: 5px; opacity: 0.5;}

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

Expand Down Expand Up @@ -177,7 +179,7 @@ body { justify-content: stretch; }
* Format Bars
\****************************************************************************/
.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; }
.editor-pane .new-block-bar.active { width: 246px; }
.editor-pane .new-block-bar.active { width: 267px; }


.editor-pane .new-block-bar > .new-block-bar-toggle,
Expand Down
3 changes: 3 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@

</style>

<style id="app-styles"></style>

<link rel="stylesheet" type="text/css" href="assets/css/ide.css">
<link href="assets/favicon.png" rel="icon" type="image/png" />
</head>
<body>
<script type="text/javascript" src="build/workspaces.js"></script>
<script type="text/javascript" src="build/src/uuid.js"></script>
<script type="text/javascript" src="build/src/codemirror.js"></script>
<script type="text/javascript" src="build/src/css.js"></script>
<script type="text/javascript" src="build/src/simplescrollbars.js"></script>
<script type="text/javascript" src="build/src/annotatescrollbar.js"></script>
<script type="text/javascript" src="build/src/commonmark.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ export class EveClient {

_parse(data) {
if(!this.showIDE) return;
this.ide.loadDocument(data.generation, data.text, data.spans, data.extraInfo); // @FIXME
this.ide.loadDocument(data.generation, data.text, data.spans, data.extraInfo, data.css); // @FIXME
}

_comments(data) {
Expand Down
Loading