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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 989444a62d77999c5f96dfa5b935122833623250..5d02604103684a8b830c53fe7a9157ef713e470a 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,12 +2,12 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
 $lineheight: 20px;
 $typeheight: 14px;
 

-$offwhite: #f4f4ff;
+$offwhite: #f8f8ff;

 $blue: #7092FF;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;
 $blue: #7092FF;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;

+$vibrant-green: #76c551;

 $grey: #CCC;
 $grey: #CCC;

-$red: red;

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


@@ -15,4 +15,5 @@ $headerHeight: 55px;
 $sidebarWidth: 350px;
 $keyline: 1px solid $lightgrey;
 $border-radius: 3px;
 $sidebarWidth: 350px;
 $keyline: 1px solid $lightgrey;
 $border-radius: 3px;

-$list-highlight: #FFFFE6;
+$list-highlight: #FFFFC0;
+$border: 1px solid $grey;