midgard/tap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/ZeusWPI/Tab

Browse source
This commit is contained in:
benji 2015-02-20 09:21:24 +01:00
commit 1c6be64e5c
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/orders.css.scss
View file

@ -1,16 +1,17 @@
// Place all the styles related to the Orders controller here. // Place all the styles related to the Orders controller here.
// They will automatically be included in application.css. // They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
.form-control.input-lg {
height:66px;
text-align: center;
}
.big-form-button { .big-form-button {
height: 65px; height: 65px;
width: 65px; width: 65px;
} }
.form-control.big-form-field {
height: 66px;
text-align: center;
}
.form_row_image { .form_row_image {
height: 100px; height: 100px;
width: 100px; width: 100px;

2
app/form_builders/formatted_form_builder.rb
View file

@ -49,7 +49,7 @@ class FormattedFormBuilder < ActionView::Helpers::FormBuilder
def counter(name, options = {}) def counter(name, options = {})
form_group_builder(name, options) do form_group_builder(name, options) do
counter_button("btn-dec", "glyphicon-minus") + counter_button("btn-dec", "glyphicon-minus") +
text_field_without_format(name, options.merge({class: 'form-control input-lg row_counter'})) + text_field_without_format(name, options.merge({class: 'form-control row_counter big-form-field'})) +
counter_button("btn-inc", "glyphicon-plus") counter_button("btn-inc", "glyphicon-plus")
end end
end end

2
app/views/order_items/_total_price.html.erb
View file

@ -2,7 +2,7 @@
<%= f.label :total_price %> <%= f.label :total_price %>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon">&euro;</span> <span class="input-group-addon">&euro;</span>
<%= f.number_field :total_price, skip_label: true, step: :any, class: 'form-control input-lg' %> <%= f.number_field :total_price, skip_label: true, step: :any, class: 'form-control big-form-field' %>
<span class="input-group-btn"> <span class="input-group-btn">
<%= f.submit "Order!", class: "btn btn-primary big-form-button" %> <%= f.submit "Order!", class: "btn btn-primary big-form-button" %>
</span> </span>