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

Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons

Browse source 
Conflicts:
	app/assets/stylesheets/orders.css.scss
This commit is contained in:
Tleilaxu 2015-02-19 18:13:35 +01:00
parent 0b35bb1f06 7c1dee80ee
commit b9e5c63a9a
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,6 @@
// 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;
@ -16,3 +11,20 @@
height: 66px; height: 66px;
text-align: center; text-align: center;
} }
.form_row_image {
height: 100px;
width: 100px;
margin-left: auto;
margin-right: auto;
position: relative;
}
.form_row_image img {
position: absolute;
top: 0;
bottom: 0;
left: 0;
top: 0;
margin: auto;
}

6
app/views/order_items/_order_item.html.erb
View file

@ -1,9 +1,11 @@
<div class="col-md-3 form_products"> <div class="col-md-3 form_products">
<div class="thumbnail "> <div class="thumbnail ">
<div class="form_row center"> <div class="form_row center">
<%= image_tag product.avatar %> <div class="form_row_image">
<%= image_tag product.avatar %>
</div>
<div class="caption"> <div class="caption">
<%= content_tag :h3, "#{product.name} - #{euro(product.price)}" %> <%= content_tag :h4, "#{product.name} (#{euro(product.price)})" %>
<%= f.counter :count, skip_label: true, wrapper_class: "input-group", class: "row_counter" %> <%= f.counter :count, skip_label: true, wrapper_class: "input-group", class: "row_counter" %>
<%= f.fields_for :product do |product| %> <%= f.fields_for :product do |product| %>
<%= product.hidden_field :price_cents, class: :price %> <%= product.hidden_field :price_cents, class: :price %>