From 350371f79d07600cc1efe2d83cee50f0c0cf83c3 Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Tue, 7 Jan 2020 23:58:25 -0800
Subject: [PATCH] Tweak CSS, fix loding order

---
 app/assets/stylesheets/osem-splash.scss   | 14 +++++++++++---
 app/assets/stylesheets/osem.scss          |  2 +-
 app/controllers/conferences_controller.rb |  2 +-
 app/views/conferences/_lodging.haml       |  2 +-
 app/views/conferences/_tickets.haml       |  7 ++++---
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss
index a1c29c0c..40b4b5c1 100644
--- a/app/assets/stylesheets/osem-splash.scss
+++ b/app/assets/stylesheets/osem-splash.scss
@@ -9,12 +9,12 @@
   }
 
   section:nth-child(even) {
-    background: none repeat scroll 0 0 #e0e0e0;
-    color: #555;
+    background: none repeat scroll 0 0 #eee;
+    color: #333;
   }
   section:nth-child(odd) {
     background: none repeat scroll 0 0 #ffffff;
-    color: #7b7b7b;
+    color: #333;
     .thumbnail {
       background: none repeat scroll 0 0 #e0e0e0;
     }
@@ -93,6 +93,14 @@
     }
   }
 
+  #tickets {
+    a {
+      &:hover, &:focus {
+        text-decoration: none;
+      }
+    }
+  }
+
   #sponsors {
     .img-sponsor {
       max-height: 100px;
diff --git a/app/assets/stylesheets/osem.scss b/app/assets/stylesheets/osem.scss
index 55632cec..65598add 100644
--- a/app/assets/stylesheets/osem.scss
+++ b/app/assets/stylesheets/osem.scss
@@ -14,7 +14,7 @@ body {
 }
 
 #content {
-  padding-bottom: 45px;
+  padding-bottom: 60px;
 }
 
 #footer {
diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index 035ab366..21c5045f 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -54,7 +54,7 @@ class ConferencesController < ApplicationController
       @tickets = @conference.tickets.order('price_cents')
     end
     if splashpage.include_lodgings
-      @lodgings = @conference.lodgings.order('name')
+      @lodgings = @conference.lodgings.order('id')
     end
     if splashpage.include_sponsors
       @sponsorship_levels = @conference.sponsorship_levels.eager_load(
diff --git a/app/views/conferences/_lodging.haml b/app/views/conferences/_lodging.haml
index 7306b962..4253b2e1 100644
--- a/app/views/conferences/_lodging.haml
+++ b/app/views/conferences/_lodging.haml
@@ -16,7 +16,7 @@
             We recommend the following accommodations for your visit.
 
       .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
             .thumbnail
               - if lodging.picture?
diff --git a/app/views/conferences/_tickets.haml b/app/views/conferences/_tickets.haml
index 5f0da517..d1900f1e 100644
--- a/app/views/conferences/_tickets.haml
+++ b/app/views/conferences/_tickets.haml
@@ -7,9 +7,10 @@
     .container
       .row
         .col-md-12.text-center
-          %h2
-            Support
-            = conference.title
+          %h3 Sign Up for Campus Housing
+          -# %h2
+          -#   Support
+          -#   = conference.title
       .row.row-centered
         - tickets.each do |ticket|
           .col-md-3.col-sm-3.col-centered.col-top