From b7f8f151a5cb6aa94e13dde76b70c263b40f4c6b Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Mon, 2 Oct 2017 05:13:58 +0100 Subject: [PATCH] Start adding styleguide to csjs --- src/ui/styles/style-guide.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/ui/styles/style-guide.js b/src/ui/styles/style-guide.js index b2fdaa05ab..9a4383f04c 100644 --- a/src/ui/styles/style-guide.js +++ b/src/ui/styles/style-guide.js @@ -71,9 +71,10 @@ function styleGuide () { /******************************************************** BACKGROUND COLORS ******************************************************** */ - primary_BackgroundColor: css_properties.colors.white, - secondary_BackgroundColor: css_properties.colors.backgroundBlue, + primary_BackgroundColor: css_properties.colors.red, + secondary_BackgroundColor: css_properties.colors.blue, dark_BackgroundColor: css_properties.colors.veryLightGrey, + light_BackgroundColor: css_properties.colors.white, /******************************************************** RESIZING @@ -117,7 +118,7 @@ function styleGuide () { DROPDOWN ******************************************************** */ dropdown_TextColor: css_properties.colors.black, - dropdown_BackgroundColor: css_properties.colors.white, + dropdown_BackgroundColor: css_properties.colors.violet, dropdown_BorderColor: css_properties.colors.veryLightGrey, /******************************************************** @@ -219,7 +220,7 @@ function styleGuide () { `, dottedBorderBox: (opts = {}) => ` - background-color : ${opts.BackgroundColor}}; + background-color : ${opts.BackgroundColor}; border : .2em dotted ${opts.BorderColor}; color : ${opts.Color}; border-radius : ${css_properties.borders.secondary_borderRadius}; @@ -230,9 +231,9 @@ function styleGuide () { word-break : break-word; `, - inputField: (opts = {}) =>` - background-color : ${opts.BackgroundColor}}; - border : .2em dotted ${opts.BorderColor}; + inputField: (opts = {}) => ` + background-color : ${opts.BackgroundColor}; + border : 1px solid ${opts.BorderColor}; color : ${opts.Color}; border-radius : ${css_properties.borders.secondary_borderRadius}; height : 25px; @@ -243,7 +244,7 @@ function styleGuide () { `, dropdown: (opts = {}) => ` - background-color : ${opts.BackgroundColor}}; + background-color : ${opts.BackgroundColor}; border : 1px solid ${opts.BorderColor}; color : ${opts.Color}; font-size : 12px; @@ -321,10 +322,12 @@ var remix_properties = { editor: { backgroundColor_Panel: app_properties.primary_BackgroundColor, + backgroundColor_Editor: app_properties.light_BackgroundColor, backgroundColor_Tabs_Highlights: app_properties.secondary_BackgroundColor, - backgroundColor_DebuggerMode: app_properties.secondary_BackgroundColor, + backgroundColor_DebuggerMode: app_properties.warning_BackgroundColor, text_Primary: app_properties.mainText_Color, + text_Secondary: app_properties.supportText_Color, text_Editor: '', icon_Color_Editor: app_properties.icon_Color, @@ -694,11 +697,14 @@ var elementColors = { return { colors: css_properties.colors, + borders: css_properties.borders, leftPanel: remix_properties.leftPanel, editor: remix_properties.editor, terminal: remix_properties.terminal, rightPanel: remix_properties.rightPanel, + app_properties: app_properties, + elementColors: elementColors, dropdown: uiElements['dropdown'], button: uiElements['button'],