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

2013-09-26 10:29:18 +02:00
parent 202910e185 1daf392997
commit 1f3be74256
1 changed files with 2 additions and 2 deletions
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -36,7 +36,7 @@ $navbarLinkBackgroundHover:#FFBE00;
 $navbarLinkBackgroundHover: lighten(#CCCCCC,30%);
 $infoBackground:#65A5D1;
 $infoText:#03406A;
-$sansFontFamiliy: Helvetica, Arial;
+$sansFontFamily: Helvetica, Arial;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';
@@ -126,4 +126,4 @@ margin-bottom:10px;
 }
 ul.linkbox-list
 { max-width:70em;
-}
+}