Merge pull request #123 from Skud/stylin

Stylin

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -17,19 +17,54 @@ body { padding-top: 60px; }
 // Font Awesome
 @import "fontawesome";
 
-// Glyphicons
-//@import "twitter/bootstrap/sprites.less";
+// Base colours
+
+@beige: #f3f1ee;
+@brown: #413f3b;
+
+@green:  #5f8e43;
+@blue:   #2f4365;
+@red:    #8e4d43;
+@orange: #b2685c;
+@yellow: #b2935c;
+
+@bodyBackground: @beige;
+@textColor: @brown;
 
-// Your custom LESS stylesheets goes here
-//
-// Since bootstrap was imported above you have access to its mixins which
-// you may use and inherit here
-//
-// If you'd like to override bootstrap's own variables, you can do so here as well
-// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
-//
-// Example:
 @linkColor: @green;
+
+// Typography (with help from bootswatch.com's "readable" theme)
+@import url('//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic');
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
+
+@baseFontSize:          16px;
+@baseFontFamily:        @serifFontFamily;
+@baseLineHeight:        @baseFontSize * 1.5;
+@altFontFamily:         @sansFontFamily;
+
+@headingsFontFamily:    "Lora", Georgia, "Times New Roman", Times, serif;
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+// Hero unit
+@heroUnitBackground: darken(@bodyBackground, 10%);
+
+// Nav bar
+@navbarBackground: @brown;
+@navbarBackgroundHighlight: @brown;
+@navbarText: @beige;
+@navbarLinkColor: darken(@beige, 20%);
+@navbarLinkColorHover: @beige;
+@navbarLinkColorActive: @beige;
+@navbarBrandColor: lighten(@green, 20%);
+
+@dropdownBackground: lighten(@beige, 10%);
+@dropdownLinkColor: @brown;
+@dropdownLinkColorHover: @brown;
+@dropdownLinkBackgroundHover: lighten(@green, 50%);
+
 body {
   padding-bottom: @navbarHeight + 10px;
 }

app/views/comments/_single.html.haml

@@ -2,7 +2,7 @@
   .comment
     .row
       .span1
-        = render :partial => "shared/avatar", :locals => { :member => comment.author }
+        = render :partial => "members/avatar", :locals => { :member => comment.author }
       .span7
         .comment-meta
           Posted by

app/views/gardens/show.html.haml

@@ -2,7 +2,7 @@
 
 .row
   .span3
-    = render :partial => "shared/avatar", :locals => { :member => @garden.owner }
+    = render :partial => "members/avatar", :locals => { :member => @garden.owner }
 
     %h4= "#{@garden.owner}'s gardens"
     %ul

app/views/home/index.html.haml

@@ -3,10 +3,15 @@
   %h1= "Welcome, #{current_member.login_name}"
 
   .row
+    .visible-desktop.visible-tablet
+      .span2
+        = render :partial => "members/avatar", :locals => { :member => current_member }
     .span6
       %p
         %b Your profile:
         =link_to current_member, current_member
+        %small
+          = link_to "Edit", edit_registration_path(current_member)
 
       %p
         %b Your location:
@@ -20,8 +25,10 @@
         - current_member.gardens.each do |g|
           %li= link_to g.name, g
         - if can? :create, Garden
-          %li= link_to 'Add a garden', new_garden_path
-    .span6
+          %li
+            %small= link_to 'Add a garden', new_garden_path
+
+    .span4
       - if current_member.has_role?(:admin)
         %p
           %b You are an ADMIN USER.

app/views/layouts/_footer.html.haml

@@ -1,10 +1,11 @@
 .container
   .navbar.navbar-fixed-bottom
     .navbar-inner
-      %ul.nav
-        %li= link_to "About", "http://wiki.growstuff.org"
-        %li= link_to "Terms of Service", url_for(:controller => '/policy', :action => 'tos')
-        %li= link_to "Community Guidelines", url_for(:controller => '/policy', :action => 'community')
-        %li= link_to "License", "https://github.com/Growstuff/growstuff/blob/dev/LICENSE.txt"
-        %li= link_to "Github", "https://github.com/Growstuff/"
-        %li= link_to "Mailing list", "http://lists.growstuff.org/mailman/listinfo/discuss"
+      .container
+        %ul.nav
+          %li= link_to "About", "http://wiki.growstuff.org"
+          %li= link_to "Terms of Service", url_for(:controller => '/policy', :action => 'tos')
+          %li= link_to "Community Guidelines", url_for(:controller => '/policy', :action => 'community')
+          %li= link_to "License", "https://github.com/Growstuff/growstuff/blob/dev/LICENSE.txt"
+          %li= link_to "Github", "https://github.com/Growstuff/"
+          %li= link_to "Mailing list", "http://lists.growstuff.org/mailman/listinfo/discuss"

app/views/members/_avatar.html.haml

@@ -1,4 +1,3 @@
-- truncate ||= false
 = link_to                                      |
   image_tag(                                   |
     Gravatar.new(member.email).image_url(      |
@@ -8,5 +7,3 @@
     :alt => '',                                |
     :class => 'img-rounded' ),                 |
   member_path(member)
-%h4= link_to(truncate ? shorten(member.to_s, 30) : member, member_path(member))
-

app/views/members/index.html.haml

@@ -2,9 +2,10 @@
 
 %p
   = "Displaying #{@members.length} members"
-  
+
 %ul.thumbnails
   - @members.each do |m|
     %li.span2
       .thumbnail(style="height: 190px")
-        = render :partial => "shared/avatar", :locals => { :member => m, :truncate => true }
+        = render :partial => "members/avatar", :locals => { :member => m }
+        = link_to shorten(m.to_s, 30), m

app/views/members/show.html.haml

@@ -4,7 +4,7 @@
 
 .row
   .span3
-    = render :partial => "shared/avatar", :locals => { :member => @member }
+    = render :partial => "members/avatar", :locals => { :member => @member }
 
     %p
       = "Member since: #{@member.created_at.to_s(:date)}"

app/views/posts/_single.html.haml

@@ -2,7 +2,7 @@
   .post
     .row
       .span1
-        = render :partial => "shared/avatar", :locals => { :member => post.author }
+        = render :partial => "members/avatar", :locals => { :member => post.author }
       .span7
         - if defined?(subject)
           %h3= link_to strip_tags(post.subject), post
@@ -20,8 +20,8 @@
         .post-body
           :markdown
             #{ strip_tags post.body }
-        
-        - unless defined?(hide_comments) 
+
+        - unless defined?(hide_comments)
           .post-comments
             %ul.inline
               %li.first= link_to pluralize(post.comments.count, "comment"),