From ce52650dcc0716f7c69a202881ccd90d8b25636f Mon Sep 17 00:00:00 2001 From: caskd Date: Thu, 1 Nov 2018 17:52:19 +0100 Subject: [PATCH] Use terminal theme for the ace editor --- .gitignore | 1 + public/themes/redxen/js/frontend/files/editor.js | 2 +- public/themes/redxen/vendor/ace/theme-chrome.js | 1 - public/themes/redxen/vendor/ace/theme-terminal.js | 5 +++++ resources/themes/redxen/admin/eggs/scripts.blade.php | 2 +- .../public/themes/pterodactyl/js/frontend/files/editor.js | 2 +- resources/themes/redxen/admin/services/functions.blade.php | 2 +- .../themes/redxen/admin/services/options/scripts.blade.php | 2 +- 8 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 public/themes/redxen/vendor/ace/theme-chrome.js create mode 100644 public/themes/redxen/vendor/ace/theme-terminal.js diff --git a/.gitignore b/.gitignore index c27f4a2..43fbf5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ theme.tar.gz +.env diff --git a/public/themes/redxen/js/frontend/files/editor.js b/public/themes/redxen/js/frontend/files/editor.js index 0ab7f9f..00ebab8 100644 --- a/public/themes/redxen/js/frontend/files/editor.js +++ b/public/themes/redxen/js/frontend/files/editor.js @@ -22,7 +22,7 @@ var Whitespace = ace.require('ace/ext/whitespace'); var Modelist = ace.require('ace/ext/modelist'); - Editor.setTheme('ace/theme/chrome'); + Editor.setTheme('ace/theme/terminal'); Editor.getSession().setUseWrapMode(true); Editor.setShowPrintMargin(false); diff --git a/public/themes/redxen/vendor/ace/theme-chrome.js b/public/themes/redxen/vendor/ace/theme-chrome.js deleted file mode 100644 index 145b268..0000000 --- a/public/themes/redxen/vendor/ace/theme-chrome.js +++ /dev/null @@ -1 +0,0 @@ -define("ace/theme/chrome",["require","exports","module","ace/lib/dom"],function(e,t,n){t.isDark=!1,t.cssClass="ace-chrome",t.cssText='.ace-chrome .ace_gutter {background: #ebebeb;color: #333;overflow : hidden;}.ace-chrome .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-chrome {background-color: #FFFFFF;color: black;}.ace-chrome .ace_cursor {color: black;}.ace-chrome .ace_invisible {color: rgb(191, 191, 191);}.ace-chrome .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-chrome .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-chrome .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-chrome .ace_invalid {background-color: rgb(153, 0, 0);color: white;}.ace-chrome .ace_fold {}.ace-chrome .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-chrome .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-chrome .ace_support.ace_type,.ace-chrome .ace_support.ace_class.ace-chrome .ace_support.ace_other {color: rgb(109, 121, 222);}.ace-chrome .ace_variable.ace_parameter {font-style:italic;color:#FD971F;}.ace-chrome .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-chrome .ace_comment {color: #236e24;}.ace-chrome .ace_comment.ace_doc {color: #236e24;}.ace-chrome .ace_comment.ace_doc.ace_tag {color: #236e24;}.ace-chrome .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-chrome .ace_variable {color: rgb(49, 132, 149);}.ace-chrome .ace_xml-pe {color: rgb(104, 104, 91);}.ace-chrome .ace_entity.ace_name.ace_function {color: #0000A2;}.ace-chrome .ace_heading {color: rgb(12, 7, 255);}.ace-chrome .ace_list {color:rgb(185, 6, 144);}.ace-chrome .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-chrome .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-chrome .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-chrome .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-chrome .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-chrome .ace_gutter-active-line {background-color : #dcdcdc;}.ace-chrome .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-chrome .ace_storage,.ace-chrome .ace_keyword,.ace-chrome .ace_meta.ace_tag {color: rgb(147, 15, 128);}.ace-chrome .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-chrome .ace_string {color: #1A1AA6;}.ace-chrome .ace_entity.ace_other.ace_attribute-name {color: #994409;}.ace-chrome .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}';var r=e("../lib/dom");r.importCssString(t.cssText,t.cssClass)}) \ No newline at end of file diff --git a/public/themes/redxen/vendor/ace/theme-terminal.js b/public/themes/redxen/vendor/ace/theme-terminal.js new file mode 100644 index 0000000..4a82997 --- /dev/null +++ b/public/themes/redxen/vendor/ace/theme-terminal.js @@ -0,0 +1,5 @@ +define("ace/theme/terminal", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { + t.isDark = !0, t.cssClass = "ace-terminal", t.cssText = '.ace-terminal-theme .ace_gutter{background:#1a0005;color:#4682b4}.ace-terminal-theme .ace_print-margin{width:1px;background:#1a1a1a}.ace-terminal-theme{background-color:#000;color:#DEDEDE}.ace-terminal-theme .ace_cursor{color:#9F9F9F}.ace-terminal-theme .ace_marker-layer .ace_selection{background:#424242}.ace-terminal-theme.ace_multiselect .ace_selection.ace_start{box-shadow:0 0 3px 0 #000}.ace-terminal-theme .ace_marker-layer .ace_step{background:#000}.ace-terminal-theme .ace_marker-layer .ace_bracket,.ace-terminal-theme .ace_marker-layer .ace_bracket-start{background:#090}.ace-terminal-theme .ace_marker-layer .ace_bracket-unmatched{margin:-1px 0 0 -1px;border:1px solid #900}.ace-terminal-theme .ace_marker-layer .ace_active-line{background:#2A2A2A}.ace-terminal-theme .ace_gutter-active-line{background-color:#2A112A}.ace-terminal-theme .ace_marker-layer .ace_selected-word{border:1px solid #424242}.ace-terminal-theme .ace_invisible{color:#343434}.ace-terminal-theme .ace_keyword,.ace-terminal-theme .ace_meta,.ace-terminal-theme .ace_storage,.ace-terminal-theme .ace_storage.ace_type,.ace-terminal-theme .ace_support.ace_type{color:tomato}.ace-terminal-theme .ace_keyword.ace_operator{color:#ff1493}.ace-terminal-theme .ace_constant.ace_character,.ace-terminal-theme .ace_constant.ace_language,.ace-terminal-theme .ace_constant.ace_numeric,.ace-terminal-theme .ace_keyword.ace_other.ace_unit,.ace-terminal-theme .ace_support.ace_constant,.ace-terminal-theme .ace_variable.ace_parameter{color:#E78C45}.ace-terminal-theme .ace_constant.ace_other{color:gold}.ace-terminal-theme .ace_invalid{color:#ff0;background-color:red}.ace-terminal-theme .ace_invalid.ace_deprecated{color:#CED2CF;background-color:#B798BF}.ace-terminal-theme .ace_fold{background-color:#7AA6DA;border-color:#DEDEDE}.ace-terminal-theme .ace_entity.ace_name.ace_function,.ace-terminal-theme .ace_support.ace_function,.ace-terminal-theme .ace_variable{color:#7AA6DA}.ace-terminal-theme .ace_support.ace_class,.ace-terminal-theme .ace_support.ace_type{color:#E7C547}.ace-terminal-theme .ace_heading,.ace-terminal-theme .ace_string{color:#B9CA4A}.ace-terminal-theme .ace_entity.ace_name.ace_tag,.ace-terminal-theme .ace_entity.ace_other.ace_attribute-name,.ace-terminal-theme .ace_meta.ace_tag,.ace-terminal-theme .ace_string.ace_regexp,.ace-terminal-theme .ace_variable{color:#D54E53}.ace-terminal-theme .ace_comment{color:#ff4500}.ace-terminal-theme .ace_indent-guide{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLBWV/8PAAK4AYnhiq+xAAAAAElFTkSuQmCC) right repeat-y}'; + var r = e("../lib/dom"); + r.importCssString(t.cssText, t.cssClass) +}) \ No newline at end of file diff --git a/resources/themes/redxen/admin/eggs/scripts.blade.php b/resources/themes/redxen/admin/eggs/scripts.blade.php index 55c6f1b..c0d52a3 100644 --- a/resources/themes/redxen/admin/eggs/scripts.blade.php +++ b/resources/themes/redxen/admin/eggs/scripts.blade.php @@ -108,7 +108,7 @@ const InstallEditor = ace.edit('editor_install'); const Modelist = ace.require('ace/ext/modelist') - InstallEditor.setTheme('ace/theme/chrome'); + InstallEditor.setTheme('ace/theme/terminal'); InstallEditor.getSession().setMode('ace/mode/sh'); InstallEditor.getSession().setUseWrapMode(true); InstallEditor.setShowPrintMargin(false); diff --git a/resources/themes/redxen/admin/public/themes/pterodactyl/js/frontend/files/editor.js b/resources/themes/redxen/admin/public/themes/pterodactyl/js/frontend/files/editor.js index 0ab7f9f..00ebab8 100644 --- a/resources/themes/redxen/admin/public/themes/pterodactyl/js/frontend/files/editor.js +++ b/resources/themes/redxen/admin/public/themes/pterodactyl/js/frontend/files/editor.js @@ -22,7 +22,7 @@ var Whitespace = ace.require('ace/ext/whitespace'); var Modelist = ace.require('ace/ext/modelist'); - Editor.setTheme('ace/theme/chrome'); + Editor.setTheme('ace/theme/terminal'); Editor.getSession().setUseWrapMode(true); Editor.setShowPrintMargin(false); diff --git a/resources/themes/redxen/admin/services/functions.blade.php b/resources/themes/redxen/admin/services/functions.blade.php index 3f0e89d..b1eb4ec 100644 --- a/resources/themes/redxen/admin/services/functions.blade.php +++ b/resources/themes/redxen/admin/services/functions.blade.php @@ -75,7 +75,7 @@ const Editor = ace.edit('editor_index'); const Modelist = ace.require('ace/ext/modelist') - Editor.setTheme('ace/theme/chrome'); + Editor.setTheme('ace/theme/terminal'); Editor.getSession().setMode('ace/mode/javascript'); Editor.getSession().setUseWrapMode(true); Editor.setShowPrintMargin(false); diff --git a/resources/themes/redxen/admin/services/options/scripts.blade.php b/resources/themes/redxen/admin/services/options/scripts.blade.php index f94f9f9..1bc9ada 100644 --- a/resources/themes/redxen/admin/services/options/scripts.blade.php +++ b/resources/themes/redxen/admin/services/options/scripts.blade.php @@ -122,7 +122,7 @@ const InstallEditor = ace.edit('editor_install'); const Modelist = ace.require('ace/ext/modelist') - InstallEditor.setTheme('ace/theme/chrome'); + InstallEditor.setTheme('ace/theme/terminal'); InstallEditor.getSession().setMode('ace/mode/sh'); InstallEditor.getSession().setUseWrapMode(true); InstallEditor.setShowPrintMargin(false);