diff --git a/app/views/comments/_single.html.haml b/app/views/comments/_single.html.haml index 6051590fa..6379a4ecd 100644 --- a/app/views/comments/_single.html.haml +++ b/app/views/comments/_single.html.haml @@ -1,6 +1,6 @@ .well .comment - .row-fluid + .row .span1 = render :partial => "members/avatar", :locals => { :member => comment.author } .span11 diff --git a/app/views/crops/_index_card.html.haml b/app/views/crops/_index_card.html.haml index 7fd64bd4f..fda786387 100644 --- a/app/views/crops/_index_card.html.haml +++ b/app/views/crops/_index_card.html.haml @@ -1,5 +1,5 @@ .well - .row-fluid + .row .span4 = link_to image_tag((crop.default_photo ? crop.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => '', :class => 'img-rounded'), crop .span8 diff --git a/app/views/crops/_photos.html.haml b/app/views/crops/_photos.html.haml index 864560eb8..c6845bbba 100644 --- a/app/views/crops/_photos.html.haml +++ b/app/views/crops/_photos.html.haml @@ -1,4 +1,4 @@ -.row-fluid +.row - if !crop.photos.empty? %ul.thumbnails - crop.photos.first(3).each do |p| diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml index c174f325e..d74fbbd79 100644 --- a/app/views/crops/show.html.haml +++ b/app/views/crops/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, @crop.name -.row-fluid +.row .span9 %p - if can? :create, Planting diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index e06597ac5..25c17073e 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -1,6 +1,6 @@ =content_for :title, "#{@garden.owner}'s #{@garden}" -.row-fluid +.row .span9 - if ! @garden.active .alert.alert-notice diff --git a/app/views/harvests/show.html.haml b/app/views/harvests/show.html.haml index b3259f502..21b562408 100644 --- a/app/views/harvests/show.html.haml +++ b/app/views/harvests/show.html.haml @@ -1,6 +1,6 @@ =content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}" -.row-fluid +.row .span6 %p %b Owner: diff --git a/app/views/home/_blurb.html.haml b/app/views/home/_blurb.html.haml index 0655e2a66..9f256d498 100644 --- a/app/views/home/_blurb.html.haml +++ b/app/views/home/_blurb.html.haml @@ -2,7 +2,7 @@ %h1= ENV['GROWSTUFF_SITE_NAME'] -.row-fluid +.row .span8.info %p #{ENV['GROWSTUFF_SITE_NAME']} is a community of food gardeners. diff --git a/app/views/home/_crops.html.haml b/app/views/home/_crops.html.haml index be9b7f1e0..21cda0f88 100644 --- a/app/views/home/_crops.html.haml +++ b/app/views/home/_crops.html.haml @@ -1,4 +1,4 @@ -.row-fluid +.row .span6.hidden-phone - cache "interesting_crops", :expires_in => 1.day do %h2 Some of our crops @@ -11,7 +11,7 @@ %h2 Recently planted = render :partial => 'plantings/list', :locals => { :plantings => Planting.interesting.first(4) } -.row-fluid +.row .span12 - cache "recent_crops" do %p{ :style => 'margin-top: 11.25px' } diff --git a/app/views/home/_members.html.haml b/app/views/home/_members.html.haml index f7589b0de..86bf50d9c 100644 --- a/app/views/home/_members.html.haml +++ b/app/views/home/_members.html.haml @@ -4,7 +4,7 @@ - if members.present? %h2 Some of our members - .row-fluid + .row - members.each do |m| .span6.homepage-members = render :partial => "members/thumbnail", :locals => { :member => m } diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 5d06907cc..f30735eb5 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,4 +1,4 @@ -.row-fluid +.row .span12 - if member_signed_in? %h1 @@ -21,7 +21,7 @@ = render :partial => 'blurb' .visible-phone = render :partial => 'blurb' -.row-fluid +.row .span8.main = render :partial => 'crops' = render :partial => 'seeds' diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 01ba4cb55..2ae4385db 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,7 +5,7 @@ = render :partial => "layouts/header" .container - .row-fluid + .row .span12 - if content_for?(:title) %h1= yield(:title) diff --git a/app/views/members/_thumbnail.html.haml b/app/views/members/_thumbnail.html.haml index 7058941fa..d9ab14c0a 100644 --- a/app/views/members/_thumbnail.html.haml +++ b/app/views/members/_thumbnail.html.haml @@ -1,5 +1,5 @@ - cache "member_thumbnail_#{member.id}" do - .row-fluid + .row .member-thumbnail .span3 = render :partial => "members/image_with_popover", :locals => { :member => member } diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml index b89b6028d..393c39af0 100644 --- a/app/views/members/show.html.haml +++ b/app/views/members/show.html.haml @@ -2,7 +2,7 @@ - content_for :member_rss_login_name, "#{@member.login_name}" - content_for :member_rss_slug, "#{@member.slug}" -.row-fluid +.row .span3 = render :partial => "members/avatar", :locals => { :member => @member } diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml index 2db20b2ff..8d6a14d38 100644 --- a/app/views/photos/new.html.haml +++ b/app/views/photos/new.html.haml @@ -22,7 +22,7 @@ = will_paginate @photos %ul.thumbnails - .row-fluid + .row - @photos.each do |p| %li.span2.six-across .thumbnail(style='height: 220px') diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 9ee1a22af..bd83caee6 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -1,6 +1,6 @@ -content_for :title, @photo.title -.row-fluid +.row .span6 %p %strong Posted by: @@ -25,7 +25,7 @@ - @photo.plantings.each do |p| %li= link_to p, p -.row-fluid +.row .span12 %p= image_tag(@photo.fullsize_url, :alt => @photo.title, :class => 'img-rounded') diff --git a/app/views/plantings/_list.html.haml b/app/views/plantings/_list.html.haml index 5374c815a..20cdece6f 100644 --- a/app/views/plantings/_list.html.haml +++ b/app/views/plantings/_list.html.haml @@ -1,6 +1,6 @@ - plantings.each do |p| - cache "plantings_listitem_#{p.id}" do - .row-fluid + .row .span2{:style => 'padding-bottom: 6px'} = render :partial => 'plantings/image_with_popover', :locals => { :planting => p } .span10 diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml index f3b1c1211..f27ec9965 100644 --- a/app/views/plantings/_thumbnail.html.haml +++ b/app/views/plantings/_thumbnail.html.haml @@ -1,5 +1,5 @@ .well - .row-fluid + .row .span3 = link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => '', :class => 'img-rounded'), planting diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml index cc35170dd..0494d2897 100644 --- a/app/views/plantings/show.html.haml +++ b/app/views/plantings/show.html.haml @@ -1,6 +1,6 @@ =content_for :title, "#{@planting.crop} in #{@planting.location}" -.row-fluid +.row .span6 %p %b Owner: diff --git a/app/views/posts/_single.html.haml b/app/views/posts/_single.html.haml index bd6122d0f..0c6ac3c2a 100644 --- a/app/views/posts/_single.html.haml +++ b/app/views/posts/_single.html.haml @@ -1,6 +1,6 @@ .well .post - .row-fluid + .row .span1 = render :partial => "members/avatar", :locals => { :member => post.author } .span11 diff --git a/app/views/seeds/show.html.haml b/app/views/seeds/show.html.haml index 47eac8a9e..1244749a6 100644 --- a/app/views/seeds/show.html.haml +++ b/app/views/seeds/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds" -.row-fluid +.row .span6 %p %b Owner: