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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 6cbbf1a27afb3000b991fe6691a626248f2142fc..e0082a26aa0cf354564bfb1e734e740b00a88f9b 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -11,9 +11,16 @@ $vibrant-green: #76c551;
 $grey: #CCC;
 $lightgrey: #EEE;
 $darkgrey: #888;
 $grey: #CCC;
 $lightgrey: #EEE;
 $darkgrey: #888;

-$hovercolor: 20%;

 $headerHeight: 55px;
 $sidebarWidth: 350px;
 $headerHeight: 55px;
 $sidebarWidth: 350px;

-$keyline: 1px solid $lightgrey;

 $list-highlight: #FFFFC0;
 $border: 1px solid $grey;
 $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;