Merge pull request #24 from ethereum/remixide-cleanup

Cleanup remix-ide

apps/remix-ide/assets/css/pygment_trac.css

@@ -1,69 +0,0 @@
-.highlight  { background: #ffffff; }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: #d14 } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { color: #0086B3 } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #d14 } /* Literal.String.Backtick */
-.highlight .sc { color: #d14 } /* Literal.String.Char */
-.highlight .sd { color: #d14 } /* Literal.String.Doc */
-.highlight .s2 { color: #d14 } /* Literal.String.Double */
-.highlight .se { color: #d14 } /* Literal.String.Escape */
-.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
-.highlight .si { color: #d14 } /* Literal.String.Interpol */
-.highlight .sx { color: #d14 } /* Literal.String.Other */
-.highlight .sr { color: #009926 } /* Literal.String.Regex */
-.highlight .s1 { color: #d14 } /* Literal.String.Single */
-.highlight .ss { color: #990073 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
-
-.type-csharp .highlight .k { color: #0000FF }
-.type-csharp .highlight .kt { color: #0000FF }
-.type-csharp .highlight .nf { color: #000000; font-weight: normal }
-.type-csharp .highlight .nc { color: #2B91AF }
-.type-csharp .highlight .nn { color: #000000 }
-.type-csharp .highlight .s { color: #A31515 }
-.type-csharp .highlight .sc { color: #A31515 }

apps/remix-ide/assets/js/editor/darkTheme.js

@@ -1,181 +0,0 @@
-/* eslint-disable */
-ace.define("ace/theme/remixDark",["require","exports","module","ace/lib/dom"], function(acequire, exports, module) {
-
-  exports.isDark = true;
-  exports.cssClass = "ace-remixDark";
-  exports.cssText = ".ace-remixDark .ace_gutter {\
-  background: #2a2c3f;\
-  color: #8789a1;\
-  border-right: 1px solid #282828;\
-  }\
-  .ace-remixDark .ace_gutter-cell.ace_warning {\
-  background-image: none;\
-  background: #FC0;\
-  border-left: none;\
-  padding-left: 0;\
-  color: #000;\
-  }\
-  .ace-remixDark .ace_gutter-cell.ace_error {\
-  background-position: -6px center;\
-  background-image: none;\
-  background: #F10;\
-  border-left: none;\
-  padding-left: 0;\
-  color: #000;\
-  }\
-  .ace-remixDark .ace_print-margin {\
-  border-left: 1px solid #555;\
-  right: 0;\
-  background: #1D1D1D;\
-  }\
-  .ace-remixDark {\
-  background-color: #222336;\
-  color: #a2a3bd;\
-  }\
-  .ace-remixDark .ace_cursor {\
-  border-left: 2px solid #FFFFFF;\
-  }\
-  .ace-remixDark .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #FFFFFF;\
-  }\
-  .ace-remixDark .ace_marker-layer .ace_selection {\
-  background: #494836;\
-  }\
-  .ace-remixDark .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-  }\
-  .ace-remixDark .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #FCE94F;\
-  }\
-  .ace-remixDark .ace_marker-layer .ace_active-line {\
-  background: #363950;\
-  }\
-  .ace-remixDark .ace_gutter-active-line {\
-  background-color: #363950;\
-  }\
-  .ace-remixDark .ace_invisible {\
-  color: #404040;\
-  }\
-  .ace-remixDark .ace_rparen {\
-    color: #d4d7ed;\
-  }\
-  .ace-remixDark .ace_lparen {\
-    color: #d4d7ed;\
-  }\
-  .ace-remixDark .ace_keyword {\
-  color:#ffa76d;\
-  }\
-  .ace-remixDark .ace_keyword.ace_operator {\
-  color:#eceeff;\
-  }\
-  .ace-remixDark .ace_constant {\
-  color:#1EDAFB;\
-  }\
-  .ace-remixDark .ace_constant.ace_language {\
-  color:#FDC251;\
-  }\
-  .ace-remixDark .ace_constant.ace_library {\
-  color:#8DFF0A;\
-  }\
-  .ace-remixDark .ace_constant.ace_numeric {\
-  color:#eceeff;\
-  }\
-  .ace-remixDark .ace_invalid {\
-  color:#FFFFFF;\
-  background-color:#990000;\
-  }\
-  .ace-remixDark .ace_invalid.ace_deprecated {\
-  color:#FFFFFF;\
-  background-color:#990000;\
-  }\
-  .ace-remixDark .ace_support {\
-  color: #999;\
-  }\
-  .ace-remixDark .ace_support.ace_function {\
-  color:#3fe2a7;\
-  }\
-  .ace-remixDark .ace_function {\
-  color:#3fe2a7;\
-  }\
-  .ace-remixDark .ace_string {\
-  color:#eceeff;\
-  }\
-  .ace-remixDark .ace_comment {\
-  color:#a7a7a7;\
-  font-style:italic;\
-  padding-bottom: 0px;\
-  }\
-  .ace-remixDark .ace_type {\
-  color:#75ceef;\
-  }]\
-  .ace-remixDark .ace_visibility (\
-    color:#f7d777;\
-  )\
-  .ace-remixDark .ace_identifier {\
-    color:#bec1dd;\
-  }\
-  .ace-remixDark .ace_modifier {\
-    color:#efff2f;\
-  }\
-  .ace-remixDark .ace-boolean {\
-    color:#ff86ac;\
-  }\
-  .ace-remixDark .ace_statemutability {\
-    color:#FFCC00;\
-  }\
-  .ace-remixDark .ace_variable {\
-  color:#e0bb83;\
-  }\
-  .ace-remixDark .ace_meta.ace_tag {\
-  color:#BE53E6;\
-  }\
-  .ace-remixDark .ace_entity.ace_other.ace_attribute-name {\
-  color:#4aa8fd;\
-  }\
-  .ace-remixDark .ace_markup.ace_underline {\
-  text-decoration: underline;\
-  }\
-  .ace-remixDark .ace_fold-widget {\
-  text-align: center;\
-  }\
-  .ace-remixDark .ace_fold-widget:hover {\
-  color: #777;\
-  }\
-  .ace-remixDark .ace_fold-widget.ace_start,\
-  .ace-remixDark .ace_fold-widget.ace_end,\
-  .ace-remixDark .ace_fold-widget.ace_closed{\
-  background: none;\
-  border: none;\
-  box-shadow: none;\
-  }\
-  .ace-remixDark .ace_fold-widget.ace_start:after {\
-  content: '▾'\
-  }\
-  .ace-remixDark .ace_fold-widget.ace_end:after {\
-  content: '▴'\
-  }\
-  .ace-remixDark .ace_fold-widget.ace_closed:after {\
-  content: '‣'\
-  }\
-  .ace-remixDark .ace_indent-guide {\
-  border-right:1px dotted #333;\
-  margin-right:-1px;\
-  }\
-  .ace-remixDark .ace_fold { \
-  background: #222; \
-  border-radius: 3px; \
-  color: #7AF; \
-  border: none; \
-  }\
-  .ace-remixDark .ace_fold:hover {\
-  background: #CCC; \
-  color: #000;\
-  }\
-  ";
-  
-  var dom = acequire("../lib/dom");
-  dom.importCssString(exports.cssText, exports.cssClass);
-  
-  });

apps/remix-ide/css/pygment_trac.css~36bc4ab5a5b52c76327ec5b5f7a8896938b18525

@@ -1,69 +0,0 @@
-.highlight  { background: #ffffff; }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: #d14 } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { color: #0086B3 } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #d14 } /* Literal.String.Backtick */
-.highlight .sc { color: #d14 } /* Literal.String.Char */
-.highlight .sd { color: #d14 } /* Literal.String.Doc */
-.highlight .s2 { color: #d14 } /* Literal.String.Double */
-.highlight .se { color: #d14 } /* Literal.String.Escape */
-.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
-.highlight .si { color: #d14 } /* Literal.String.Interpol */
-.highlight .sx { color: #d14 } /* Literal.String.Other */
-.highlight .sr { color: #009926 } /* Literal.String.Regex */
-.highlight .s1 { color: #d14 } /* Literal.String.Single */
-.highlight .ss { color: #990073 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
-
-.type-csharp .highlight .k { color: #0000FF }
-.type-csharp .highlight .kt { color: #0000FF }
-.type-csharp .highlight .nf { color: #000000; font-weight: normal }
-.type-csharp .highlight .nc { color: #2B91AF }
-.type-csharp .highlight .nn { color: #000000 }
-.type-csharp .highlight .s { color: #A31515 }
-.type-csharp .highlight .sc { color: #A31515 }

apps/remix-ide/css/pygment_trac.css~HEAD

@@ -1,69 +0,0 @@
-.highlight  { background: #ffffff; }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: #d14 } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { color: #0086B3 } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #d14 } /* Literal.String.Backtick */
-.highlight .sc { color: #d14 } /* Literal.String.Char */
-.highlight .sd { color: #d14 } /* Literal.String.Doc */
-.highlight .s2 { color: #d14 } /* Literal.String.Double */
-.highlight .se { color: #d14 } /* Literal.String.Escape */
-.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
-.highlight .si { color: #d14 } /* Literal.String.Interpol */
-.highlight .sx { color: #d14 } /* Literal.String.Other */
-.highlight .sr { color: #009926 } /* Literal.String.Regex */
-.highlight .s1 { color: #d14 } /* Literal.String.Single */
-.highlight .ss { color: #990073 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
-
-.type-csharp .highlight .k { color: #0000FF }
-.type-csharp .highlight .kt { color: #0000FF }
-.type-csharp .highlight .nf { color: #000000; font-weight: normal }
-.type-csharp .highlight .nc { color: #2B91AF }
-.type-csharp .highlight .nn { color: #000000 }
-.type-csharp .highlight .s { color: #A31515 }
-.type-csharp .highlight .sc { color: #A31515 }

apps/remix-ide/src/app/editor/editor.js

@@ -22,7 +22,7 @@ require('brace/mode/json')
 require('brace/mode/rust')
 require('brace/theme/chrome') // for all light themes
 require('brace/theme/chaos') // for all dark themes
-require('../../../assets/js/editor/darkTheme') // a custom one for remix 'Dark' theme
+require('../../assets/js/editor/darkTheme') // a custom one for remix 'Dark' theme
 
 const css = csjs`
   .ace-editor {

apps/remix-ide/src/index.html

@@ -29,7 +29,7 @@
 		<meta http-equiv="X-UA-Compatible" content="chrome=1">
 		<title>Remix - Ethereum IDE</title>
 		<link rel="stylesheet" href="assets/css/pygment_trac.css">
-		<link rel="icon" type="x-icon" href="icon.png">
+		<link rel="icon" type="x-icon" href="assets/img/icon.png">
 		<script src="assets/js/browserfs.min.js"></script>
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 	</head>
@@ -88,6 +88,6 @@
 					})
 				}				
 		</script>
-		<script src="runtime.js" type="module"></script><script src="polyfills.js" type="module"></script><script src="styles.js" type="module"></script><script src="vendor.js" type="module"></script>
+		<script src="runtime.js" type="module"></script><script src="polyfills.js" type="module"></script><script src="vendor.js" type="module"></script>
 	</body>
 </html>

workspace.json

@@ -73,7 +73,7 @@
               "apps/remix-ide/build/**/*.js",
               "apps/remix-ide/src/app/editor/mode-solidity.js",
               "apps/remix-ide/soljson.js",
-              "apps/remix-ide/assets/js/**/*.js",
+              "apps/remix-ide/js/**/*.js",
               "apps/remix-ide/src/assets/js/**/*.js"
             ]
           }