Merge branch 'master' into barcode

2015-09-21 19:07:03 +02:00 · 2015-09-21 19:07:03 +02:00 · 046b2c382c
commit 046b2c382c
parent e9aa52736a 5a538a924b
4 changed files with 8 additions and 2 deletions
--- a/app/assets/stylesheets/overview.css.scss
+++ b/app/assets/stylesheets/overview.css.scss
@ -19,3 +19,8 @@
    width: 150px;
  }
 }
+
+.warning {
+  border: 2px solid;
+  margin-bottom: 20px;
+}
--- a/app/views/orders/new.html.haml
+++ b/app/views/orders/new.html.haml
@ -40,4 +40,3 @@
              %td.total_price.euro
          = f.submit "Order!", class: "btn btn-primary form-control"
 = render 'products_modal'
- p @order.errors
--- a/app/views/orders/overview.html.haml
+++ b/app/views/orders/overview.html.haml
@ -1,2 +1,4 @@
+.warning.center
+  %h1 TESTFASE | GELIEVE STREEPJES TE BLIJVEN ZETTEN | TESTFASE
 .row
  = render @users