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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 989444a62d77999c5f96dfa5b935122833623250..3d66db5fbe65cb013289a6b61d6d60978794386f 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -2,17 +2,21 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
-$offwhite: #f4f4ff;
 $blue: #7092FF;
+$secondary: #888;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;
+$vibrant-green: #76c551;
 $grey: #CCC;
-$red: red;
 $lightgrey: #EEE;
 $darkgrey: #888;
-$hovercolor: 20%;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
-$keyline: 1px solid $lightgrey;
-$border-radius: 3px;
-$list-highlight: #FFFFE6;
+$list-highlight: #FFFFC0;
+
+$link-color: #24d;
+$link-hover-color: #24d;
+$link-decoration: none;
+$link-hover-decoration: underline;
+
+$enable-negative-margins: true;