From 5bb0926a886beaf599401daa01e35e1015725f76 Mon Sep 17 00:00:00 2001 From: Skud Date: Fri, 8 Mar 2013 17:17:31 +1100 Subject: [PATCH 1/3] Rockin' it 70s style --- .../bootstrap_and_overrides.css.less | 57 +++++++++++++++---- app/views/layouts/_footer.html.haml | 15 ++--- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index c9d59cfb2..7315d3235 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/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: "Lora", Georgia, "Times New Roman", Times, serif; +@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace; + +@baseFontSize: 16px; +@baseFontFamily: @serifFontFamily; +@baseLineHeight: @baseFontSize * 1.5; +@altFontFamily: @sansFontFamily; + +@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily +@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; } diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index aaada0967..6934f1253 100644 --- a/app/views/layouts/_footer.html.haml +++ b/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" From c0ccbf2a0d81f9f86b39f15efb80fd5591c2bb7f Mon Sep 17 00:00:00 2001 From: Skud Date: Mon, 11 Mar 2013 14:30:26 +1100 Subject: [PATCH 2/3] georgia with lora headings --- app/assets/stylesheets/bootstrap_and_overrides.css.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 7315d3235..00aa25784 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -36,7 +36,7 @@ body { padding-top: 60px; } // 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: "Lora", Georgia, "Times New Roman", Times, serif; +@serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace; @baseFontSize: 16px; @@ -44,7 +44,7 @@ body { padding-top: 60px; } @baseLineHeight: @baseFontSize * 1.5; @altFontFamily: @sansFontFamily; -@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily +@headingsFontFamily: "Lora", Georgia, "Times New Roman", Times, serif; @headingsFontWeight: bold; // instead of browser default, bold @headingsColor: inherit; // empty to use BS default, @textColor From 29016c32110fbea4cdbe44fbfba04106a710483e Mon Sep 17 00:00:00 2001 From: Skud Date: Mon, 11 Mar 2013 14:32:34 +1100 Subject: [PATCH 3/3] Tweaked member avatars The member's name (in text) is no longer part of the avatar itself, as it looks pretty awful and/or redundant in some places where it's used. --- app/views/comments/_single.html.haml | 2 +- app/views/gardens/show.html.haml | 2 +- app/views/home/index.html.haml | 11 +++++++++-- app/views/{shared => members}/_avatar.html.haml | 3 --- app/views/members/index.html.haml | 5 +++-- app/views/members/show.html.haml | 2 +- app/views/posts/_single.html.haml | 6 +++--- 7 files changed, 18 insertions(+), 13 deletions(-) rename app/views/{shared => members}/_avatar.html.haml (80%) diff --git a/app/views/comments/_single.html.haml b/app/views/comments/_single.html.haml index a44f1f450..d4ae3765a 100644 --- a/app/views/comments/_single.html.haml +++ b/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 diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index 1bd45b7b0..302035063 100644 --- a/app/views/gardens/show.html.haml +++ b/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 diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 2627bd963..c75f83db3 100644 --- a/app/views/home/index.html.haml +++ b/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. diff --git a/app/views/shared/_avatar.html.haml b/app/views/members/_avatar.html.haml similarity index 80% rename from app/views/shared/_avatar.html.haml rename to app/views/members/_avatar.html.haml index c5ab2e73e..5750fb170 100644 --- a/app/views/shared/_avatar.html.haml +++ b/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)) - diff --git a/app/views/members/index.html.haml b/app/views/members/index.html.haml index 5bdb8121b..b4986f743 100644 --- a/app/views/members/index.html.haml +++ b/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 diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml index c7f1132a2..be8a993e9 100644 --- a/app/views/members/show.html.haml +++ b/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)}" diff --git a/app/views/posts/_single.html.haml b/app/views/posts/_single.html.haml index abc2fcc5f..5dd0ebd20 100644 --- a/app/views/posts/_single.html.haml +++ b/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"),