Merge branch 'master' of https://github.com/andreassteph/fetsite into andi_spinnt

2015-02-25 10:37:12 +01:00
parent d91a150d51 2ab6be038f
commit 710ef968dc
60 changed files with 585 additions and 210 deletions
--- a/app/assets/stylesheets/themes/blue2/application.css.scss
+++ b/app/assets/stylesheets/themes/blue2/application.css.scss
@@ -126,6 +126,6 @@ $box-background: white;

@import 'extra';
 body {
-background: url('http://www.fet.at/stvn.jpg') fixed no-repeat;
+background: $color_schema_1_dark;
 background-size:100%;
 }