Merge master with css changes

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

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 3ccb23c74e88375c3d23164cd7cdd3fab89cc874..4b5daf4d01d8cd91bd6adf56fd778265e8bcec5e 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -18,4 +18,11 @@ $keyline: 1px solid $lightgrey;
 $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;