Merge branch 'master' into feature/add-communities-page

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 2e3651aca1cb5f3d2b03175271219da11388927a..d1d3db5735ebf432d1d605df3daed76c8039f93e 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,16 +2,19 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
 $lineheight: 20px;
 $typeheight: 14px;
 

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

 $blue: #7092FF;
 $blue: #7092FF;

+$secondary: #888;

 $lightblue: #B8C5F0;
 $green: #7ebc6f;
 $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%;

-$headerHeight: 54px;
-$sidebarWidth: 300px;
+$headerHeight: 55px;
+$sidebarWidth: 350px;

 $keyline: 1px solid $lightgrey;
 $border-radius: 3px;
 $keyline: 1px solid $lightgrey;
 $border-radius: 3px;

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