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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index d1d3db5735ebf432d1d605df3daed76c8039f93e..2054649776c8b50d146e35da3b0987b275be6f4a 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -11,10 +11,15 @@ $vibrant-green: #76c551;
 $grey: #CCC;
 $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;