Merge remote-tracking branch 'upstream/pull/3357'

[rails.git] / app / assets / stylesheets / parameters.scss

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 90fbd74b7d035c65530e1f66dd15427d5f751bc4..d1d3db5735ebf432d1d605df3daed76c8039f93e 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -4,11 +4,11 @@ $typeheight: 14px;
 
 $offwhite: #f8f8ff;
 $blue: #7092FF;
 
 $offwhite: #f8f8ff;
 $blue: #7092FF;

+$secondary: #888;

 $lightblue: #B8C5F0;
 $green: #7ebc6f;
 $vibrant-green: #76c551;
 $grey: #CCC;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;
 $vibrant-green: #76c551;
 $grey: #CCC;

-$red: red;

 $lightgrey: #EEE;
 $darkgrey: #888;
 $hovercolor: 20%;
 $lightgrey: #EEE;
 $darkgrey: #888;
 $hovercolor: 20%;