Skip to content

Commit

Permalink
fix: Multiple improvements for Ace themes
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewnester committed May 29, 2022
1 parent bf2c7e2 commit d1f6d44
Show file tree
Hide file tree
Showing 18 changed files with 595 additions and 36 deletions.
43 changes: 22 additions & 21 deletions lib/ace/autocomplete/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,40 +320,43 @@ var AcePopup = function(parentNode) {
};

dom.importCssString("\
.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\
.ace_autocomplete.ace-tm .ace_marker-layer .ace_active-line {\
background-color: #CAD6FA;\
z-index: 1;\
}\
.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\
background-color: #3a674e;\
}\
.ace_editor.ace_autocomplete .ace_line-hover {\
.ace_autocomplete.ace-tm .ace_line-hover {\
border: 1px solid #abbffe;\
margin-top: -1px;\
background: rgba(233,233,253,0.4);\
}\
.ace_autocomplete .ace_line-hover {\
position: absolute;\
z-index: 2;\
}\
.ace_dark.ace_editor.ace_autocomplete .ace_line-hover {\
border: 1px solid rgba(109, 150, 13, 0.8);\
background: rgba(58, 103, 78, 0.62);\
.ace_autocomplete .ace_scroller {\
background: none;\
border: none;\
box-shadow: none;\
}\
.ace_completion-meta {\
opacity: 0.5;\
margin: 0.9em;\
.ace_rightAlignedText {\
color: gray;\
display: inline-block;\
position: absolute;\
right: 4px;\
text-align: right;\
z-index: -1;\
}\
.ace_completion-message {\
color: blue;\
}\
.ace_editor.ace_autocomplete .ace_completion-highlight{\
color: #2d69c7;\
.ace_autocomplete .ace_completion-highlight{\ color: #000;\
text-shadow: 0 0 0.01em;\
}\
.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight{\
color: #93ca12;\
}\
.ace_editor.ace_autocomplete {\
width: 300px;\
.ace_autocomplete {\
width: 280px;\
z-index: 200000;\
background: #fbfbfb;\
color: #444;\
border: 1px lightgray solid;\
position: fixed;\
box-shadow: 2px 3px 5px rgba(0,0,0,.2);\
Expand All @@ -371,6 +374,4 @@ dom.importCssString("\

exports.AcePopup = AcePopup;
exports.$singleLineEditor = $singleLineEditor;
});


});
4 changes: 0 additions & 4 deletions lib/ace/css/editor.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ styles.join("\n")
background: rgba(0, 0, 0, 0.01);
}

.ace_selecting, .ace_selecting * {
cursor: text !important;
}

.ace_gutter {
position: absolute;
overflow : hidden;
Expand Down
2 changes: 1 addition & 1 deletion lib/ace/ext/themelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var themeData = [
["Solarized Light"],
["TextMate" ],
["Tomorrow" ],
["Xcode" ],
["XCode" ],
["Kuroir"],
["KatzenMilch"],
["SQL Server" ,"sqlserver" , "light"],
Expand Down
6 changes: 4 additions & 2 deletions lib/ace/theme/chrome.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@
color: rgb(0, 0, 205);
}

.ace-chrome .ace_variable {
.ace-chrome .ace_variable,
.ace-chrome .ace_variable:not(.ace_parameter),
.ace-chrome .ace_constant:not(.ace_numeric) {
color: rgb(49, 132, 149);
}

Expand Down Expand Up @@ -151,4 +153,4 @@

.ace-chrome .ace_indent-guide {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;
}
}
156 changes: 156 additions & 0 deletions lib/ace/theme/cloud9_day.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
.ace-cloud9-day .ace_gutter {
background: #ECECEC;
color: #333;
}

.ace-cloud9-day .ace_print-margin {
width: 1px;
background: #e8e8e8;
}

.ace-cloud9-day .ace_fold {
background-color: #6B72E6;
}

.ace-cloud9-day {
background-color: #FBFBFB;
color: black;
}

.ace-cloud9-day .ace_cursor {
color: black;
}

.ace-cloud9-day .ace_invisible {
color: rgb(191, 191, 191);
}

.ace-cloud9-day .ace_storage,
.ace-cloud9-day .ace_keyword {
color: rgb(24, 122, 234);
}

.ace-cloud9-day .ace_constant {
color: rgb(197, 6, 11);
}

.ace-cloud9-day .ace_constant.ace_buildin {
color: rgb(88, 72, 246);
}

.ace-cloud9-day .ace_constant.ace_language {
color: rgb(88, 92, 246);
}

.ace-cloud9-day .ace_constant.ace_library {
color: rgb(6, 150, 14);
}

.ace-cloud9-day .ace_invalid {
background-color: rgba(255, 0, 0, 0.1);
color: red;
}

.ace-cloud9-day .ace_support.ace_function {
color: rgb(60, 76, 114);
}

.ace-cloud9-day .ace_support.ace_constant {
color: rgb(6, 150, 14);
}

.ace-cloud9-day .ace_support.ace_type,
.ace-cloud9-day .ace_support.ace_class {
color: rgb(109, 121, 222);
}

.ace-cloud9-day .ace_keyword.ace_operator {
color: rgb(104, 118, 135);
}

.ace-cloud9-day .ace_string {
color: rgb(3, 106, 7);
}

.ace-cloud9-day .ace_comment {
color: rgb(76, 136, 107);
}

.ace-cloud9-day .ace_comment.ace_doc {
color: rgb(0, 102, 255);
}

.ace-cloud9-day .ace_comment.ace_doc.ace_tag {
color: rgb(128, 159, 191);
}

.ace-cloud9-day .ace_constant.ace_numeric {
color: rgb(0, 0, 205);
}

.ace-cloud9-day .ace_variable {
color: rgb(49, 132, 149);
}

.ace-cloud9-day .ace_xml-pe {
color: rgb(104, 104, 91);
}

.ace-cloud9-day .ace_entity.ace_name.ace_function {
color: #0000A2;
}


.ace-cloud9-day .ace_heading {
color: rgb(12, 7, 255);
}

.ace-cloud9-day .ace_list {
color: rgb(185, 6, 144);
}

.ace-cloud9-day .ace_meta.ace_tag {
color: rgb(0, 22, 142);
}

.ace-cloud9-day .ace_string.ace_regex {
color: rgb(255, 0, 0)
}

.ace-cloud9-day .ace_marker-layer .ace_selection {
background: rgb(181, 213, 255);
}

.ace-cloud9-day.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px white;
}

.ace-cloud9-day .ace_marker-layer .ace_step {
background: rgb(247, 237, 137);
}

.ace-cloud9-day .ace_marker-layer .ace_stack {
background: #BAE0A0;
}

.ace-cloud9-day .ace_marker-layer .ace_bracket {
margin: -1px 0 0 -1px;
border: 1px solid rgb(192, 192, 192);
}

.ace-cloud9-day .ace_marker-layer .ace_active-line {
background: rgba(0, 0, 0, 0.07);
}

.ace-cloud9-day .ace_gutter-active-line {
background-color: #E5E5E5;
}

.ace-cloud9-day .ace_marker-layer .ace_selected-word {
background: rgb(250, 250, 255);
border: 1px solid rgb(200, 200, 250);
}

.ace-cloud9-day .ace_indent-guide {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;
}
40 changes: 40 additions & 0 deletions lib/ace/theme/cloud9_day.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/* ***** BEGIN LICENSE BLOCK *****
* Distributed under the BSD license:
*
* Copyright (c) 2010, Ajax.org B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Ajax.org B.V. nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* ***** END LICENSE BLOCK ***** */

define(function (require, exports, module) {
"use strict";

exports.isDark = false;
exports.cssClass = "ace-cloud9-day";
exports.cssText = require("../requirejs/text!./cloud9_day.css");

var dom = require("../lib/dom");
dom.importCssString(exports.cssText, exports.cssClass);
});
Loading

0 comments on commit d1f6d44

Please sign in to comment.