Tweak CSS, fix loding order
This commit is contained in:
parent
722bd8c008
commit
350371f79d
5 changed files with 18 additions and 9 deletions
|
|
@ -9,12 +9,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
section:nth-child(even) {
|
section:nth-child(even) {
|
||||||
background: none repeat scroll 0 0 #e0e0e0;
|
background: none repeat scroll 0 0 #eee;
|
||||||
color: #555;
|
color: #333;
|
||||||
}
|
}
|
||||||
section:nth-child(odd) {
|
section:nth-child(odd) {
|
||||||
background: none repeat scroll 0 0 #ffffff;
|
background: none repeat scroll 0 0 #ffffff;
|
||||||
color: #7b7b7b;
|
color: #333;
|
||||||
.thumbnail {
|
.thumbnail {
|
||||||
background: none repeat scroll 0 0 #e0e0e0;
|
background: none repeat scroll 0 0 #e0e0e0;
|
||||||
}
|
}
|
||||||
|
|
@ -93,6 +93,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#tickets {
|
||||||
|
a {
|
||||||
|
&:hover, &:focus {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#sponsors {
|
#sponsors {
|
||||||
.img-sponsor {
|
.img-sponsor {
|
||||||
max-height: 100px;
|
max-height: 100px;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
#content {
|
#content {
|
||||||
padding-bottom: 45px;
|
padding-bottom: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#footer {
|
#footer {
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ class ConferencesController < ApplicationController
|
||||||
@tickets = @conference.tickets.order('price_cents')
|
@tickets = @conference.tickets.order('price_cents')
|
||||||
end
|
end
|
||||||
if splashpage.include_lodgings
|
if splashpage.include_lodgings
|
||||||
@lodgings = @conference.lodgings.order('name')
|
@lodgings = @conference.lodgings.order('id')
|
||||||
end
|
end
|
||||||
if splashpage.include_sponsors
|
if splashpage.include_sponsors
|
||||||
@sponsorship_levels = @conference.sponsorship_levels.eager_load(
|
@sponsorship_levels = @conference.sponsorship_levels.eager_load(
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
We recommend the following accommodations for your visit.
|
We recommend the following accommodations for your visit.
|
||||||
|
|
||||||
.row.row-centered
|
.row.row-centered
|
||||||
- lodgings.order(created_at: :asc).each do |lodging|
|
- lodgings.each do |lodging|
|
||||||
.col-md-6.col-sm-4.col-centered.col-top
|
.col-md-6.col-sm-4.col-centered.col-top
|
||||||
.thumbnail
|
.thumbnail
|
||||||
- if lodging.picture?
|
- if lodging.picture?
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,10 @@
|
||||||
.container
|
.container
|
||||||
.row
|
.row
|
||||||
.col-md-12.text-center
|
.col-md-12.text-center
|
||||||
%h2
|
%h3 Sign Up for Campus Housing
|
||||||
Support
|
-# %h2
|
||||||
= conference.title
|
-# Support
|
||||||
|
-# = conference.title
|
||||||
.row.row-centered
|
.row.row-centered
|
||||||
- tickets.each do |ticket|
|
- tickets.each do |ticket|
|
||||||
.col-md-3.col-sm-3.col-centered.col-top
|
.col-md-3.col-sm-3.col-centered.col-top
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue