dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

advanced search behaves toggle-like in that the link stays in place, and OMG pagination on the right is sooo much better!

Browse source
This commit is contained in:
Emi Matchu 2014-04-02 19:03:17 -05:00
parent f12b579c29
commit ce734fae7e
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/assets/stylesheets/outfits/_edit.sass
View file

@ -261,23 +261,28 @@ body.outfits-edit
#preview-search-advanced #preview-search-advanced
display: block display: block
#preview-search-basic > ul #preview-search-basic > ul
clear: both
.object .object
min-height: 150px min-height: 150px
#preview-search-advanced #preview-search-advanced
display: none display: none
margin-left: 2em
h2
margin-right: 2em
button button
margin-right: 2em margin-right: 4em
#preview-search-basic-link #preview-search-basic-link
font-size: 85% font-size: 85%
div div
+inline-block +inline-block
box-sizing: border-box
font-size: 87.5% font-size: 87.5%
margin-top: .5em padding-top: .5em
margin-bottom: 1.5em /* search results height, to prevent header bouncing */
min-height: 178px
vertical-align: top vertical-align: top
width: 32% width: 32%
@ -295,6 +300,9 @@ body.outfits-edit
list-style: none list-style: none
margin-left: -24px margin-left: -24px
div:first-child
margin-left: 2em
#preview-search-advanced-link #preview-search-advanced-link
font-size: 85% font-size: 85%
margin-right: 1em margin-right: 1em
@ -304,14 +312,15 @@ body.outfits-edit
margin-right: 1em margin-right: 1em
#preview-search-form-pagination #preview-search-form-pagination
+inline-block +inline-block
float: right
margin-top: .5em
a, span a, span
margin: 0 .25em margin: 0 .25em
.current .current
font-weight: bold font-weight: bold
#preview-search-form-clear #preview-search-form-clear
display: none display: none
font-size: 87.5% font-size: 85%
margin-left: 2em
#preview-search-form-loading #preview-search-form-loading
display: none display: none
font: font:
@ -352,11 +361,11 @@ body.outfits-edit
bottom: 1.5em bottom: 1.5em
left: 0 left: 0
overflow: auto overflow: auto
padding: 1em 2em padding: 1em 0
position: absolute position: absolute
width: 100% width: 100%
&.has-results &.has-results, &.advanced
padding-bottom: 0 padding-bottom: 0
#footer #footer
bottom: 0 bottom: 0

2
app/views/outfits/edit.html.haml
View file

@ -106,8 +106,8 @@
%input{:type => "submit", :value => t('.search.form.submit')}/ %input{:type => "submit", :value => t('.search.form.submit')}/
-# TODO: i18n -# TODO: i18n
%a#preview-search-advanced-link{href: 'javascript:void(0)'} Advanced Search %a#preview-search-advanced-link{href: 'javascript:void(0)'} Advanced Search
#preview-search-form-pagination
%a#preview-search-form-clear{:href => "#"}= t '.search.form.clear' %a#preview-search-form-clear{:href => "#"}= t '.search.form.clear'
#preview-search-form-pagination
#preview-search-form-loading= t '.search.loading' #preview-search-form-loading= t '.search.loading'
#preview-search-form-error.possible-error #preview-search-form-error.possible-error
#preview-search-form-no-results #preview-search-form-no-results