From 0e08045e17e6486511ddae8be74e49b083cb5230 Mon Sep 17 00:00:00 2001 From: Matchu Date: Sat, 15 May 2010 20:49:13 -0400 Subject: [PATCH] add description, restyle header a bit --- app/stylesheets/items/_show.scss | 9 +++++---- app/views/items/show.html.haml | 2 ++ public/stylesheets/compiled/screen.css | 15 ++++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/stylesheets/items/_show.scss b/app/stylesheets/items/_show.scss index f69a0cff..8a22481a 100644 --- a/app/stylesheets/items/_show.scss +++ b/app/stylesheets/items/_show.scss @@ -1,20 +1,21 @@ body.show { header { + border-bottom: 1px solid $module_border_color; display: block; + margin-bottom: 1em; + padding: 1em 0; } #item-thumbnail { @include inline-block; border: 1px solid $module_border_color; height: 80px; - margin-right: -.5em; + margin-right: .5em; width: 80px; } #item-name { @include inline-block; - border-bottom: 1px solid $module_border_color; - margin: 0; - padding: 0 1em 0 1em; + margin-top: 1em; } } diff --git a/app/views/items/show.html.haml b/app/views/items/show.html.haml index 00a6a4ba..8e99bbe1 100644 --- a/app/views/items/show.html.haml +++ b/app/views/items/show.html.haml @@ -1,3 +1,5 @@ %header = image_tag @item.thumbnail_url, :id => 'item-thumbnail' %h2#item-name= @item.name + +%p= @item.description diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css index 4123e918..73fb9e4d 100644 --- a/public/stylesheets/compiled/screen.css +++ b/public/stylesheets/compiled/screen.css @@ -537,11 +537,14 @@ h1 a:hover { width: 80px; } -/* line 2, ../../../app/stylesheets/items/show.scss */ +/* line 2, ../../../app/stylesheets/items/_show.scss */ body.show header { + border-bottom: 1px solid #033e6b; display: block; + margin-bottom: 1em; + padding: 1em 0; } -/* line 6, ../../../app/stylesheets/items/show.scss */ +/* line 9, ../../../app/stylesheets/items/_show.scss */ body.show #item-thumbnail { display: -moz-inline-box; -moz-box-orient: vertical; @@ -551,10 +554,10 @@ body.show #item-thumbnail { *vertical-align: auto; border: 1px solid #033e6b; height: 80px; - margin-right: -0.5em; + margin-right: .5em; width: 80px; } -/* line 14, ../../../app/stylesheets/items/show.scss */ +/* line 17, ../../../app/stylesheets/items/_show.scss */ body.show #item-name { display: -moz-inline-box; -moz-box-orient: vertical; @@ -562,7 +565,5 @@ body.show #item-name { vertical-align: middle; *display: inline; *vertical-align: auto; - border-bottom: 1px solid #033e6b; - margin: 0; - padding: 0 1em 0 1em; + margin-top: 1em; }