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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index b26b29105b0c2af83197b790f1cf3d45dd6c0fa2..4b5daf4d01d8cd91bd6adf56fd778265e8bcec5e 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,16 +2,27 @@
 $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%;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $keyline: 1px solid $lightgrey;
 $lightgrey: #EEE;
 $darkgrey: #888;
 $hovercolor: 20%;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $keyline: 1px solid $lightgrey;

-$border-radius: 3px;
+$list-highlight: #FFFFC0;
+$border: 1px solid $grey;
+
+$link-color: #24d;
+$link-hover-color: #24d;
+$link-decoration: none;
+$link-hover-decoration: underline;
+
+$table-striped-bg: $offwhite;
+
+$enable-negative-margins: true;