From 247c9c675a72a86e9f08ed7f530798077c44a2a2 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 14 Feb 2013 00:41:16 +0100 Subject: [PATCH] anderes Farbschema --- app/assets/stylesheets/application.css.scss | 4 ++-- app/views/layouts/application.html.erb | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 7dc9389..4005f4b 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -12,7 +12,7 @@ *= require_tree . * require 'bootstrap' */ - +$linkColor: #03006E; @import 'bootstrap'; @import 'bootstrap-responsive'; h1 @@ -24,7 +24,7 @@ body,html div.header {display: block; -background: url('/assets/fet_logo_2.png') rgb(200,200,200) no-repeat; +background: url('/assets/fet_logo_3.png') rgb(129,97,51) no-repeat; background-position:15px center; height:60px; padding-left:160px; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7979db7..b56b1bd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,12 +2,14 @@ Fetsite - <%= stylesheet_link_tag "application", :media => "all" %> + <%= stylesheet_link_tag "application", :media => "all" %> + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> +

Fachschaft Elektrotechnik