Merge branch 'master' into barcode

This commit is contained in:
benji 2015-09-21 19:07:03 +02:00
commit 046b2c382c
4 changed files with 8 additions and 2 deletions

View file

@ -19,3 +19,8 @@
width: 150px;
}
}
.warning {
border: 2px solid;
margin-bottom: 20px;
}

View file

@ -40,4 +40,3 @@
%td.total_price.euro
= f.submit "Order!", class: "btn btn-primary form-control"
= render 'products_modal'
- p @order.errors

View file

@ -1,2 +1,4 @@
.warning.center
%h1 TESTFASE | GELIEVE STREEPJES TE BLIJVEN ZETTEN | TESTFASE
.row
= render @users