bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed margins on home page

Browse Source
This commit is contained in:
Godwin 2016-06-03 21:59:28 -07:00
parent 792823ecae
commit e127258b39
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/_application.scss
View File

@ -916,6 +916,7 @@ ul.warnings li,
article { article {
padding: rems(2.5) 0; padding: rems(2.5) 0;
margin: 0 1em;
&.supplementary { &.supplementary {
margin: rems(1) 7.5%; margin: rems(1) 7.5%;

43
app/views/application/home.html.haml
View File

@ -1,24 +1,25 @@
- this_is_the_front_page - this_is_the_front_page
- if @conference - if @conference
= render 'conferences/header' = render 'conferences/header'
= row do %article
= columns(tag: :article) do = row do
%h2=_!@conference.title = columns(medium: 10, push: {medium: 1}) do
= @conference.info.html_safe %h2=_!@conference.title
- if @conference.workshops = @conference.info.html_safe
- if @schedule - if @conference.workshops
%h3=_'articles.workshops.headings.Schedule' - if @schedule
= render 'schedule/programme', :schedule => @schedule, :conference => @conference, :workshops => @workshops, :events => @events, :locations => @locations, :show_interest => true, :day_parts => @day_parts, :show_previews => true %h3=_'articles.workshops.headings.Schedule'
- if @conference.registration_status == :open = render 'schedule/programme', :schedule => @schedule, :conference => @conference, :workshops => @workshops, :events => @events, :locations => @locations, :show_interest => true, :day_parts => @day_parts, :show_previews => true
%h3=_'articles.workshops.headings.Proposed_Workshops' - if @conference.registration_status == :open
%p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process." %h3=_'articles.workshops.headings.Proposed_Workshops'
%ul.workshop-list %p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process."
- @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w| %ul.workshop-list
%li - @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w|
%h4=w.title %li
.workshop-interest %h4=w.title
- if w.interested?(current_user) .workshop-interest
=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)} - if w.interested?(current_user)
- elsif w.interested_count > 0 =_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count} - elsif w.interested_count > 0
.workshop-description=markdown w.info =_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
.workshop-description=markdown w.info