Commit 6069f338 authored by Rob Stupay's avatar Rob Stupay Committed by yann300

update of colors for metropolis v.01

parent 6884d6dc
...@@ -4,6 +4,16 @@ var EventManager = remixLib.EventManager ...@@ -4,6 +4,16 @@ var EventManager = remixLib.EventManager
var yo = require('yo-yo') var yo = require('yo-yo')
var csjs = require('csjs-inject') var csjs = require('csjs-inject')
var ace = require('brace') 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 var Range = ace.acequire('ace/range').Range
require('brace/ext/language_tools') require('brace/ext/language_tools')
require('brace/ext/searchbox') require('brace/ext/searchbox')
...@@ -54,6 +64,13 @@ function Editor (opts = {}) { ...@@ -54,6 +64,13 @@ function Editor (opts = {}) {
var self = this var self = this
var el = yo`<div id="input"></div>` var el = yo`<div id="input"></div>`
var editor = ace.edit(el) 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') ace.acequire('ace/ext/language_tools')
editor.setOptions({ editor.setOptions({
enableBasicAutocompletion: true, enableBasicAutocompletion: true,
......
...@@ -24,6 +24,9 @@ var css = csjs` ...@@ -24,6 +24,9 @@ var css = csjs`
font-size : 14px; font-size : 14px;
cursor : pointer; cursor : pointer;
} }
.file {
color : ${styles.leftPanel.text_Teriary};
}
.hasFocus { .hasFocus {
background-color : ${styles.leftPanel.backgroundColor_FileExplorer}; background-color : ${styles.leftPanel.backgroundColor_FileExplorer};
} }
......
...@@ -20,7 +20,7 @@ var cssTabs = yo` ...@@ -20,7 +20,7 @@ var cssTabs = yo`
display: table-cell; display: table-cell;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
color: ${styles.editor.text_Secondary}; color: ${styles.editor.text_Teriary};
} }
#files .file.active { #files .file.active {
color: ${styles.editor.text_Primary}; color: ${styles.editor.text_Primary};
......
...@@ -66,7 +66,7 @@ var css = csjs` ...@@ -66,7 +66,7 @@ var css = csjs`
color: ${styles.rightPanel.text_Primary}; color: ${styles.rightPanel.text_Primary};
} }
.opts_li:hover { .opts_li:hover {
color: ${styles.rightPanel.text_Secondary}; color: ${styles.rightPanel.icon_HoverColor_TogglePanel};
} }
.dragbar { .dragbar {
position : absolute; position : absolute;
......
...@@ -76,14 +76,14 @@ var css = csjs` ...@@ -76,14 +76,14 @@ var css = csjs`
} }
.terminal::after { .terminal::after {
content : ""; content : "";
background-image : url(assets/img/remix_logo_512x512.svg); background-image : url(assets/img/remix-redesign-white-512w_v0.1.gif);
opacity : 0.1; opacity : .1;
top : 15%; top : 15%;
left : 33%; left : 33%;
bottom : 0; bottom : 0;
right : 0; right : 0;
position : absolute; position : absolute;
z-index : -1; z-index : 1;
background-repeat : no-repeat; background-repeat : no-repeat;
background-size : 45%; background-size : 45%;
} }
...@@ -101,13 +101,17 @@ var css = csjs` ...@@ -101,13 +101,17 @@ var css = csjs`
.cli { .cli {
line-height : 1.7em; line-height : 1.7em;
font-family : monospace; 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 { .prompt {
margin-right : 0.5em; margin-right : 0.5em;
font-family : monospace; font-family : monospace;
font-weight : bold; font-weight : bold;
font-size : large; font-size : large;
color : ${styles.colors.black}; color : ${styles.appProperties.supportText_OppositeColor};
} }
.input { .input {
word-break : break-all; word-break : break-all;
......
...@@ -28,8 +28,7 @@ var css = csjs` ...@@ -28,8 +28,7 @@ var css = csjs`
align-items: center; align-items: center;
} }
.title { .title {
${styles.rightPanel.runTab.dropdown_RunTab} ${styles.rightPanel.runTab.titlebox_RunTab}
margin-top: 5px;
display: flex; display: flex;
justify-content: end; justify-content: end;
align-items: center; align-items: center;
...@@ -50,6 +49,10 @@ var css = csjs` ...@@ -50,6 +49,10 @@ var css = csjs`
word-break: break-word; word-break: break-word;
min-width: 230px; min-width: 230px;
} }
.title .copy {
color: ${styles.rightPanel.runTab.icon_AltColor_Instance_CopyToClipboard};
}
.instance { .instance {
${styles.rightPanel.runTab.box_Instance} ${styles.rightPanel.runTab.box_Instance}
margin-bottom: 10px; margin-bottom: 10px;
...@@ -114,11 +117,11 @@ var css = csjs` ...@@ -114,11 +117,11 @@ var css = csjs`
border-color: lightgray; border-color: lightgray;
} }
.call { .call {
background-color: ${styles.colors.lightRed}; background-color: ${styles.colors.blueFairyDust};
border-color: ${styles.colors.lightRed}; border-color: ${styles.colors.blueFairyDust};
} }
.constant .call { .constant .call {
background-color: ${styles.colors.lightBlue}; background-color: ${styles.colors.blueMascara};
border-color: ${styles.colors.lightBlue}; border-color: ${styles.colors.lightBlue};
width: 25%; width: 25%;
outline: none; outline: none;
...@@ -135,7 +138,7 @@ var css = csjs` ...@@ -135,7 +138,7 @@ var css = csjs`
box-sizing: border-box; box-sizing: border-box;
float: left; float: left;
align-self: center; align-self: center;
color: ${styles.colors.grey}; color: ${styles.colors.black};
} }
.hasArgs input { .hasArgs input {
display: block; display: block;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment