phrug · kendaganio · May 21, 2015
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
@@ -1,12 +1,85 @@
+$headings-font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+$font-family-base: 'Cabin', Georgia, "Times New Roman", Times, serif !default;
+$headings-font-weight: 900;
+
+$rubyred: #e71111;
+$salmon: #f03c3c;
+
+$font-size-base: 16px !default;
+$navbar-default-bg: $salmon;
+$navbar-default-link-color:                #fff;
+$navbar-default-link-hover-color:          #333 !default;
+$navbar-default-link-hover-bg:             transparent !default;
+$navbar-default-link-active-color:         #fff !default;
+$navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%) !default;
+$navbar-default-link-disabled-color:       #ccc !default;
+$navbar-default-link-disabled-bg:          transparent !default;
+
 @import 'bootstrap-sprockets';
 @import 'bootstrap';
 @import 'font-awesome';
 @import 'gmaps4rails';
+@import url(http://fonts.googleapis.com/css?family=Lato:100,100italic,900);
+@import url(http://fonts.googleapis.com/css?family=Cabin:400,700);
+
+.navbar {
+  margin-bottom: 0;
+}
+
+.btn.btn-default {
+  text-transform: uppercase;
+  font-weight: 700;
+  font-size: 12px;
+  line-height: 22px;
+  padding-right: 30px;
+  padding-left: 30px;
+  border-color: $salmon;
+  color: $salmon;
+  transition: all 200ms ease;
+
+  &:hover {
+    border-color: $salmon;
+    background: $salmon;
+    color: #fff;
+  }
+}
 
 .jumbotron {
+  min-height: 600px;
+  background: $salmon;
+
   .ruby-logo {
-    margin: -25px 0 0 20px;
+    //margin: -25px 0 0 20px;
+  }
+
+  h1 {
+    color: #fff;
+    margin-bottom: 10px;
+  }
+
+  .copy {
+    h3 {
+      font-weight: 100;
+      color: #fff;
+    }
+
+    p {
+      font-family: $headings-font-family;
+      color: #fff;
+      font-weight: 100;
+      letter-spacing: 1.1px;
+    }
   }
+
+  .down {
+    text-align: center;
+    .fa-chevron-down {
+      margin-top: 30px;
+      color: #fff;
+      font-size: 300%;
+    }
+  }
+
 }
 
 @media (max-width: 979px) {
@@ -20,26 +93,32 @@
   }
 }
 
-.main-container {
-  margin-top: 20px;
-}
-
 .alert {
   margin-top: 20px;
 }
 
 .front-columns {
-  text-align: center;
+
+  h2 {
+    font-size: 35px;
+  }
+
+  .cta {
+    margin-top: 25px;
+  }
+
+  text-align: left;
   .col-md-4 {
     p {
-      font-size: 16px;
+      font-size: 18px;
       line-height: 1.5;
     }
     ul.community-links {
       list-style-type: none;
       margin: 0;
       padding: 0;
       a {
+        font-size: 18px;
         &:hover {
           text-decoration: none;
         }
@@ -57,22 +136,25 @@
 }
 
 .event {
-  background: #eee;
   padding: 5px 20px 10px;
-  margin-top: 10px;
-  border-radius: 5px;
+  border-bottom: 1px solid #eee;
   p.event-time {
     color: gray;
     font-style: italic;
   }
   .map_container {
     width: 100%;
+    margin-top: 25px;
     .gmaps4rails_map {
       width: 100%;
     }
   }
 }
 
+.calendar-subscription {
+  margin-top: 30px;
+}
+
 .presentation {
   h3 {
     margin-bottom: 0px;
@@ -91,3 +173,4 @@ footer, .footer {
     color: #87BEE0;
   }
 }
+
diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
@@ -1,26 +1,28 @@
 - build_meta_tags title: "Events"
 
-%h1 Events
+.container
 
-.pull-right
-  = link_to events_url(format: 'ics', protocol: 'webcal'), class: 'btn btn-primary' do
-    %span.glyphicon.glyphicon-calendar
-    Calendar Subscription
+  .pull-right.calendar-subscription
+    = link_to events_url(format: 'ics', protocol: 'webcal'), class: 'btn btn-default' do
+      %span.glyphicon.glyphicon-calendar
+      Calendar Subscription
+
+  %h1 Events
 
-- unless @current.empty?
-  .row.current-meetups
-    .col-md-12
-      %h2 Ongoing Events
-      = render :partial => @current, :spacer_template => "event_spacer" 
+  - unless @current.empty?
+    .row.current-meetups
+      .col-md-12
+        %h2 Ongoing Events
+        = render :partial => @current
 
-- unless @upcoming.empty?
-  .row.upcoming-meetups
-    .col-md-12
-      %h2 Upcoming Events
-      = render :partial => @upcoming, :spacer_template => "event_spacer" 
+  - unless @upcoming.empty?
+    .row.upcoming-meetups
+      .col-md-12
+        %h2 Upcoming Events
+        = render :partial => @upcoming
 
-- unless @past.empty?
-  .row.past-meetups
-    .col-md-12
-      %h2 Past Events
-      = render :partial => @past, :spacer_template => "event_spacer" 
+  - unless @past.empty?
+    .row.past-meetups
+      .col-md-12
+        %h2 Past Events
+        = render :partial => @past
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
@@ -3,26 +3,27 @@
 
 - build_meta_tags title: @event.name, description: strip_tags(@event.description_html)
 
-.row.event
-  .col-sm-12
-    .row
-      .col-md-6.col-sm-12
-        %h1= @event.name
-        = render :partial => "display_time", :locals => { :event => @event }
-        - unless @event.description.blank?
-          = raw @event.description_html
-        - unless @event.youtube_playlist.blank? 
-          %p.playlist
-            = link_to "http://www.youtube.com/playlist?list=#{@event.youtube_playlist}", :target => "_blank" do
-              %span.glyphicon.glyphicon-film
-              Watch event video playlist
-      - unless @event.venue.nil?
+.container
+  .row.event
+    .col-sm-12
+      .row
         .col-md-6.col-sm-12
-          .map_container
-            #map.gmaps4rails_map &nbsp;
+          %h1= @event.name
+          = render :partial => "display_time", :locals => { :event => @event }
+          - unless @event.description.blank?
+            = raw @event.description_html
+          - unless @event.youtube_playlist.blank? 
+            %p.playlist
+              = link_to "http://www.youtube.com/playlist?list=#{@event.youtube_playlist}", :target => "_blank" do
+                %span.glyphicon.glyphicon-film
+                Watch event video playlist
+        - unless @event.venue.nil?
+          .col-md-6.col-sm-12
+            .map_container
+              #map.gmaps4rails_map &nbsp;
 
-    - unless @event.presentations.empty?
-      %h2 Presentations:
-    - @event.presentations.each do |pres|
-      = render partial: "shared/presentation", locals: { pres: pres }
+      - unless @event.presentations.empty?
+        %h2 Presentations:
+      - @event.presentations.each do |pres|
+        = render partial: "shared/presentation", locals: { pres: pres }
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -33,14 +33,13 @@
             %button.btn.btn-default{ type: "submit" }
               %i.glyphicon.glyphicon-search
 
-    .container.main-container
+    .main-container
       - flash.each do |name, msg|
         %div{:class => "alert alert-#{name == "notice" ? "success" : "danger"}"}
           %a.close{"data-dismiss" => "alert"} ×
           = msg
-      .row
-        .col-sm-12
-          = yield
+
+      = yield
     %footer
       .container
         %p

diff --git a/app/views/pages/_ruby_logo.html b/app/views/pages/_ruby_logo.html
@@ -7,7 +7,6 @@
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="vertical" sketch:type="MSArtboardGroup" transform="translate(-27.000000, -39.000000)">
             <g id="monogram-circle" sketch:type="MSLayerGroup" transform="translate(27.000000, 39.000000)">
-                <circle id="Oval-3" fill="#E71111" sketch:type="MSShapeGroup" cx="124.5" cy="124.5" r="124.5"></circle>
                 <g id="monogram" transform="translate(37.000000, 61.000000)" sketch:type="MSShapeGroup">
                     <path d="M143.434885,0 C145.640537,0 148.625786,1.33277663 150.107462,2.98222557 L172.821109,28.2677744 C174.30062,29.9148121 174.430509,32.6748184 173.103163,34.4431605 L90.8254081,144.056839 C89.5016717,145.820373 87.3476747,145.834394 86.0061738,144.077485 L2.85096907,35.1725151 C1.51311579,33.4203834 1.63040579,30.6738379 3.11461276,29.0360923 C3.11461276,29.0360923 16.2796857,14.5091153 24.2052428,5.76367292 C25.9463524,3.84244861 26.7447861,2.96141828 26.7447861,2.96141828 C28.2269998,1.32587212 31.2114571,0 33.4222575,0 L143.434885,0 Z" id="Path-4" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" transform="translate(87.964286, 73.625000) scale(-1, 1) translate(-87.964286, -73.625000) "></path>
                     <path d="M36.4999998,12 L85.8196143,76.8565369 C86.8248218,78.1784101 88.4488664,78.1800847 89.4498483,76.8565369 L138.5,12" id="Path-2" stroke="#FFFFFF" stroke-width="6" stroke-linecap="round"></path>

diff --git a/app/views/pages/index.html.haml b/app/views/pages/index.html.haml
@@ -1,52 +1,63 @@
 - build_meta_tags
+
 .jumbotron
-  .pull-right.ruby-logo
-    = render :partial => "ruby_logo"
-  %h1 Philippine Ruby Users Group
-  %p 
-    %em (aka PhRUG, PinoyRb, Ruby-Philippines)
-  %p We're a bunch of professionals and hobbyists who share a passion in programming with Ruby.
+  .container
+    .row
+      .ruby-logo.text-center
+        = render :partial => "ruby_logo"
+    .row.text-center
+      %h1 Philippine Ruby Users Group
+      .copy
+        %h3 We're a bunch of professionals and hobbyists who share a passion in programming with Ruby.
+        %p
+          %em (aka PhRUG, PinoyRb, Ruby-Philippines)
+    .row.down
+      %a{href: ''}
+        %i.fa.fa-chevron-down
 
-.row.front-columns
-  .col-md-4
-    %h2 Know the local scene
-    %p 
-      Want to know who uses Ruby in the Philippines? Connect with the community via:
-    %ul.community-links
-      %li
-        = link_to "http://www.meetup.com/ruby-phil/" do
-          %span.fa.fa-users
-          Meetup.com
-        (sign-up to receive notifications)
-      %li
-        = link_to "http://phackers-slack.herokuapp.com/" do
-          %span.fa.fa-slack
-          Slack
-        (Philippine Tech Hackers #phrug)
-      %li
-        = link_to "irc://irc.freenode.net/phrug" do
-          %span.fa.fa-comments
-          IRC
-        (Freenode #phrug)
-      %li
-        = link_to "http://www.facebook.com/groups/phrug/" do
-          %span.fa.fa-facebook
-          Facebook Group
-      %li 
-        = link_to "https://groups.google.com/forum/#!forum/ruby-phil" do
-          %span.fa.fa-envelope
-          Google Group
-  .col-md-4
-    %h2 Join our meetups
-    %p We hold meetups every third Thursday of the month. 
-    %p There we talk about all things related to Ruby and Rails, network over pizza, and afterwards we go out for a drink.
-    %p 
-      Our next meetup is on
-      %strong= next_meetup(@next_meetup)
-    %p= link_to "Find out more about our events", events_url, :class => "btn btn-default btn-lg"
-  .col-md-4
-    %h2 Learn Ruby and Rails
-    %p Want to learn Ruby and Rails but don't know which among the many online resources out there are actually good? 
-    %p= link_to "We've got you covered.", learn_url, :class => "btn btn-default btn-lg"
-
+.container
+  .row.front-columns
+    .col-md-4
+      %h2 Know the local scene
+      %p 
+        Want to know who uses Ruby in the Philippines? Connect with the community via:
+      %ul.community-links
+        %li
+          = link_to "http://www.meetup.com/ruby-phil/" do
+            %span.fa.fa-users
+            Meetup.com
+          (sign-up to receive notifications)
+        %li
+          = link_to "http://phackers-slack.herokuapp.com/" do
+            %span.fa.fa-slack
+            Slack
+          (Philippine Tech Hackers #phrug)
+        %li
+          = link_to "irc://irc.freenode.net/phrug" do
+            %span.fa.fa-comments
+            IRC
+          (Freenode #phrug)
+        %li
+          = link_to "http://www.facebook.com/groups/phrug/" do
+            %span.fa.fa-facebook
+            Facebook Group
+        %li 
+          = link_to "https://groups.google.com/forum/#!forum/ruby-phil" do
+            %span.fa.fa-envelope
+            Google Group
+    .col-md-4
+      %h2 Join our meetups
+      %p We hold meetups every third Thursday of the month. 
+      %p There we talk about all things related to Ruby and Rails, network over pizza, and afterwards we go out for a drink.
+      %p 
+        Our next meetup is on
+        %strong= next_meetup(@next_meetup)
+      .text-center.cta
+        %p= link_to "Find out more about our events", events_url, :class => "btn btn-default btn-lg"
+    .col-md-4
+      %h2 Learn Ruby and Rails
+      %p Want to learn Ruby and Rails but don't know which among the many online resources out there are actually good? 
+      .text-center.cta
+        %p= link_to "We've got you covered.", learn_url, :class => "btn btn-default btn-lg"
+