OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

set sidebar height properly on non-fullscreen mode

Browse source
This commit is contained in:
Emi Matchu 2012-07-27 03:31:30 -04:00
parent 41f23fffac
commit 28e44d0abd
3 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/stylesheets/outfits/_edit.sass
View file

@ -709,6 +709,7 @@ body.outfits-edit
+border-radius(0 0 $sidebar-border-radius $sidebar-border-radius) +border-radius(0 0 $sidebar-border-radius $sidebar-border-radius)
border: 1px solid $soft-border-color border: 1px solid $soft-border-color
border-top: 0 border-top: 0
height: 300px
overflow: auto overflow: auto
padding-bottom: 1.5em padding-bottom: 1.5em

1
public/javascripts/outfits/edit.js
View file

@ -184,6 +184,7 @@ View.Fullscreen = function (wardrobe) {
if(!full) { if(!full) {
preview_swf.removeAttr('style').css('visibility', 'visible'); preview_swf.removeAttr('style').css('visibility', 'visible');
preview_el.removeAttr('style'); preview_el.removeAttr('style');
sidebar_content_el.removeAttr('style');
} }
} }
} }

55
public/stylesheets/compiled/screen.css
View file

@ -3212,10 +3212,11 @@ body.outfits-edit #preview-sidebar-content {
border-radius: 0 0 10px 10px; border-radius: 0 0 10px 10px;
border: 1px solid #aaddaa; border: 1px solid #aaddaa;
border-top: 0; border-top: 0;
height: 300px;
overflow: auto; overflow: auto;
padding-bottom: 1.5em; padding-bottom: 1.5em;
} }
/* line 715, ../../../app/stylesheets/outfits/_edit.sass */ /* line 716, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #save-success, body.outfits-edit #save-error, body.outfits-edit #outfit-not-found, body.outfits-edit #preview-sidebar-donation-request { body.outfits-edit #save-success, body.outfits-edit #save-error, body.outfits-edit #outfit-not-found, body.outfits-edit #preview-sidebar-donation-request {
margin-left: 24px; margin-left: 24px;
margin-right: 24px; margin-right: 24px;
@ -3223,7 +3224,7 @@ body.outfits-edit #save-success, body.outfits-edit #save-error, body.outfits-edi
margin-top: 1em; margin-top: 1em;
text-align: center; text-align: center;
} }
/* line 722, ../../../app/stylesheets/outfits/_edit.sass */ /* line 723, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-sidebar-donation-request { body.outfits-edit #preview-sidebar-donation-request {
background: #e6efc2; background: #e6efc2;
border: 1px solid #c6d880; border: 1px solid #c6d880;
@ -3231,23 +3232,23 @@ body.outfits-edit #preview-sidebar-donation-request {
font-size: 85%; font-size: 85%;
padding: 1em; padding: 1em;
} }
/* line 727, ../../../app/stylesheets/outfits/_edit.sass */ /* line 728, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-sidebar-donation-request-no-thanks { body.outfits-edit #preview-sidebar-donation-request-no-thanks {
margin-left: 1em; margin-left: 1em;
} }
/* line 730, ../../../app/stylesheets/outfits/_edit.sass */ /* line 731, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #save-success { body.outfits-edit #save-success {
background: #e6efc2; background: #e6efc2;
border: 1px solid #c6d880; border: 1px solid #c6d880;
color: #264409; color: #264409;
} }
/* line 733, ../../../app/stylesheets/outfits/_edit.sass */ /* line 734, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #save-error, body.outfits-edit #outfit-not-found { body.outfits-edit #save-error, body.outfits-edit #outfit-not-found {
background: #fbe3e4; background: #fbe3e4;
border: 1px solid #fbc2c4; border: 1px solid #fbc2c4;
color: #8a1f11; color: #8a1f11;
} }
/* line 736, ../../../app/stylesheets/outfits/_edit.sass */ /* line 737, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #userbar-message { body.outfits-edit #userbar-message {
-moz-opacity: 0.5; -moz-opacity: 0.5;
-webkit-opacity: 0.5; -webkit-opacity: 0.5;
@ -3255,16 +3256,16 @@ body.outfits-edit #userbar-message {
-khtml-opacity: 0.5; -khtml-opacity: 0.5;
display: none; display: none;
} }
/* line 740, ../../../app/stylesheets/outfits/_edit.sass */ /* line 741, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #new-outfit-name { body.outfits-edit #new-outfit-name {
font: inherit; font: inherit;
line-height: 1; line-height: 1;
} }
/* line 744, ../../../app/stylesheets/outfits/_edit.sass */ /* line 745, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #pet-type-form, body.outfits-edit #pet-state-form, body.outfits-edit #preview-swf, body.outfits-edit #preview-search-form { body.outfits-edit #pet-type-form, body.outfits-edit #pet-state-form, body.outfits-edit #preview-swf, body.outfits-edit #preview-search-form {
position: relative; position: relative;
} }
/* line 747, ../../../app/stylesheets/outfits/_edit.sass */ /* line 748, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit .control-overlay { body.outfits-edit .control-overlay {
height: 100%; height: 100%;
left: 0; left: 0;
@ -3273,11 +3274,11 @@ body.outfits-edit .control-overlay {
width: 100%; width: 100%;
z-index: 5; z-index: 5;
} }
/* line 755, ../../../app/stylesheets/outfits/_edit.sass */ /* line 756, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-sidebar-nav-outfits, body.outfits-edit #save-outfit-signed-in { body.outfits-edit #preview-sidebar-nav-outfits, body.outfits-edit #save-outfit-signed-in {
display: none; display: none;
} }
/* line 758, ../../../app/stylesheets/outfits/_edit.sass */ /* line 759, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit form#save-outfit-form { body.outfits-edit form#save-outfit-form {
display: none; display: none;
margin-right: 0; margin-right: 0;
@ -3310,7 +3311,7 @@ body.outfits-edit form#save-outfit-form .outfit-star {
margin-left: -24px; margin-left: -24px;
margin-right: 0; margin-right: 0;
} }
/* line 764, ../../../app/stylesheets/outfits/_edit.sass */ /* line 765, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#save-outfit-form input, body.outfits-edit form#save-outfit-form button { body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#save-outfit-form input, body.outfits-edit form#save-outfit-form button {
display: -moz-inline-box; display: -moz-inline-box;
-moz-box-orient: vertical; -moz-box-orient: vertical;
@ -3324,46 +3325,46 @@ body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#sav
body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#save-outfit-form input, body.outfits-edit form#save-outfit-form button { body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#save-outfit-form input, body.outfits-edit form#save-outfit-form button {
*display: inline; *display: inline;
} }
/* line 769, ../../../app/stylesheets/outfits/_edit.sass */ /* line 770, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit form#save-outfit-form .outfit-star { body.outfits-edit form#save-outfit-form .outfit-star {
margin-top: 0.25em; margin-top: 0.25em;
} }
/* line 772, ../../../app/stylesheets/outfits/_edit.sass */ /* line 773, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit .outfit-url { body.outfits-edit .outfit-url {
font-size: 75%; font-size: 75%;
} }
/* line 775, ../../../app/stylesheets/outfits/_edit.sass */ /* line 776, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-search-form-error { body.outfits-edit #preview-search-form-error {
background: #fbe3e4; background: #fbe3e4;
border: 1px solid #fbc2c4; border: 1px solid #fbc2c4;
color: #8a1f11; color: #8a1f11;
padding: 0.25em 0.5em; padding: 0.25em 0.5em;
} }
/* line 780, ../../../app/stylesheets/outfits/_edit.sass */ /* line 781, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #preview-sidebar-nav-outfits { body.outfits-edit.user-signed-in #preview-sidebar-nav-outfits {
display: block; display: block;
} }
/* line 782, ../../../app/stylesheets/outfits/_edit.sass */ /* line 783, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #save-outfit { body.outfits-edit.user-signed-in #save-outfit {
display: inline-block; display: inline-block;
} }
/* line 786, ../../../app/stylesheets/outfits/_edit.sass */ /* line 787, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-outfit { body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-outfit {
display: none; display: none;
} }
/* line 788, ../../../app/stylesheets/outfits/_edit.sass */ /* line 789, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-current-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-outfit-copy { body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-current-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-outfit-copy {
display: inline-block; display: inline-block;
} }
/* line 796, ../../../app/stylesheets/outfits/_edit.sass */ /* line 797, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit-form { body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit-form {
display: block; display: block;
} }
/* line 798, ../../../app/stylesheets/outfits/_edit.sass */ /* line 799, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-current-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit-copy, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #current-outfit-permalink, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #shared-outfit-permalink, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #share-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #shared-outfit-url { body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-current-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit-copy, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #current-outfit-permalink, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #shared-outfit-permalink, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #share-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #shared-outfit-url {
display: none; display: none;
} }
/* line 800, ../../../app/stylesheets/outfits/_edit.sass */ /* line 801, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in .preview-search-form-your-items { body.outfits-edit.user-signed-in .preview-search-form-your-items {
display: -moz-inline-box; display: -moz-inline-box;
-moz-box-orient: vertical; -moz-box-orient: vertical;
@ -3375,23 +3376,23 @@ body.outfits-edit.user-signed-in .preview-search-form-your-items {
body.outfits-edit.user-signed-in .preview-search-form-your-items { body.outfits-edit.user-signed-in .preview-search-form-your-items {
*display: inline; *display: inline;
} }
/* line 802, ../../../app/stylesheets/outfits/_edit.sass */ /* line 803, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #preview-outfits-not-logged-in { body.outfits-edit.user-signed-in #preview-outfits-not-logged-in {
display: none; display: none;
} }
/* line 804, ../../../app/stylesheets/outfits/_edit.sass */ /* line 805, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-signed-in #preview-outfits-list { body.outfits-edit.user-signed-in #preview-outfits-list {
display: block; display: block;
} }
/* line 808, ../../../app/stylesheets/outfits/_edit.sass */ /* line 809, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit.user-not-signed-in #save-outfit-not-signed-in { body.outfits-edit.user-not-signed-in #save-outfit-not-signed-in {
display: inline-block; display: inline-block;
} }
/* line 812, ../../../app/stylesheets/outfits/_edit.sass */ /* line 813, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #save-outfit-wrapper.shared-outfit #shared-outfit-permalink, body.outfits-edit #save-outfit-wrapper.shared-outfit #shared-outfit-url { body.outfits-edit #save-outfit-wrapper.shared-outfit #shared-outfit-permalink, body.outfits-edit #save-outfit-wrapper.shared-outfit #shared-outfit-url {
display: inline-block; display: inline-block;
} }
/* line 814, ../../../app/stylesheets/outfits/_edit.sass */ /* line 815, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #save-outfit-wrapper.shared-outfit #current-outfit-permalink { body.outfits-edit #save-outfit-wrapper.shared-outfit #current-outfit-permalink {
display: none !important; display: none !important;
} }