Moving colors in variables.scss to colors.scss

- Fixed the conflicting red color
- Currently using the darker red

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);

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