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

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 4b5daf4d01d8cd91bd6adf56fd778265e8bcec5e..e6c15a92014f8afc10fd25b7e61a2b202ee39dd7 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -11,18 +11,13 @@ $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;
 $list-highlight: #FFFFC0;

-$border: 1px solid $grey;

 
 $link-color: #24d;
 $link-hover-color: #24d;
 $link-decoration: none;
 $link-hover-decoration: underline;
 
 
 $link-color: #24d;
 $link-hover-color: #24d;
 $link-decoration: none;
 $link-hover-decoration: underline;
 

-$table-striped-bg: $offwhite;
-

 $enable-negative-margins: true;
 $enable-negative-margins: true;