From c379fb351e13baef5b5472c127c20b5b2f385664 Mon Sep 17 00:00:00 2001
From: Srihari Sriraman <srihari@c42.in>
Date: Mon, 23 Sep 2013 09:15:32 +0530
Subject: [PATCH] Removing the conflicting green in colors

- This was a regression from pull request #4541
- Moved the red color to the section above to separate it from the rgb
  colors that aren't used
---
 app/assets/stylesheets/colors.css.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss
index 7c9c086cb..4fd10ecf1 100644
--- a/app/assets/stylesheets/colors.css.scss
+++ b/app/assets/stylesheets/colors.css.scss
@@ -18,7 +18,7 @@ $text-dark-grey: #666666;
 $white: white;
 $black: black;
 $green: #8EDE3D;
-
+$red: #A80000;
 $blue: #3F8FBA;
 $dark-blue: darken(#0984C8,10%);
 $creation-blue: #0097FF;
@@ -26,10 +26,8 @@ $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);