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

fix display bug with narrower screens

Browse source
This commit is contained in:
Emi Matchu 2014-04-02 19:25:51 -05:00
parent c20ac77fdd
commit 93a732e027
2 changed files with 52 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -254,7 +254,7 @@ body.outfits-edit
display: block display: block
#preview-search-basic > ul #preview-search-basic > ul
clear: both clear: both
#preview-search-basic > ul, #preview-search-advanced > div #preview-search-basic > ul, #preview-search-advanced-main
/* don't bounce the header around kthx */ /* don't bounce the header around kthx */
min-height: 180px min-height: 180px
#preview-search-advanced #preview-search-advanced
@ -269,10 +269,14 @@ body.outfits-edit
#preview-search-basic-link #preview-search-basic-link
font-size: 85% font-size: 85%
div #preview-search-advanced-main
padding-left: 2em
#preview-search-advanced-main > div
+inline-block +inline-block
box-sizing: border-box box-sizing: border-box
font-size: 87.5% font-size: 87.5%
padding-left: 24px
padding-top: .5em padding-top: .5em
vertical-align: top vertical-align: top
width: 32% width: 32%
@ -291,9 +295,6 @@ body.outfits-edit
list-style: none list-style: none
margin-left: -24px margin-left: -24px
div:first-of-type
margin-left: 2em
#preview-search-advanced-link #preview-search-advanced-link
font-size: 85% font-size: 85%
margin-right: 1em margin-right: 1em

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

@ -115,51 +115,52 @@
-# TODO: remove search.examples -# TODO: remove search.examples
-# TODO: i18n -# TODO: i18n
-# TODO: hook up labels -# TODO: hook up labels
%div %div#preview-search-advanced-main
%ul %div
%li.text %ul
%label{for: 'advanced-search-name-require'} Name contains %li.text
%input{type: 'text', id: 'advanced-search-name-require'} %label{for: 'advanced-search-name-require'} Name contains
%li.text %input{type: 'text', id: 'advanced-search-name-require'}
%label{for: 'advanced-search-name-exclude'} Name doesn't contain %li.text
%input{type: 'text', id: 'advanced-search-name-exclude'} %label{for: 'advanced-search-name-exclude'} Name doesn't contain
%div %input{type: 'text', id: 'advanced-search-name-exclude'}
%ul %div
%li.select %ul
%label{for: 'advanced-search-nc'} Only include %li.select
%select{id: 'advanced-search-nc'} %label{for: 'advanced-search-nc'} Only include
%option{value: ''} NC and NP items %select{id: 'advanced-search-nc'}
%option{value: 'nc'} Neocash items %option{value: ''} NC and NP items
%option{value: 'np'} Neopoint items %option{value: 'nc'} Neocash items
%li.select %option{value: 'np'} Neopoint items
%label{for: 'advanced-search-occupies'} Occupies %li.select
-# TODO: populate %label{for: 'advanced-search-occupies'} Occupies
%select{id: 'advanced-search-occupies'} -# TODO: populate
%option any zone %select{id: 'advanced-search-occupies'}
%li.select %option any zone
%label{for: 'advanced-search-restricts'} Restricts %li.select
-# TODO: populate %label{for: 'advanced-search-restricts'} Restricts
%select{id: 'advanced-search-restricts'} -# TODO: populate
%option any or no zones %select{id: 'advanced-search-restricts'}
%div %option any or no zones
%ul %div
%li.checkbox %ul
%input{type: 'checkbox', id: 'advanced-search-species'} %li.checkbox
%label{for: 'advanced-search-species'} %input{type: 'checkbox', id: 'advanced-search-species'}
Fits the %label{for: 'advanced-search-species'}
-# TODO: update to current species Fits the
%span Acara -# TODO: update to current species
(the current species) %span Acara
-# TODO: hide link if logged in (the current species)
-# TODO: enable if logged in -# TODO: hide link if logged in
%li.checkbox.must-log-in -# TODO: enable if logged in
%input{type: 'checkbox', id: 'advanced-search-owns', disabled: true} %li.checkbox.must-log-in
%label{for: 'advanced-search-owns'} Only include items you own %input{type: 'checkbox', id: 'advanced-search-owns', disabled: true}
%li.checkbox.must-log-in %label{for: 'advanced-search-owns'} Only include items you own
%input{type: 'checkbox', id: 'advanced-search-wants', disabled: true} %li.checkbox.must-log-in
%label{for: 'advanced-search-wants'} Only include items you want %input{type: 'checkbox', id: 'advanced-search-wants', disabled: true}
-# TODO: update return_to %label{for: 'advanced-search-wants'} Only include items you want
= link_to 'Log in to use these filters.', login_path_with_return_to -# TODO: update return_to
= link_to 'Log in to use these filters.', login_path_with_return_to
#no-assets-full-message= t '.sidebar.closet.no_data.description' #no-assets-full-message= t '.sidebar.closet.no_data.description'