Merge branch 'dev'

producer/web/css/screen.css

@@ -1489,52 +1489,52 @@ termes.
 }
 /* line 223, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name {
-  font-family: "capsuularegular";
-  font-size: 21px;
+  font-family: "highvoltageregular";
+  font-size: 22px;
   line-height: 30px;
   text-transform: uppercase;
   padding-top: 13px;
 }
-/* line 232, ../sass/order/_order.scss */
+/* line 233, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.photo img {
   width: 100px;
 }
-/* line 238, ../sass/order/_order.scss */
+/* line 239, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .name {
   font-family: "capsuularegular";
   color: black;
   font-size: 20px;
   line-height: 25px;
 }
-/* line 244, ../sass/order/_order.scss */
+/* line 245, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .other {
   font-size: 14px;
   color: #333;
 }
-/* line 248, ../sass/order/_order.scss */
+/* line 249, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .recipe {
   color: gray;
 }
-/* line 252, ../sass/order/_order.scss */
+/* line 253, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit, .order-order #main #app-order-order table#products .price-total {
   width: 100px;
   text-align: center;
 }
-/* line 256, ../sass/order/_order.scss */
+/* line 257, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .unit, .order-order #main #app-order-order table#products .price-total .unit {
   color: gray;
   font-size: 13px;
 }
-/* line 261, ../sass/order/_order.scss */
+/* line 262, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity {
   width: 175px;
 }
-/* line 263, ../sass/order/_order.scss */
+/* line 264, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity input.quantity {
   text-align: center;
   border-right: 0px none;
 }
-/* line 267, ../sass/order/_order.scss */
+/* line 268, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -1542,30 +1542,30 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 277, ../sass/order/_order.scss */
+/* line 278, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .price-total {
   font-size: 23px;
 }
-/* line 285, ../sass/order/_order.scss */
+/* line 286, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .credit .info {
   margin-left: 20px;
   color: gray;
 }
-/* line 291, ../sass/order/_order.scss */
+/* line 292, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .comment {
   margin-bottom: 20px;
 }
-/* line 302, ../sass/order/_order.scss */
+/* line 303, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos {
   margin-top: 30px;
 }
-/* line 304, ../sass/order/_order.scss */
+/* line 305, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos .panel-body {
   padding-top: 0px;
   white-space: pre-line;
 }
 
-/* line 314, ../sass/order/_order.scss */
+/* line 315, ../sass/order/_order.scss */
 #main #content .panel h3 {
   font-family: "highvoltageregular";
   margin: 0px;

producer/web/sass/order/_order.scss

@@ -221,8 +221,9 @@
         table#products {
 
             td.category-name {
-                font-family: "capsuularegular" ;
-                font-size: 21px ;
+                //font-family: "capsuularegular" ;
+                font-family: "highvoltageregular" ;
+                font-size: 22px ;
                 line-height: 30px;
                 text-transform: uppercase;
                 padding-top: 13px ;