diff --git a/app/assets/stylesheets/outfits/_edit.sass b/app/assets/stylesheets/outfits/_edit.sass index fbdaa9a0..51d4ba17 100644 --- a/app/assets/stylesheets/outfits/_edit.sass +++ b/app/assets/stylesheets/outfits/_edit.sass @@ -254,7 +254,7 @@ body.outfits-edit display: block #preview-search-basic > ul 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 */ min-height: 180px #preview-search-advanced @@ -269,10 +269,14 @@ body.outfits-edit #preview-search-basic-link font-size: 85% - div + #preview-search-advanced-main + padding-left: 2em + + #preview-search-advanced-main > div +inline-block box-sizing: border-box font-size: 87.5% + padding-left: 24px padding-top: .5em vertical-align: top width: 32% @@ -291,9 +295,6 @@ body.outfits-edit list-style: none margin-left: -24px - div:first-of-type - margin-left: 2em - #preview-search-advanced-link font-size: 85% margin-right: 1em diff --git a/app/views/outfits/edit.html.haml b/app/views/outfits/edit.html.haml index 3d8f163e..6beb9190 100644 --- a/app/views/outfits/edit.html.haml +++ b/app/views/outfits/edit.html.haml @@ -115,51 +115,52 @@ -# TODO: remove search.examples -# TODO: i18n -# TODO: hook up labels - %div - %ul - %li.text - %label{for: 'advanced-search-name-require'} Name contains - %input{type: 'text', id: 'advanced-search-name-require'} - %li.text - %label{for: 'advanced-search-name-exclude'} Name doesn't contain - %input{type: 'text', id: 'advanced-search-name-exclude'} - %div - %ul - %li.select - %label{for: 'advanced-search-nc'} Only include - %select{id: 'advanced-search-nc'} - %option{value: ''} NC and NP items - %option{value: 'nc'} Neocash items - %option{value: 'np'} Neopoint items - %li.select - %label{for: 'advanced-search-occupies'} Occupies - -# TODO: populate - %select{id: 'advanced-search-occupies'} - %option any zone - %li.select - %label{for: 'advanced-search-restricts'} Restricts - -# TODO: populate - %select{id: 'advanced-search-restricts'} - %option any or no zones - %div - %ul - %li.checkbox - %input{type: 'checkbox', id: 'advanced-search-species'} - %label{for: 'advanced-search-species'} - Fits the - -# TODO: update to current species - %span Acara - (the current species) - -# TODO: hide link if logged in - -# TODO: enable if logged in - %li.checkbox.must-log-in - %input{type: 'checkbox', id: 'advanced-search-owns', disabled: true} - %label{for: 'advanced-search-owns'} Only include items you own - %li.checkbox.must-log-in - %input{type: 'checkbox', id: 'advanced-search-wants', disabled: true} - %label{for: 'advanced-search-wants'} Only include items you want - -# TODO: update return_to - = link_to 'Log in to use these filters.', login_path_with_return_to + %div#preview-search-advanced-main + %div + %ul + %li.text + %label{for: 'advanced-search-name-require'} Name contains + %input{type: 'text', id: 'advanced-search-name-require'} + %li.text + %label{for: 'advanced-search-name-exclude'} Name doesn't contain + %input{type: 'text', id: 'advanced-search-name-exclude'} + %div + %ul + %li.select + %label{for: 'advanced-search-nc'} Only include + %select{id: 'advanced-search-nc'} + %option{value: ''} NC and NP items + %option{value: 'nc'} Neocash items + %option{value: 'np'} Neopoint items + %li.select + %label{for: 'advanced-search-occupies'} Occupies + -# TODO: populate + %select{id: 'advanced-search-occupies'} + %option any zone + %li.select + %label{for: 'advanced-search-restricts'} Restricts + -# TODO: populate + %select{id: 'advanced-search-restricts'} + %option any or no zones + %div + %ul + %li.checkbox + %input{type: 'checkbox', id: 'advanced-search-species'} + %label{for: 'advanced-search-species'} + Fits the + -# TODO: update to current species + %span Acara + (the current species) + -# TODO: hide link if logged in + -# TODO: enable if logged in + %li.checkbox.must-log-in + %input{type: 'checkbox', id: 'advanced-search-owns', disabled: true} + %label{for: 'advanced-search-owns'} Only include items you own + %li.checkbox.must-log-in + %input{type: 'checkbox', id: 'advanced-search-wants', disabled: true} + %label{for: 'advanced-search-wants'} Only include items you want + -# 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'