From 7553c15e5e3cec25fa359a1d83c732031d50afce Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Tue, 7 Jan 2020 16:06:51 -0800 Subject: [PATCH] CSS tweaks... --- app/assets/stylesheets/osem.scss | 3 ++- app/views/conferences/_header.haml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/osem.scss b/app/assets/stylesheets/osem.scss index c48be11d..55632cec 100644 --- a/app/assets/stylesheets/osem.scss +++ b/app/assets/stylesheets/osem.scss @@ -7,9 +7,10 @@ html { body { /* Margin bottom by 2 times the footer height */ - margin-bottom: 60px; + margin-bottom: 85px; /* Margin bottom by navbar height */ padding-top: 60px; + font-size: 16px; } #content { diff --git a/app/views/conferences/_header.haml b/app/views/conferences/_header.haml index 23d6b4eb..cb45bb5e 100644 --- a/app/views/conferences/_header.haml +++ b/app/views/conferences/_header.haml @@ -2,14 +2,14 @@ #banner{ style: ("background-image: url(#{conference.picture_url})" if conference.picture_url) } .container .row - .col-md-8.col-md-offset-2#header + .col-md-6.col-md-offset-3#header .row -# - if conference.picture? -# .col-md-4 -# = image_tag(conference.picture_url, -# class: 'img-responsive img-center', -# id: 'splash-logo') - .col-md-8.col-md-offset-2 + .col-md-8 %h1 = conference.title.html_safe %h3