diff --git a/assets/img/remix-redesign-white-512w_v0.1.gif b/assets/img/remix-redesign-white-512w_v0.1.gif new file mode 100644 index 0000000000..2bcbba86eb Binary files /dev/null and b/assets/img/remix-redesign-white-512w_v0.1.gif differ diff --git a/src/app/editor/editor.js b/src/app/editor/editor.js index 794f4578ef..e85e856fc0 100644 --- a/src/app/editor/editor.js +++ b/src/app/editor/editor.js @@ -4,6 +4,16 @@ var EventManager = remixLib.EventManager var yo = require('yo-yo') var csjs = require('csjs-inject') var ace = require('brace') + +// var aceCss = editor.setTheme("bace/theme/twilight"); +// require('brace/theme/solarized_dark') +// require('brace/theme/clouds_midnight') +// require('brace/theme/pastel_on_dark') +// require('brace/theme/tomorrow_night') +require('brace/theme/tomorrow_night_blue') +// require('brace/theme/tomorrow_night_eighties') +// require('brace/theme/twilight') + var Range = ace.acequire('ace/range').Range require('brace/ext/language_tools') require('brace/ext/searchbox') @@ -54,6 +64,13 @@ function Editor (opts = {}) { var self = this var el = yo`
` var editor = ace.edit(el) + // editor.setTheme('ace/theme/solarized_dark') + // editor.setTheme('ace/theme/clouds_midnight') + // editor.setTheme('ace/theme/pastel_on_dark') + // editor.setTheme('ace/theme/tomorrow_night') + editor.setTheme('ace/theme/tomorrow_night_blue') + // editor.setTheme('ace/theme/tomorrow_night_eighties') + // editor.setTheme('ace/theme/twilight') ace.acequire('ace/ext/language_tools') editor.setOptions({ enableBasicAutocompletion: true, diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js index b8dcb52d8a..2a6f938083 100755 --- a/src/app/files/file-explorer.js +++ b/src/app/files/file-explorer.js @@ -24,6 +24,9 @@ var css = csjs` font-size : 14px; cursor : pointer; } + .file { + color : ${styles.leftPanel.text_Teriary}; + } .hasFocus { background-color : ${styles.leftPanel.backgroundColor_FileExplorer}; } diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js index 7610715368..ee00bc6b18 100644 --- a/src/app/panels/editor-panel.js +++ b/src/app/panels/editor-panel.js @@ -20,7 +20,7 @@ var cssTabs = yo` display: table-cell; text-align: center; vertical-align: middle; - color: ${styles.editor.text_Secondary}; + color: ${styles.editor.text_Teriary}; } #files .file.active { color: ${styles.editor.text_Primary}; diff --git a/src/app/panels/righthand-panel.js b/src/app/panels/righthand-panel.js index bbfc25a7f4..7ea030cc73 100644 --- a/src/app/panels/righthand-panel.js +++ b/src/app/panels/righthand-panel.js @@ -66,7 +66,7 @@ var css = csjs` color: ${styles.rightPanel.text_Primary}; } .opts_li:hover { - color: ${styles.rightPanel.text_Secondary}; + color: ${styles.rightPanel.icon_HoverColor_TogglePanel}; } .dragbar { position : absolute; diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js index 966eacdab6..7e17b98196 100644 --- a/src/app/panels/terminal.js +++ b/src/app/panels/terminal.js @@ -76,14 +76,14 @@ var css = csjs` } .terminal::after { content : ""; - background-image : url(assets/img/remix_logo_512x512.svg); - opacity : 0.1; + background-image : url(assets/img/remix-redesign-white-512w_v0.1.gif); + opacity : .1; top : 15%; left : 33%; bottom : 0; right : 0; position : absolute; - z-index : -1; + z-index : 1; background-repeat : no-repeat; background-size : 45%; } @@ -101,13 +101,17 @@ var css = csjs` .cli { line-height : 1.7em; font-family : monospace; + background-color : ${styles.terminal.backgroundColor_TerminalCLI}; + padding : .4em; + color : ${styles.appProperties.mainText_Color}; + border-top : solid 2px ${styles.terminal.bar_Ghost}; } .prompt { margin-right : 0.5em; font-family : monospace; font-weight : bold; font-size : large; - color : ${styles.colors.black}; + color : ${styles.appProperties.supportText_OppositeColor}; } .input { word-break : break-all; diff --git a/src/universal-dapp.js b/src/universal-dapp.js index f7da8f5174..95e3121a8e 100644 --- a/src/universal-dapp.js +++ b/src/universal-dapp.js @@ -28,8 +28,7 @@ var css = csjs` align-items: center; } .title { - ${styles.rightPanel.runTab.dropdown_RunTab} - margin-top: 5px; + ${styles.rightPanel.runTab.titlebox_RunTab} display: flex; justify-content: end; align-items: center; @@ -50,6 +49,10 @@ var css = csjs` word-break: break-word; min-width: 230px; } + + .title .copy { + color: ${styles.rightPanel.runTab.icon_AltColor_Instance_CopyToClipboard}; + } .instance { ${styles.rightPanel.runTab.box_Instance} margin-bottom: 10px; @@ -114,11 +117,11 @@ var css = csjs` border-color: lightgray; } .call { - background-color: ${styles.colors.lightRed}; - border-color: ${styles.colors.lightRed}; + background-color: ${styles.colors.blueFairyDust}; + border-color: ${styles.colors.blueFairyDust}; } .constant .call { - background-color: ${styles.colors.lightBlue}; + background-color: ${styles.colors.blueMascara}; border-color: ${styles.colors.lightBlue}; width: 25%; outline: none; @@ -135,7 +138,7 @@ var css = csjs` box-sizing: border-box; float: left; align-self: center; - color: ${styles.colors.grey}; + color: ${styles.colors.black}; } .hasArgs input { display: block;