From 7057d4d57392624a5fd1de3fac1f481d25a56c73 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 10 Sep 2013 11:01:02 +0200
Subject: [PATCH] fet logo

---
 app/assets/images/fet_icon_small.png        | Bin 0 -> 2327 bytes
 app/assets/stylesheets/application.css.scss |  15 ++++++++++-----
 app/views/home/index.html.erb               |   2 +-
 app/views/layouts/application.html.erb      |   2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/images/fet_icon_small.png

diff --git a/app/assets/images/fet_icon_small.png b/app/assets/images/fet_icon_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5f441436ca369a1c19facb2efe4e3c2439005d1
GIT binary patch
literal 2327
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

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 25ee93f..ebdf98f 100755
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -60,18 +60,23 @@ a:hover {
 
 div.header { 
   display: block; 
-  background: url('/assets/fet_logo_2.png') no-repeat;
+  background: url('/assets/fet_icon_small.png') no-repeat;
   background-color: #0A64A4;
   background-position:15px center; 
   border-bottom:1px solid black; 
-  height:60px; 
-  color:#CFCFCF;
-  padding-left:160px;
+  height:72px; 
+  color:#C0C0C0;
+  padding-left:87px;
   padding-top:0px;
   overflow:hidden;
   margin-bottom: 20px
 }
-
+div.header h1 {
+padding:0;
+margin:4px;
+font-size:23px;
+line-height:32px;
+}
 #menudiv { 
   width:100%;
 }
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 77aef52..e0ca70c 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -21,7 +21,7 @@ Folgene Features sind schon soweit, dass Bugreports und Feature Requests sinnvol
 </ul>
 alle anderen sind nur zur Voransicht. Bezüglich Design und Steuerung sind Vorschläge erwünscht.
 </p>
-<p><%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %></p>
+<p><%= link_to "Steuerelemente und Komponenten", "http://getbootst<rap.com/2.3.2/index.html" %></p>
 <p>Um bei der Entwicklung mitzuhelfen braucht nur Ruby on Rails installiert werden</p>
 <p><%= link_to "Getting Started" , home_startdev_path%></p>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b537ea0..4d5d30c 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,7 +18,7 @@
   <div id="maincontainer" class="container-fluid">
     <div class="row-fluid">
 	<div class="header">
-	  <h1 style="display:block">Fachschaft Elektrotechnik</h1>
+	  <h1 style="display:block">Fachschaft<br> Elektrotechnik</h1>
 	</div>
     </div>
     <div class="row-fluid">