yank tips in favor of border and autofocus for item search
This commit is contained in:
parent
3650525671
commit
868bbcdd41
3 changed files with 11 additions and 40 deletions
|
@ -163,7 +163,8 @@ View.Fullscreen = function (wardrobe) {
|
||||||
if(full) {
|
if(full) {
|
||||||
preview_swf = $('#preview-swf'); // swf replaced
|
preview_swf = $('#preview-swf'); // swf replaced
|
||||||
var available = {
|
var available = {
|
||||||
height: search_el.offset().top - preview_el.offset().top,
|
height: search_el.offset().top -
|
||||||
|
parseInt(search_el.css('marginTop'), 10) - preview_el.offset().top,
|
||||||
width: preview_el.innerWidth() - sidebar_el.outerWidth() - 12 // 12px margin
|
width: preview_el.innerWidth() - sidebar_el.outerWidth() - 12 // 12px margin
|
||||||
}, dim = {}, margin = {}, size = {
|
}, dim = {}, margin = {}, size = {
|
||||||
old: {height: preview_swf.height(), width: preview_swf.width()},
|
old: {height: preview_swf.height(), width: preview_swf.width()},
|
||||||
|
@ -189,7 +190,7 @@ View.Fullscreen = function (wardrobe) {
|
||||||
preview_el.height(available.height);
|
preview_el.height(available.height);
|
||||||
|
|
||||||
// If the footer goes onto two lines, nudge search up.
|
// If the footer goes onto two lines, nudge search up.
|
||||||
search_el.css('bottom', $('#footer').height());
|
search_el.css('bottom', footer.outerHeight(true));
|
||||||
|
|
||||||
// Now that preview is fit, we fit the sidebar's content element, which
|
// Now that preview is fit, we fit the sidebar's content element, which
|
||||||
// also has to deal with the constraint of its navbar's height.
|
// also has to deal with the constraint of its navbar's height.
|
||||||
|
|
|
@ -238,8 +238,13 @@ body.outfits-edit
|
||||||
top: -9999px
|
top: -9999px
|
||||||
width: 30em
|
width: 30em
|
||||||
#preview-search
|
#preview-search
|
||||||
|
+border-radius(8px)
|
||||||
|
border: 1px solid $soft-border-color
|
||||||
|
box-sizing: border-box
|
||||||
clear: both
|
clear: both
|
||||||
padding-top: .5em
|
margin-bottom: .5em
|
||||||
|
margin-top: 1em
|
||||||
|
padding: .25em 1em .25em
|
||||||
text-align: left
|
text-align: left
|
||||||
h2
|
h2
|
||||||
+inline-block
|
+inline-block
|
||||||
|
@ -253,35 +258,11 @@ body.outfits-edit
|
||||||
display: none
|
display: none
|
||||||
#preview-search-advanced
|
#preview-search-advanced
|
||||||
display: block
|
display: block
|
||||||
&.has-results
|
|
||||||
#tips
|
|
||||||
display: none
|
|
||||||
#preview-search-basic-main
|
#preview-search-basic-main
|
||||||
clear: both
|
clear: both
|
||||||
#preview-search-basic-main, #preview-search-advanced-main
|
#preview-search.has-results #preview-search-basic-main, #preview-search-advanced-main
|
||||||
/* don't bounce the header around kthx */
|
/* don't bounce the header around kthx */
|
||||||
min-height: 180px
|
min-height: 180px
|
||||||
#tips
|
|
||||||
padding-top: .5em
|
|
||||||
|
|
||||||
li
|
|
||||||
box-sizing: border-box
|
|
||||||
display: none
|
|
||||||
list-style: none
|
|
||||||
margin: 0 auto
|
|
||||||
padding: 1em
|
|
||||||
position: relative
|
|
||||||
width: 600px
|
|
||||||
|
|
||||||
footer
|
|
||||||
color: $soft-text-color
|
|
||||||
font-size: 85%
|
|
||||||
position: absolute
|
|
||||||
right: 1em
|
|
||||||
top: 1.5em
|
|
||||||
|
|
||||||
a, span
|
|
||||||
margin-left: .5em
|
|
||||||
|
|
||||||
#preview-search-advanced
|
#preview-search-advanced
|
||||||
display: none
|
display: none
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
%form#preview-search-basic.item-search
|
%form#preview-search-basic.item-search
|
||||||
%header
|
%header
|
||||||
%h2= t '.search.header'
|
%h2= t '.search.header'
|
||||||
%input{:name => "query", :type => "search"}/
|
%input{:name => "query", :type => "search", autofocus: true}/
|
||||||
%input{:type => "submit", :value => t('.search.form.submit')}/
|
%input{:type => "submit", :value => t('.search.form.submit')}/
|
||||||
%a#preview-search-advanced-link{href: 'javascript:void(0)'}= t '.search.advanced.header'
|
%a#preview-search-advanced-link{href: 'javascript:void(0)'}= t '.search.advanced.header'
|
||||||
%a#preview-search-form-clear{:href => "#"}= t '.search.form.clear'
|
%a#preview-search-form-clear{:href => "#"}= t '.search.form.clear'
|
||||||
|
@ -107,17 +107,6 @@
|
||||||
#preview-search-form-no-results
|
#preview-search-form-no-results
|
||||||
= t '.search.no_results_html', :query => content_tag(:span)
|
= t '.search.no_results_html', :query => content_tag(:span)
|
||||||
%ul#preview-search-results
|
%ul#preview-search-results
|
||||||
#tips
|
|
||||||
%ul
|
|
||||||
- tips = WardrobeTip.by_index.all
|
|
||||||
- tips.each_with_index do |tip, index|
|
|
||||||
%li
|
|
||||||
%h3 Did you know?
|
|
||||||
%div= md tip.body
|
|
||||||
%footer
|
|
||||||
%a.prev{href: 'javascript:void(0)'} ← Prev
|
|
||||||
%span Tip #{index + 1} of #{tips.size}
|
|
||||||
%a.next{href: 'javascript:void(0)'} Next →
|
|
||||||
%form#preview-search-advanced
|
%form#preview-search-advanced
|
||||||
%header
|
%header
|
||||||
%h2= t '.search.advanced.header'
|
%h2= t '.search.advanced.header'
|
||||||
|
|
Loading…
Reference in a new issue