Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-03 07:13:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Style tweaks & lint obeys codeAssist setting

Browse Source 
solarized and xq-light themes should have lighter active line
foldOff should be a white block with very low alpha, so it looks good on
themes with a light gutter
We should only JS lint if we have codeAssist on (and it's a JS file)
This commit is contained in:
Matt Pass
2013-07-10 17:32:32 +01:00
parent e4caebc368
commit 110a342bb1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor.php
View File

@@ -25,7 +25,7 @@ if (file_exists(dirname(__FILE__)."/plugins/emmet/emmet.min.js")) {
};?>
<link rel="stylesheet" href="<?php
if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
$activeLineBG = array_search($ICEcoder["theme"],array("eclipse","elegant","neat")) !== false ? "#ccc" : "#000";
$activeLineBG = array_search($ICEcoder["theme"],array("eclipse","elegant","neat","solarized","xq-light")) !== false ? "#ccc" : "#000";
?>">
<style type="text/css">
@@ -48,12 +48,11 @@ $activeLineBG = array_search($ICEcoder["theme"],array("eclipse","elegant","neat"
.folds {display: inline-block; width: 13px}
.fold {position: absolute; display: inline-block; width: 13px; height: 13px; font-size: 14px; text-align: center; cursor: pointer}
.foldOn {background: #800; color: #ddd}
.foldOff {background: #383838; color: #666}
.foldOff {background: rgba(255,255,255,0.04); color: #666}
.demoArrow {position: absolute; display: inline-block; width: 99px; height: 50px; top: 0; right: 30px; background: url('images/big-arrow.gif') 0 -10px no-repeat; text-align: center; font-family: arial; font-size: 10px; padding-top: 60px}
h2 {color: rgba(0,198,255,0.7)}
.heading {color:#888}
</style>
<link rel="stylesheet" href="lib/file-types.css">
</head>
@@ -174,7 +173,7 @@ function createNewCMInstance(num) {
autoCloseTags: true,
highlightSelectionMatches: true,
showTrailingSpace: true,
lintWith: fileName && fileName.indexOf(".js")>-1 ? CodeMirror.javascriptValidator : false,
lintWith: <?php if ($ICEcoder['codeAssist']) {echo 'fileName && fileName.indexOf(".js")>-1 ? CodeMirror.javascriptValidator : ';};?>false,
keyMap: "ICEcoder",
onKeyEvent: function(thisCM, e) {
top.ICEcoder.redoChangedContent(e);