Merge pull request #20 from snap-cloud/tweaks

Tweaks

app/assets/stylesheets/application.css

@@ -2,6 +2,13 @@
  *= require strap-on
  *= require formtastic-bootstrap
  *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+ *= require selectize
+ *= require selectize.bootstrap3
+ *= require bootstrap-select
+ *= require bootstrap-markdown
+ *= require bootstrap-datetimepicker
+ *= require leaflet
+
  *= require osem
  *= require osem-rating
  *= require osem-schedule
@@ -10,15 +17,9 @@
  *= require osem-splash
  *= require font-awesome
  *= require osem-fonts
- *= require bootstrap-markdown
- *= require bootstrap-datetimepicker
- *= require leaflet
  *= require bootstrap3-switch
  *= require osem-payments
  *= require osem-navbar
- *= require selectize
- *= require selectize.bootstrap3
  *= require mastodon
- *= require bootstrap-select
  *= require conferences
 */

app/assets/stylesheets/osem-navbar.scss

@@ -1,4 +1,6 @@
 @import "breakpoints.scss";
+$navbar-default-link-color: #FFF;
+
 .nav-osem {
     border: none;
     @include breakpoint(xs) {
@@ -31,8 +33,13 @@
     .dropdown-menu {
         min-width: 225px;
     }
-    .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
-        color: #FFF;
+
+    &.navbar-default {
+        .navbar-nav > .open > a {
+            &:hover, &:focus {
+                color: $navbar-default-link-color;
+            }
+        }
     }
 
     .navbar-brand img {

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 {

app/assets/stylesheets/strap-on.scss

@@ -1,8 +1,8 @@
 $navbar-default-bg: #0C3559;
 $navbar-default-link-active-bg: rgb(8,8,8);
 $navbar-default-border: 1px solid #d4d4d4;
-$navbar-default-color: #ffffff;
-$navbar-default-link-color: #ffffff;
+$navbar-default-color: #FFF;
+$navbar-default-link-color: #FFF;
 $navbar-default-link-hover-color: #F2E205;
 
 @import 'bootstrap-datetimepicker';

app/views/admin/event_types/_form.html.haml

@@ -7,11 +7,12 @@
         Event Type
         = @event_type.title
 .row
-  .col-md-12
-    = semantic_form_for(@event_type, url: (@event_type.new_record? ? admin_conference_program_event_types_path : admin_conference_program_event_type_path(@conference.short_title, @event_type))) do |f|
+  .col-md-8
+    - form_url = (@event_type.new_record? ? admin_conference_program_event_types_path : admin_conference_program_event_type_path(@conference.short_title, @event_type))
+    = semantic_form_for(@event_type, url: form_url) do |f|
       = f.input :title, input_html: { autofocus: true }
       = f.input :length, input_html: {size: 3, type: 'number', step: @event_type.program.schedule_interval, min: @event_type.program.schedule_interval}
-      = f.input :description
+      = f.input :description, as: :text, hint: markdown_hint, input_html: { rows: 5, data: { provide: 'markdown-editable' } }
       = f.input :minimum_abstract_length, input_html: {size: 3}
       = f.input :maximum_abstract_length, input_html: {size: 3}
       = f.input :color, input_html: { size: 6, type: 'color' }

app/views/admin/event_types/index.html.haml

@@ -20,7 +20,7 @@
             %td
               = event_type.title
             %td
-              = event_type.description
+              = markdown(event_type.description)
             %td
               = event_type.length
               Minutes

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

app/views/conferences/_lodging.haml

@@ -17,7 +17,7 @@
 
       .row.row-centered
         - lodgings.order(created_at: :asc).each do |lodging|
-          .col-md-4.col-sm-4.col-centered.col-top
+          .col-md-6.col-sm-4.col-centered.col-top
             .thumbnail
               - if lodging.picture?
                 - if lodging.website_link.present?
@@ -37,7 +37,7 @@
               .caption
                 %h3.text-center
                   - if lodging.website_link.present?
-                    = link_to(loding.website_link, lodiging.name)
+                    = link_to(lodging.name, lodging.website_link)
                   - else
                     = lodging.name
                 - if lodging.description.present?

app/views/conferences/_venue.haml

@@ -5,6 +5,11 @@
 %section#venue
   - if venue.location?
     = render '/conferences/venue_map', venue: venue
+    - if venue.description.present?
+      .container
+        .row
+          .col-md-8.col-md-offset-2
+            = markdown(venue.description, escape_html=false)
   - else
     - cache [venue, commercial, '#splash#venue'] do
       .container

app/views/proposals/new.html.haml

@@ -7,7 +7,7 @@
     - if @program.cfp.description.present?
       .row
         .col-md-12
-          = markdown(@program.cfp.description)
+          = markdown(@program.cfp.description, escape_html=false)
   .row
     .col-md-12
       = render partial: 'encouragement_text'
@@ -43,10 +43,10 @@
 
               - @program.event_types.each do |event_type|
                 %span{ class: 'help-block event_event_type_id collapse', id: "#{event_type.id}-help" }
-                  = event_type.description
+                  = markdown(event_type.description)
 
               = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } },
-                hint: markdown_hint('[Tips to improve your presentations.](http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx)')
+                hint: markdown_hint
 
               %p
                 You have used