mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-08-03 11:57:34 +02:00
Code Issues Releases Wiki Activity

add code folding fixes #38

Browse Source
This commit is contained in:
Kushagra Gour
2017-01-16 04:21:13 +05:30
parent 79a9363829
commit 602c3fb30a
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/index.html
View File

@@ -4,6 +4,7 @@
<title>Web Maker</title> <title>Web Maker</title>
<link rel="stylesheet" href="lib/codemirror/lib/codemirror.css"> <link rel="stylesheet" href="lib/codemirror/lib/codemirror.css">
<link rel="stylesheet" href="lib/codemirror/theme/monokai.css"> <link rel="stylesheet" href="lib/codemirror/theme/monokai.css">
<link rel="stylesheet" href="lib/codemirror/addon/fold/foldgutter.css">
<link rel="stylesheet" href="lib/hint.min.css"> <link rel="stylesheet" href="lib/hint.min.css">
<link rel="stylesheet" href="lib/inlet.css"> <link rel="stylesheet" href="lib/inlet.css">
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
@@ -344,6 +345,12 @@ c5.953,0,10.779,4.826,10.779,10.779v64.674H503.916z"></path>
<script src="lib/codemirror/addon/edit/closebrackets.js"></script> <script src="lib/codemirror/addon/edit/closebrackets.js"></script>
<script src="lib/codemirror/addon/edit/closetag.js"></script> <script src="lib/codemirror/addon/edit/closetag.js"></script>
<script src="lib/codemirror/addon/comment/comment.js"></script> <script src="lib/codemirror/addon/comment/comment.js"></script>
<script src="lib/codemirror/addon/fold/foldcode.js"></script>
<script src="lib/codemirror/addon/fold/foldgutter.js"></script>
<script src="lib/codemirror/addon/fold/xml-fold.js"></script>
<script src="lib/codemirror/addon/fold/indent-fold.js"></script>
<script src="lib/codemirror/addon/fold/comment-fold.js"></script>
<script src="lib/codemirror/addon/fold/brace-fold.js"></script>
<script src="lib/codemirror/addon/mode/loadmode.js"></script> <script src="lib/codemirror/addon/mode/loadmode.js"></script>
<script src="lib/codemirror/mode/xml/xml.js"></script> <script src="lib/codemirror/mode/xml/xml.js"></script>

8
src/script.js
View File

@@ -665,6 +665,7 @@ settingsBtn, onboardModal, notificationsBtn */
keyMap: 'sublime', keyMap: 'sublime',
theme: 'monokai', theme: 'monokai',
lint: !!options.lint, lint: !!options.lint,
foldGutter: true,
gutters: options.gutters || [], gutters: options.gutters || [],
// cursorScrollMargin: '20', has issue with scrolling // cursorScrollMargin: '20', has issue with scrolling
profile: options.profile || '' profile: options.profile || ''
@@ -680,17 +681,18 @@ settingsBtn, onboardModal, notificationsBtn */
scope.cm.html = initEditor(htmlCode, { scope.cm.html = initEditor(htmlCode, {
mode: 'htmlmixed', mode: 'htmlmixed',
profile: 'xhtml' profile: 'xhtml',
gutters: [ 'CodeMirror-linenumbers', 'CodeMirror-foldgutter' ]
}); });
emmetCodeMirror(scope.cm.html); emmetCodeMirror(scope.cm.html);
scope.cm.css = initEditor(cssCode, { scope.cm.css = initEditor(cssCode, {
mode: 'css', mode: 'css',
gutters: [ 'error-gutter' ] gutters: [ 'error-gutter', 'CodeMirror-linenumbers', 'CodeMirror-foldgutter' ]
}); });
Inlet(scope.cm.css); Inlet(scope.cm.css);
scope.cm.js = initEditor(jsCode, { scope.cm.js = initEditor(jsCode, {
mode: 'javascript', mode: 'javascript',
gutters: [ 'error-gutter' ] gutters: [ 'error-gutter', 'CodeMirror-linenumbers', 'CodeMirror-foldgutter' ]
}); });
Inlet(scope.cm.js); Inlet(scope.cm.js);

9
src/style.css
View File

@@ -197,6 +197,15 @@ select, input[type="text"], textarea {
.cm-s-monokai .CodeMirror-gutters { .cm-s-monokai .CodeMirror-gutters {
background: var(--color-bg); background: var(--color-bg);
} }
.cm-s-monokai .CodeMirror-guttermarker-subtle {
opacity: 0.4;
}
.CodeMirror-guttermarker-subtle {
/*visibility: hidden !important;*/
}
.CodeMirror-gutter-wrapper:hover .CodeMirror-guttermarker-subtle {
/*visibility: visible;*/
}
#demo-frame { #demo-frame {
border: 0; border: 0;