Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

allow more than two columns in horizontal form

Browse source
This commit is contained in:
wvengen 2013-12-10 23:41:45 +01:00
parent da737793e8
commit 3f497e9274
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View file

@ -248,17 +248,21 @@ tr.unavailable {
margin: 0; margin: 0;
} }
// two-column layout in forms (landscape tablet and wider only) // multiple-column layout in forms (landscape tablet and wider only)
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .twocol { .form-horizontal .fold-line {
.control-group:nth-child(odd) { .control-group {
float: left; float: left;
} }
.control-group:nth-child(even) { .control-group + .control-group {
.control-label { .control-label {
width: auto; width: auto;
margin: 0 10px; margin: 0 10px;
} }
.controls {
float: left;
margin-left: 0;
}
// fix margin somehow off // fix margin somehow off
// XXX there must be a better way // XXX there must be a better way
margin-bottom: 0; margin-bottom: 0;
@ -267,6 +271,12 @@ tr.unavailable {
margin-bottom: 20px; margin-bottom: 20px;
} }
} }
.control-group:last-child {
float: none;
.controls {
float: none;
}
}
} }
} }
// allow to have indicator text instead of input with same markup // allow to have indicator text instead of input with same markup

5
app/views/articles/_form.html.haml
View file

@ -7,7 +7,7 @@
.modal-body .modal-body
= f.input :availability = f.input :availability
= f.input :name = f.input :name
.twocol .fold-line
= f.input :unit_quantity, label: Article.human_attribute_name(:unit), = f.input :unit_quantity, label: Article.human_attribute_name(:unit),
input_html: {class: 'input-mini', title: Article.human_attribute_name(:unit_quantity)} input_html: {class: 'input-mini', title: Article.human_attribute_name(:unit_quantity)}
= f.input :unit, label: '×'.html_safe, = f.input :unit, label: '×'.html_safe,
@ -17,7 +17,7 @@
= f.association :article_category = f.association :article_category
/ TODO labels / TODO labels
.twocol .fold-line
= f.input :price do = f.input :price do
.input-prepend .input-prepend
%span.add-on= t 'number.currency.format.unit' %span.add-on= t 'number.currency.format.unit'
@ -26,6 +26,7 @@
.input-append .input-append
= f.input_field :tax, class: 'input-mini' = f.input_field :tax, class: 'input-mini'
%span.add-on % %span.add-on %
.fold-line
= f.input :deposit do = f.input :deposit do
.input-prepend .input-prepend
%span.add-on= t 'number.currency.format.unit' %span.add-on= t 'number.currency.format.unit'