Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minimize Flo - factor out some inlined styles

Browse Source 
Generate flo.css

CM extension to be added on the client side

Switch to joint.core

Update joint.core switch script

Try post-install

Proper postinstall stage

Remove support for joint.core switch
This commit is contained in:
BoykoAlex
2019-07-03 18:28:08 -04:00
parent 13238cd6f4
commit fccf7784ab
8 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/demo/app/app.component.ts
View File

@@ -6,6 +6,12 @@ const { Metamodel } = require('./metamodel');
const { Renderer } = require('./renderer');
const { Editor } = require('./editor');
// Code editor used from Flo requires the follwoing CM extensions
import 'codemirror-minified/mode/javascript/javascript';
import 'codemirror-minified/mode/ruby/ruby';
import 'codemirror-minified/mode/clike/clike';
import 'codemirror-minified/addon/lint/javascript-lint';
@Component({
selector: 'demo-app',
templateUrl: './app.component.html',

6
src/demo/styles.css
View File

@@ -1,3 +1,9 @@
@import "./../../node_modules/jointjs/dist/joint.core.css";
@import "./../../node_modules/codemirror-minified/lib/codemirror.css";
@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css";
@import "./../../node_modules/codemirror-minified/addon/lint/lint.css";
@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css";
h1 {
color: #369;
font-family: Arial, Helvetica, sans-serif;

27
src/lib/code-editor/code-editor.component.ts
View File

@@ -18,30 +18,23 @@ import 'codemirror-minified/addon/scroll/simplescrollbars';
// Lint support
// Unclear how to import this dynamically...
import 'codemirror-minified/addon/lint/javascript-lint';
import 'codemirror-minified/addon/lint/coffeescript-lint';
import 'codemirror-minified/addon/lint/json-lint';
import 'codemirror-minified/addon/lint/yaml-lint';
// import 'codemirror-minified/addon/lint/javascript-lint';
// import 'codemirror-minified/addon/lint/json-lint';
// import 'codemirror-minified/addon/lint/yaml-lint';
// TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD
// Supported languages until dynamic loading
import 'codemirror-minified/mode/groovy/groovy';
import 'codemirror-minified/mode/javascript/javascript';
import 'codemirror-minified/mode/python/python';
import 'codemirror-minified/mode/ruby/ruby';
import 'codemirror-minified/mode/clike/clike';
import 'codemirror-minified/mode/yaml/yaml';
import 'codemirror-minified/mode/coffeescript/coffeescript';
// import 'codemirror-minified/mode/groovy/groovy';
// import 'codemirror-minified/mode/javascript/javascript';
// import 'codemirror-minified/mode/python/python';
// import 'codemirror-minified/mode/ruby/ruby';
// import 'codemirror-minified/mode/clike/clike';
// import 'codemirror-minified/mode/yaml/yaml';
@Component({
selector: 'code-editor',
templateUrl: './code-editor.component.html',
styleUrls: [
'./../../../node_modules/codemirror-minified/lib/codemirror.css',
'./../../../node_modules/codemirror-minified/addon/hint/show-hint.css',
'./../../../node_modules/codemirror-minified/addon/lint/lint.css',
'./../../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css',
'./code-editor.component.scss', ],
styleUrls: ['./code-editor.component.scss', ],
encapsulation: ViewEncapsulation.None,
providers: [
{

7
src/lib/dsl-editor/dsl-editor.component.ts
View File

@@ -10,15 +10,10 @@ import 'codemirror-minified/addon/display/placeholder';
import 'codemirror-minified/addon/scroll/annotatescrollbar';
import 'codemirror-minified/addon/scroll/simplescrollbars';
@Component({
selector: 'dsl-editor',
templateUrl: './dsl-editor.component.html',
styleUrls: [
'./../../../node_modules/codemirror-minified/lib/codemirror.css',
'./../../../node_modules/codemirror-minified/addon/hint/show-hint.css',
'./../../../node_modules/codemirror-minified/addon/lint/lint.css',
'./dsl-editor.component.scss', ],
styleUrls: ['./dsl-editor.component.scss', ],
encapsulation: ViewEncapsulation.None
})
export class DslEditorComponent implements OnInit, OnDestroy {

2
src/lib/editor/editor.component.ts
View File

@@ -21,7 +21,7 @@ const SCROLLBAR_SIZE = 17;
@Component({
selector: 'flo-editor',
templateUrl: './editor.component.html',
styleUrls: ['./../../../node_modules/jointjs/dist/joint.css', './editor.component.scss'],
styleUrls: ['./editor.component.scss'],
encapsulation: ViewEncapsulation.None
})
export class EditorComponent implements OnInit, OnDestroy {

5
src/lib/styles.scss Normal file
View File

@@ -0,0 +1,5 @@
@import "./../../node_modules/jointjs/dist/joint.core.css";
@import "./../../node_modules/codemirror-minified/lib/codemirror.css";
@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css";
@import "./../../node_modules/codemirror-minified/addon/lint/lint.css";
@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css";