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

This commit is contained in:
Andreas Stephanides
2013-09-26 10:29:18 +02:00

View File

@@ -36,7 +36,7 @@ $navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: lighten(#CCCCCC,30%); $navbarLinkBackgroundHover: lighten(#CCCCCC,30%);
$infoBackground:#65A5D1; $infoBackground:#65A5D1;
$infoText:#03406A; $infoText:#03406A;
$sansFontFamiliy: Helvetica, Arial; $sansFontFamily: Helvetica, Arial;
@import 'bootstrap'; @import 'bootstrap';
@import 'bootstrap-responsive'; @import 'bootstrap-responsive';
@import 'bootstrap/image-gallery'; @import 'bootstrap/image-gallery';
@@ -126,4 +126,4 @@ margin-bottom:10px;
} }
ul.linkbox-list ul.linkbox-list
{ max-width:70em; { max-width:70em;
} }