fixed merge conflict in application.html, added link to atom feed in …

…page header

Guardfile

@@ -23,7 +23,7 @@ group 'frontend' do
     watch(%r{public/.+\.(css|js|html)})
     watch(%r{config/locales/.+\.yml})
     # Rails Assets Pipeline
-    watch(%r{(app|vendor)/assets/\w+/(.+\.(css|js|html)).*})  { |m| "/assets/#{m[2]}" }
+    watch(%r{(app|vendor)/assets/\w+/(.+\.(scss|js|erb|html)).*})  { |m| "/assets/#{m[2]}" }
   end
 end
 

app/assets/stylesheets/_main.css.scss

@@ -1,100 +1,109 @@
-@mixin no-list {
-  list-style: none;
-  margin-left: 0;
-}
-
 #wrapper {
   @include container;
   // @include susy-grid-background;
+  // @include debug-vertical-alignment;
 
-  @include at-breakpoint($mobile-layout) { // ;
+  @include at-breakpoint($full-break) {
     @include set-container-width;
     // @include susy-grid-background;
+    // @include debug-vertical-alignment;
   }
 } //#wrapper
 
+
+
 header#page_header {
-  @include span-columns(12);
   h1 {
-    @include span-columns(10);
+    @include span-columns(4);
+    @include adjust-font-size-to(20px);
+    @include at-breakpoint($full-break) {
+      @include span-columns(10, $full-break);
+      @include adjust-font-size-to(36px);
+    }
   } //h1
   .feed {
     @include span-columns(2 omega);
-    line-height:40px;
+    @include at-breakpoint($full-break) {
+      @include span-columns(2 omega);
+    }
     margin:10px auto;
     text-align:right;
   } //.feed
 } //header#page_header
 
 
 section#main {
-  @include span-columns(12);
-
+  @include span-columns($total-columns);
   .hero-unit {
+    float:left;
+    width:90%;
+    padding:10px 5%;
+    position:relative;
     a#learn-more {
+      float:left;
+      display:block;
       @include margin-leader(0.5);
       @include margin-trailer(0.5);
       @extend .btn;
       @extend .btn-primary;
       @extend .btn-large;
     } //a#learn_more
 
+    h1 {
+      @include adjust-font-size-to(24px);
+    } //h1
+
     .bird {
-      padding-left:120px;
+      float:left;
+      clear: both;
+      width:120px;
       height:100px;
       @include sprites-sprite(twitter_newbird_blue);
       @include margin-trailer(0.5);
+      position:relative;
       p {
-        padding:20px;
+        width:120px;
+        @include adjust-font-size-to(16px);
         margin-bottom:0;
+        position:absolute;
+        left:130px;
+        top:-30px;
       } //p
     } //.bird
 
     span.shared-smiles-count {
       @extend .label;
       @extend .label-info;
+      position:absolute;
+      right:10px;
+      bottom:10px;
     } //span.shared-smiles-count
 
   } //.hero-unit
 
   #smiles-list {
     @include no-list;
-    @include span-columns(12);
+    @include span-columns($total-columns);
     li {
-      @include span-columns(3,12);
+      @include span-columns(3);
+      &.two, &.four {
+        @include omega;
+      } //&.two
+      @include at-breakpoint($full-break) {
+        @include span-columns(3,$total-columns);
+        &.two {
+          @include remove-omega;
+        } //&.two
+      }
       height:380px;
       @include margin-trailer(1);
       background-color:$grayLighter;
-      &.four {
-        @include omega;
-      } //&.four
+
       &.one, &.three {
         background-color:$grayLighter;
       } //&.two, &.four
     } //li
   } //#smiles-list
 } //section#main
 
-@mixin close-button {
-  @include sprites-sprite(close);
-  position:absolute;
-  left:5px; top:5px;
-  cursor:pointer;
-  height:35px;
-  width:35px;
-  background-color:transparent;
-}
-
-#overlay {
-  display:none;
-  padding:35px;
-  @include border-radius(10px);
-  outline:none;
-  .close {
-    @include close-button;
-  } //.close
-} //.overlay
 
-.click_to_ajax_overlay {
-  cursor:pointer;
-} //.click_to_ajax_overlay

app/assets/stylesheets/_mixins.css.scss

@@ -0,0 +1,4 @@
+@mixin no-list {
+  list-style: none;
+  margin-left: 0;
+}

app/assets/stylesheets/_overlay.css.scss

@@ -0,0 +1,23 @@
+@mixin close-button {
+  @include sprites-sprite(close);
+  position:absolute;
+  left:5px; top:5px;
+  cursor:pointer;
+  height:35px;
+  width:35px;
+  background-color:transparent;
+}
+
+#overlay {
+  display:none;
+  padding:35px;
+  @include border-radius(10px);
+  outline:none;
+  .close {
+    @include close-button;
+  } //.close
+} //.overlay
+
+.click_to_ajax_overlay {
+  cursor:pointer;
+} //.click_to_ajax_overlay

app/assets/stylesheets/application.css.scss

@@ -1,32 +1,32 @@
 //-----------------------------------------
-// Variables - set before importing anything so that defaults from bootstrap
-//             so that default vars from bootstrap can be overriden
+// Imports
 //-----------------------------------------
-
-// My vars
-
-// override bootstrap vars
-
+@import "bootstrap";
+@import "bootstrap-responsive";
+@import "susy";
+@import "compass/typography/vertical_rhythm";
 
 //-----------------------------------------
 // Susy Grid vars (http://susy.oddbird.net/)
 //-----------------------------------------
-$total-columns  : 12;
+$total-columns  : 6;
 $column-width   : 4em;
 $gutter-width   : 1em;
 $grid-padding   : $gutter-width;
 
-$mobile-layout : 7;
+$full-break: 12;
 
-$container-style: fluid;
-
-//-----------------------------------------
-// Imports
-//-----------------------------------------
-@import "bootstrap";
-@import "bootstrap-responsive";
-@import "susy";
+// compass vars for vertical rhythm based on bootstrap default vars
+$base-font-size:$baseFontSize; //14px
+$base-line-height:$baseLineHeight; //20px
 
+// mixins first (or anything used by following files, so sprites too)
+@import "mixins";
 @import "sprites/*.png";
 
-@import "main";
+@import "main";
+@import "overlay";
+
+body {
+  @include establish-baseline; // establish compass vertical rhythm
+} //body

app/views/application/_header.html.haml

@@ -1,5 +1,5 @@
 %header#page_header
   %h1= link_to rubyfriends_app.title, root_path
   .feed
-    = link_to image_tag('twitter_icon_grey.png'),
-              twitter_url
+    = link_to image_tag('twitter_icon_grey.png'), twitter_url
+    = link_to image_tag('feed_icon_grey.png'), tweets_url(format: :atom)

app/views/layouts/application.html.haml

@@ -1,8 +1,8 @@
 %html
   %head
-    %meta{ :charset => "utf-8" }/
-    %meta{ 'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1' }/
-    %meta{ :name => "viewport", :content => "width=device-width" }/
+    %meta{charset: "utf-8" }/
+    %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge,chrome=1' }/
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}/
     = auto_discovery_link_tag :atom, tweets_url(format: :atom), title: "#RubyFriends"
     %title #RubyFriends - Smile for the camera!
     = stylesheet_link_tag 'application'

app/views/tweets/index.html.haml

@@ -4,10 +4,9 @@
   -# TODO - add facebook like button
   .bird
     %p
-      Share your friends with the hashtag
+      Share friends with hashtags
       %br
       = link_to "#RubyFriends", twitter_url
-      or
       = link_to "##{rubyfriends_app.current_conference_hashtag}",
                 twitter_url(rubyfriends_app.current_conference_hashtag)
   %span.shared-smiles-count