From 8f646b4a107b45dc5420d54f5b50fd9dc1ba2ef6 Mon Sep 17 00:00:00 2001 From: Matchu Date: Wed, 20 Jul 2011 15:22:00 -0400 Subject: [PATCH] closet importer gets back to your items link --- app/stylesheets/closet_pages/_new.sass | 13 ++++++ app/views/closet_pages/new.html.haml | 2 + public/stylesheets/compiled/screen.css | 60 ++++++++++++++++++++++---- 3 files changed, 66 insertions(+), 9 deletions(-) diff --git a/app/stylesheets/closet_pages/_new.sass b/app/stylesheets/closet_pages/_new.sass index 90357610..ceb49654 100644 --- a/app/stylesheets/closet_pages/_new.sass +++ b/app/stylesheets/closet_pages/_new.sass @@ -1,7 +1,20 @@ body.closet_pages-new, body.closet_pages-create + #title + float: left + + .flash + clear: both + + #back-to-items + +awesome-button + margin: + left: 1em + top: .75em + #closet-page-form +clearfix + clear: both margin-bottom: 1em #closet-page-frame-wrapper diff --git a/app/views/closet_pages/new.html.haml b/app/views/closet_pages/new.html.haml index fd7aec84..ae504a69 100644 --- a/app/views/closet_pages/new.html.haml +++ b/app/views/closet_pages/new.html.haml @@ -1,4 +1,6 @@ - title "Closet Importer, Page #{@closet_page.index}" +- content_for :before_flashes do + = link_to 'Back to Your Items', user_closet_hangers_path(current_user), :id => 'back-to-items' = form_for @closet_page, :html => {:id => 'closet-page-form'} do |f| #closet-page-frame-wrapper diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css index b7596113..75465c48 100644 --- a/public/stylesheets/compiled/screen.css +++ b/public/stylesheets/compiled/screen.css @@ -759,55 +759,97 @@ body.closet_hangers-index #closet-hangers.current-user.js .object.loading .quant } /* line 3, ../../../app/stylesheets/closet_pages/_new.sass */ +body.closet_pages-new #title, body.closet_pages-create #title { + float: left; +} +/* line 6, ../../../app/stylesheets/closet_pages/_new.sass */ +body.closet_pages-new .flash, body.closet_pages-create .flash { + clear: both; +} +/* line 9, ../../../app/stylesheets/closet_pages/_new.sass */ +body.closet_pages-new #back-to-items, body.closet_pages-create #back-to-items { + /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */ + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + background: #006400 url('/images/alert-overlay.png?1296599919') repeat-x; + border: 0; + display: inline-block; + padding: 0.5em 0.75em 0.45em; + color: white; + text-decoration: none; + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5); + text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25); + border-bottom: 1px solid rgba(0, 0, 0, 0.25); + position: relative; + font-weight: bold; + line-height: 1; + margin-left: 1em; + margin-top: 0.75em; +} +/* line 34, ../../../app/stylesheets/partials/clean/_mixins.sass */ +body.closet_pages-new #back-to-items:hover, body.closet_pages-create #back-to-items:hover { + background-color: #005300; +} +/* line 53, ../../../app/stylesheets/partials/clean/_mixins.sass */ +body.closet_pages-new #back-to-items:hover, body.closet_pages-create #back-to-items:hover { + color: white; +} +/* line 55, ../../../app/stylesheets/partials/clean/_mixins.sass */ +body.closet_pages-new #back-to-items:active, body.closet_pages-create #back-to-items:active { + top: 1px; +} +/* line 15, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new #closet-page-form, body.closet_pages-create #closet-page-form { overflow: hidden; display: inline-block; + clear: both; margin-bottom: 1em; } /* line 8, ../../../app/stylesheets/partials/clean/_mixins.sass */ body.closet_pages-new #closet-page-form, body.closet_pages-create #closet-page-form { display: block; } -/* line 7, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 20, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new #closet-page-frame-wrapper, body.closet_pages-create #closet-page-frame-wrapper { float: left; margin-right: 2%; width: 48%; } -/* line 12, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 25, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new #closet-page-frame, body.closet_pages-create #closet-page-frame { height: 19em; width: 100%; } -/* line 16, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 29, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new #closet-page-source, body.closet_pages-create #closet-page-source { float: left; width: 50%; } -/* line 20, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 33, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new #closet-page-source label, body.closet_pages-create #closet-page-source label { font-weight: bold; } -/* line 23, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 36, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new #closet-page-source textarea, body.closet_pages-create #closet-page-source textarea { height: 19em; } -/* line 27, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 40, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new ol, body.closet_pages-create ol { padding-left: 1em; } -/* line 30, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 43, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new ol > li, body.closet_pages-create ol > li { margin-bottom: 1em; } -/* line 33, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 46, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new ol ul, body.closet_pages-create ol ul { font-size: 85%; margin-bottom: 1em; margin-top: 0; padding-left: 1em; } -/* line 40, ../../../app/stylesheets/closet_pages/_new.sass */ +/* line 53, ../../../app/stylesheets/closet_pages/_new.sass */ body.closet_pages-new ol p, body.closet_pages-create ol p { margin: 0; }