Merge pull request #25 from snap-cloud/tweaks

Tweaks

app/assets/stylesheets/osem-navbar.scss

@@ -1,5 +1,5 @@
 @import "breakpoints.scss";
-$navbar-default-link-color: #FFF;
+@import "osem-variables.scss";
 
 .nav-osem {
     border: none;
@@ -46,4 +46,8 @@ $navbar-default-link-color: #FFF;
         margin-top: -5px;
         max-height: 100%;
     }
+
+    .trapezoid {
+        border-top-color: $navbar-default-bg;
+    }
 }

app/assets/stylesheets/osem-schedule.scss

@@ -64,7 +64,6 @@
 
 #schedule td.event {
     background-image: linear-gradient(to top, rgb(247,250,242) 24%, rgb(194,232,190) 97%, rgb(194,232,190) 100%);
-
     cursor: pointer;
     padding: 3px 2px;
 }

app/assets/stylesheets/osem-splash.scss

@@ -1,4 +1,5 @@
 @import "breakpoints.scss";
+@import "osem-variables.scss";
 
 #splash {
   // Counter the general padding for #content
@@ -6,11 +7,19 @@
   section {
     padding-top: 60px;
     padding-bottom: 60px;
+
+    .trapezoid {
+      top: 60px + $trapezoid-height;
+    }
   }
 
   section:nth-child(even) {
     background: none repeat scroll 0 0 #eee;
     color: #333;
+
+    .trapezoid {
+      border-top-color: #eee;
+    }
   }
   section:nth-child(odd) {
     background: none repeat scroll 0 0 #ffffff;
@@ -18,6 +27,10 @@
     .thumbnail {
       background: none repeat scroll 0 0 #e0e0e0;
     }
+
+    .trapezoid {
+      border-top-color: #fff;
+    }
   }
 
   .cta-button {
@@ -40,7 +53,6 @@
 
       #header-image {
         color: #FFF;
-        // text-shadow: 1px 1px 3px #ddd;
       }
     }
   }
@@ -72,6 +84,10 @@
     #venue-pic {
       margin-top: 20px;
     }
+    // The venue section has less padding.
+    .trapezoid {
+      top: $trapezoid-height;
+    }
   }
 
   #lodging {

app/assets/stylesheets/osem-variables.scss

@@ -0,0 +1,14 @@
+// This file is included *early* in CSS order!
+// These variables change bootstrap defaults.
+
+$navbar-default-bg: #0C3559;
+$navbar-default-link-active-bg: rgb(8,8,8);
+$navbar-default-border: 1px solid #d4d4d4;
+$navbar-default-color: #FFF;
+$navbar-default-link-color: #FFF;
+$navbar-default-link-hover-color: #F2E205;
+$navbar-default-link-active-hover-color: #FFF;
+
+
+// The hiegh of the section tabs that are like Snap! blocks.
+$trapezoid-height: 14px;

app/assets/stylesheets/osem.scss

@@ -1,3 +1,4 @@
+@import "osem-variables";
 @import "bootstrap/mixins";
 
 html {
@@ -17,6 +18,21 @@ body {
   padding-bottom: 60px;
 }
 
+// Designed to be the last element in a section / nav
+// Makes a little "puzzle piece" connector.
+.trapezoid {
+    position: relative;
+    margin-left: 60px;
+    border-top: $trapezoid-height solid;
+    border-left: 9px solid transparent;
+    border-right: 9px solid transparent;
+    height: 0;
+    width: 64px;
+    margin-top: -1 * $trapezoid-height;
+    top: $trapezoid-height;
+    z-index: 1000;
+}
+
 #footer {
   position: absolute;
   bottom: 0;

app/assets/stylesheets/strap-on.scss

@@ -1,10 +1,5 @@
-$navbar-default-bg: #0C3559;
+// Place bootstrap variable customizations in the file below.
-$navbar-default-link-active-bg: rgb(8,8,8);
+@import "osem-variables";
-$navbar-default-border: 1px solid #d4d4d4;
-$navbar-default-color: #FFF;
-$navbar-default-link-color: #FFF;
-$navbar-default-link-hover-color: #F2E205;
-
 @import 'bootstrap-datetimepicker';
 @import "bootstrap-sprockets";
 

app/views/conferences/_call_for_content.haml

@@ -20,3 +20,4 @@
           call: call_for_booths
       - if two_calls_open(call_for_events, call_for_tracks, call_for_booths)
         .col-md-2.col-sm-2.hidden-xs  
+  .trapezoid

app/views/conferences/_header.haml

@@ -22,7 +22,7 @@
                       = sanitize link_to(venue.name, venue.website)
                     - else
                       = venue.city
-                      - if venue.country_name != 'US'
+                      - if venue.country != 'US'
                         •
                         = venue.country_name
 
@@ -32,3 +32,4 @@
         .row
           .col-md-8.col-md-offset-2
             = markdown(conference.description)
+      .trapezoid

app/views/conferences/_lodging.haml

@@ -42,3 +42,4 @@
                     = lodging.name
                 - if lodging.description.present?
                   = markdown(lodging.description)
+    .trapezoid

app/views/conferences/_program.haml

@@ -31,6 +31,7 @@
               = link_to(conference_schedule_path(conference.short_title),
                 class: 'btn btn-success btn-lg') do
                 Full Schedule
+    .trapezoid
 
 - unless booths.blank?
   - booths.each do |booth|

app/views/conferences/_registration.haml

@@ -37,3 +37,4 @@
                 = link_to('Register Now',
                   new_conference_conference_registration_path(conference_id),
                   class: 'btn btn-lg btn-success')
+    .trapezoid

app/views/conferences/_social_media.haml

@@ -27,3 +27,4 @@
           - if contact.email?
             = mail_to "#{ contact.email }" do
               %i.fa.fa-envelope-o.fa-4x
+    .trapezoid

app/views/conferences/_sponsors.haml

@@ -30,6 +30,7 @@
             = "Interested in sponsoring #{conference.title}?"
             = link_to(sponsorship_mailto(conference)) do
               Please, contact us!
+    .trapezoid
 
 - sponsors.each do |sponsor|
   - content_for :modals do

app/views/conferences/_tickets.haml

@@ -14,7 +14,7 @@
           -#   = conference.title
       .row.row-centered
         - tickets.each do |ticket|
-          .col-md-3.col-sm-3.col-centered.col-top
+          .col-lg-4.col-md-3.col-sm-3.col-centered.col-top
             = link_to(conference_tickets_path(conference.short_title),
               class: 'thumbnail') do
               .caption
@@ -23,5 +23,6 @@
                 .word_break
                   = markdown(ticket.description)
                 %button.btn-block.btn.btn-lg.btn-success
-                  %i.fa.fa-ticket.fa-fw
+                  %i.fa.fa-ticket.fa-fw{"aria-hidden": true}
                   = humanized_money_with_symbol(ticket.price)
+    .trapezoid

app/views/conferences/_venue.haml

@@ -10,6 +10,7 @@
         .row
           .col-md-8.col-md-offset-2
             = markdown(venue.description, escape_html=false)
+      .trapezoid
   - else
     - cache [venue, commercial, '#splash#venue'] do
       .container
@@ -46,3 +47,4 @@
               - if venue.website
                 %br
                 = sanitize link_to(h(venue.website), h(venue.website))
+      .trapezoid

app/views/layouts/_navigation.html.haml

@@ -1,7 +1,6 @@
-.navbar.navbar-default.navbar-fixed-top.nav-osem{role: 'navigation'}
+%nav.navbar.navbar-default.navbar-fixed-top.nav-osem{role: 'navigation'}
   .container
     .navbar-header
-
       - if controller.class.name.split("::").first=="Admin"
         %button{ "data-target"=>"#side-nav", "data-toggle"=>"collapse", class: 'navbar-toggle side-nav-btn', type: 'button' }
           %span.sr-only Toggle navigation
@@ -79,3 +78,4 @@
                 -#     Need Help?
                 -#   #navbar-devise-help.collapse
                 -#     = render 'devise/shared/links'
+  .trapezoid