diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss index 76ac08024cb68a249adbd2cfc485d1d6bdd6155d..8c97e4db565569f00b92ec1c45eb06d9a090e632 100644 --- a/app/assets/stylesheets/colors.css.scss +++ b/app/assets/stylesheets/colors.css.scss @@ -17,10 +17,20 @@ $text-dark-grey: #666666; $white: white; $black: black; -$red: #A80000; $green: #8EDE3D; $blue: #3F8FBA; $dark-blue: darken(#0984C8,10%); $creation-blue: #0097FF; +// merged from variables.scss +/* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */ +$cyan : rgb(8,204,249); +$yellow : rgb(242,244,9); +$green : rgb(29,235,134); +$purple : rgb(220,23,166); +$lime-green : rgb(143, 199,10); +$orange : rgb(237, 165, 13); +$red: #A80000; +$turquoise : rgb(8, 224, 173); +$sand : rgb(245, 239, 237); diff --git a/app/assets/stylesheets/new_styles/_variables.scss b/app/assets/stylesheets/new_styles/_variables.scss index 3948566d695e5c9abd0f1985d5cb3bdfa4acfb63..a53110274a1cfe0db8e007e1a17238fc45c95c2a 100644 --- a/app/assets/stylesheets/new_styles/_variables.scss +++ b/app/assets/stylesheets/new_styles/_variables.scss @@ -9,14 +9,3 @@ $margin-between-rows : 20; $row-height : $column-width; $two-row-height : $raw-two-column-width - 20; - -/* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */ -$cyan : rgb(8,204,249); -$yellow : rgb(242,244,9); -$green : rgb(29,235,134); -$purple : rgb(220,23,166); -$lime-green : rgb(143, 199,10); -$orange : rgb(237, 165, 13); -$red : rgb(246, 68, 60); -$turquoise : rgb(8, 224, 173); -$sand : rgb(245, 239, 237); \ No newline at end of file