nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4541 from ssrihari/merge-variables-to-colors

Browse source 
Moving colors in variables.scss to colors.scss
This commit is contained in:
Jonne Haß 2013-09-22 04:31:10 -07:00
commit 141fc814ba
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/colors.css.scss
View file

@ -17,10 +17,19 @@ $text-dark-grey: #666666;
$white: white; $white: white;
$black: black; $black: black;
$red: #A80000;
$green: #8EDE3D; $green: #8EDE3D;
$blue: #3F8FBA; $blue: #3F8FBA;
$dark-blue: darken(#0984C8,10%); $dark-blue: darken(#0984C8,10%);
$creation-blue: #0097FF; $creation-blue: #0097FF;
/* 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);

11
app/assets/stylesheets/new_styles/_variables.scss
View file

@ -9,14 +9,3 @@ $margin-between-rows : 20;
$row-height : $column-width; $row-height : $column-width;
$two-row-height : $raw-two-column-width - 20; $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);