From b59e1f43330724fc64689299c12d074d264719ba Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Thu, 19 Jul 2018 18:26:54 +0200 Subject: [PATCH] horizontal scroll for categories --- .../logged/angular/listing-products.html.twig | 64 ++++++++++--------- .../logged/angular/loaded-caisse.html.twig | 5 +- .../views/logged/dashboard.html.twig | 18 ++++-- assets/css/pages/_dashboard.scss | 28 +++++++- 4 files changed, 73 insertions(+), 42 deletions(-) diff --git a/app/Resources/views/logged/angular/listing-products.html.twig b/app/Resources/views/logged/angular/listing-products.html.twig index 4c71634a..bed0d5b1 100755 --- a/app/Resources/views/logged/angular/listing-products.html.twig +++ b/app/Resources/views/logged/angular/listing-products.html.twig @@ -1,35 +1,39 @@ {% verbatim %} -
-
+
+
+
-

- {{ c.name }} -

- - - - +

+ {{ c.name }} +

+
+ + + + +
+
-
+
{% endverbatim %} diff --git a/app/Resources/views/logged/angular/loaded-caisse.html.twig b/app/Resources/views/logged/angular/loaded-caisse.html.twig index 3cef9f0e..8955e9ea 100755 --- a/app/Resources/views/logged/angular/loaded-caisse.html.twig +++ b/app/Resources/views/logged/angular/loaded-caisse.html.twig @@ -5,13 +5,12 @@
-
+
{% include 'logged/angular/messages.html.twig' %} {% include 'logged/angular/listing-products.html.twig' %} -
-
+
{% include 'logged/angular/validate-button.html.twig' %} diff --git a/app/Resources/views/logged/dashboard.html.twig b/app/Resources/views/logged/dashboard.html.twig index 93bdab19..51c6c59b 100755 --- a/app/Resources/views/logged/dashboard.html.twig +++ b/app/Resources/views/logged/dashboard.html.twig @@ -9,7 +9,7 @@ ng-controller="CaisseCtrl as MainCtrl" >
-
+
-
+
Client actuel: {% verbatim %} @@ -69,23 +69,28 @@
+
+
{% include 'logged/caisse-main.html.twig' %} +
{% verbatim %} -
+

+ Visibilité des catégories

-
{{ c.name }} + (caché)
@@ -102,9 +107,10 @@

Historique

- - {% endverbatim %} +{% endverbatim %}
+
+
{% endblock %} diff --git a/assets/css/pages/_dashboard.scss b/assets/css/pages/_dashboard.scss index 8823387f..bdfda7ec 100755 --- a/assets/css/pages/_dashboard.scss +++ b/assets/css/pages/_dashboard.scss @@ -4,14 +4,16 @@ margin-right: 1rem; margin-bottom: 1rem; width: 100%; + float: left; } .product-button { width: 80%; text-overflow-ellipsis: "..."; } .listing-products { + .btn, button { - font-size: 2rem; + font-size: 1.6rem; background: white; padding: 1.5rem; -webkit-border-radius: 1rem; @@ -37,13 +39,33 @@ } +// container of categories +.horizontal-land { + overflow-x: auto; + overflow-y: hidden; + //width: 100%; + height: 80vh; + background: #ccc; + padding: 0.5rem; +} + +// list of one category +.one-category { + background: #dedede; + width: 300px; + margin: 0 4px; + height: calc(80vh - 1rem); + box-sizing: border-box; + display: inline-block; + //vertical-align: top; + white-space: nowrap; + //float: left; +} .category-listing{ border: solid 1px $grey; padding: 1rem; margin: 0.5rem; border-radius: 0.25rem; - width: calc(50% - 2rem); - float: left; } .validate_selling { margin: 0.25rem;