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

Conflicts: app/views/layouts/menu.html.erb config/routes.rb
2013-08-13 19:05:26 +02:00
parent c73984e81d d988c22e29
commit c7d63c4c19
94 changed files with 2318 additions and 327 deletions
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -10,7 +10,7 @@
 *
 *= require_self
 *= require_tree .
- *  require 'bootstrap'
+ * require 'bootstrap'
 */
 $linkColor: #03006E;
@import 'bootstrap';
@@ -30,7 +30,8 @@ border-bottom:1px solid black;
 height:60px; 
 padding-left:160px;
 padding-top:0px;
-overflow:hidden
+overflow:hidden;
+margin-bottom: 20px
 }

 #menudiv