From d555484769f9545fa546cceb472debad7f6c2572 Mon Sep 17 00:00:00 2001
From: Kayn Ty <tykayn@gmail.com>
Date: Fri, 20 Apr 2018 10:04:29 +0200
Subject: [PATCH] style general

---
 .../views/default/description-app.html.twig   |  9 ++++-
 app/Resources/views/default/footer.html.twig  |  2 +-
 app/Resources/views/default/header.html.twig  | 23 +++--------
 .../views/default/login-choices.html.twig     | 22 +++++------
 .../views/default/main-screen.html.twig       | 13 +++++--
 .../logged/angular/listing-products.html.twig |  6 +--
 assets/css/pages/global.scss                  | 39 +++++++++++++++----
 assets/css/split/formulaires.scss             |  5 +++
 8 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/app/Resources/views/default/description-app.html.twig b/app/Resources/views/default/description-app.html.twig
index a6f456f7..6565bdf2 100644
--- a/app/Resources/views/default/description-app.html.twig
+++ b/app/Resources/views/default/description-app.html.twig
@@ -1,4 +1,4 @@
-<div class="product-values">
+<div class="product-values marged-v">
     <div class="row">
         <div class="col-xs-4 text-center">
             <i class="fa fa-check-circle fa-3x"></i>
@@ -35,7 +35,12 @@
         <div class="col-xs-4 text-center">
             <i class="fa fa-pie-chart fa-3x"></i>
             <h2>Statistiques</h2>
-            <p>Données statistiques et brutes exportables et importables librement.</p>
+            <p>Données statistiques et gestion des stocks actualisée au fur et à mesure des ventes.</p>
+        </div>
+        <div class="col-xs-4 text-center">
+            <i class="fa fa-heart-o fa-3x"></i>
+            <h2>Data Love</h2>
+            <p>Données exportables et importables en masse librement.</p>
         </div>
     </div>
 </div>
diff --git a/app/Resources/views/default/footer.html.twig b/app/Resources/views/default/footer.html.twig
index 90e60cee..3bab2eaa 100755
--- a/app/Resources/views/default/footer.html.twig
+++ b/app/Resources/views/default/footer.html.twig
@@ -1,4 +1,4 @@
-<footer class="big-footer text-center">
+<footer class="big-footer text-center container">
     <sub class="footer-note text-center"> développé par Tykayn /
         <a href="http://www.cipherbliss.com">
             Cipher Bliss
diff --git a/app/Resources/views/default/header.html.twig b/app/Resources/views/default/header.html.twig
index 6bb139b6..5c497da9 100755
--- a/app/Resources/views/default/header.html.twig
+++ b/app/Resources/views/default/header.html.twig
@@ -1,22 +1,11 @@
-<div class="header-block">
+<div class="header-block container">
     <div class="row">
-
-        {% if usersCount is defined %}
-            <div class="col-xs-9">
-                {% include 'default/login-choices.html.twig' %}
-            </div>
-            <div class="col-xs-3">
-                <i class="fa fa-users"></i> {{ usersCount *389 }} utilisateurs
-            </div>
-        {% else %}
-            <div class="col-xs-12">
-                {% include 'default/login-choices.html.twig' %}
-            </div>
-        {% endif %}
-
+        <div class="col-xs-12">
+            {% include 'default/login-choices.html.twig' %}
+        </div>
     </div>
-    <div class="row">
-        <div class="col">
+    <div class="row-fluid">
+        <div class="col-xs-12">
 
             {% if app.request.hasPreviousSession %}
                 {% for type, messages in app.session.flashBag.all %}
diff --git a/app/Resources/views/default/login-choices.html.twig b/app/Resources/views/default/login-choices.html.twig
index 2d3a07de..62d8baa5 100755
--- a/app/Resources/views/default/login-choices.html.twig
+++ b/app/Resources/views/default/login-choices.html.twig
@@ -1,7 +1,7 @@
 {% trans_default_domain 'FOSUserBundle' %}
 {% block loginchoices %}
-    <div class="loginland">
-        <div class="well">
+    <div class="loginland  ">
+        <div class="bg-img padded">
             <div class="login-choices">
                 {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
                     <div class="row">
@@ -15,7 +15,6 @@
                                             btn-default
                                         {% endif %}" href="{{ path('homepage') }}" title="accueil Caisse">
                                             <i class="fa fa-circle-o-notch "></i>
-                                            {#(route actuelle: {{ app.request.attributes.get('_route') }})#}
                                         </a>
                                     <li>
                                     <li>
@@ -106,15 +105,14 @@
 
 
                 {% else %}
-                    {#<a class="btn btn-default btn-block btn-twitter" href="{{ hwi_oauth_login_url('google') }}">#}
-                    {#<i class="fa fa-google"></i>#}
-                    {#Via {{ 'google' | trans({}, 'HWIOAuthBundle') }}#}
-                    {#</a>#}
-                    <br>
-                    <a class="btn btn-primary"
-                            href="{{ path('fos_user_security_login') }}">{{ 'layout.login'|trans }}</a>
-                    <a class="btn btn-default"
-                            href="{{ path('fos_user_registration_register') }}">{{ 'layout.register'|trans }}</a>
+                    <h1 class="text-right">
+                        <a class="btn btn-primary"
+                                href="{{ path('fos_user_security_login') }}">
+                            <i class="fa fa-key"></i>
+                            {{ 'layout.login'|trans }}</a>
+                        <a class="btn btn-default"
+                                href="{{ path('fos_user_registration_register') }}">{{ 'layout.register'|trans }}</a>
+                    </h1>
                 {% endif %}
             </div>
         </div>
diff --git a/app/Resources/views/default/main-screen.html.twig b/app/Resources/views/default/main-screen.html.twig
index 5ef6b55d..e343617e 100755
--- a/app/Resources/views/default/main-screen.html.twig
+++ b/app/Resources/views/default/main-screen.html.twig
@@ -11,6 +11,10 @@
             <a class="btn btn-primary" href="{{ path('fos_user_security_login') }}" class="btn btn-primary">Essayez dès
                 maintenant
             </a>
+            <p>
+                Démonstration en vous connectant avec le login: <strong>demo</strong> et le mot de passe
+                <strong>demo</strong>.
+            </p>
         </div>
     </div>
     {% include 'default/description-app.html.twig' %}
@@ -28,14 +32,15 @@
                     </p>
                 </div>
                 <div class="col-xs-6">
+                    <a class="btn btn-default" href="{{ path('fos_user_security_login') }}">
+                        <i class="fa fa-key"></i>
+                        Se connecter
+                    </a>
                     <a class="btn btn-primary" href="{{ path('fos_user_registration_register') }}">
                         <i class="fa fa-user"></i>
                         Créer un compte
                     </a>
-                    <a class="btn btn-default" href="{{ path('fos_user_security_login') }}">
-                        <i class="fa fa-user"></i>
-                        Se connecter
-                    </a>
+
                 </div>
             </div>
         </fieldset>
diff --git a/app/Resources/views/logged/angular/listing-products.html.twig b/app/Resources/views/logged/angular/listing-products.html.twig
index 3dea295e..d1764eca 100755
--- a/app/Resources/views/logged/angular/listing-products.html.twig
+++ b/app/Resources/views/logged/angular/listing-products.html.twig
@@ -9,8 +9,8 @@ class="btn" ng-class="{'btn-success': expressSelling, 'btn-disabled':!expressSel
     <h2>
         {{ c.name }}
     </h2>
-    <div ng-repeat="p in c.products track by p.id"
-            class="btn btn-default"
+    <span ng-repeat="p in c.products track by p.id"
+            class="product-box"
             ng-class="{ 'btn-primary' : activeItemsSold.indexOf(p.id) !==-1}"
             >
         <button ng-click="addProduct( p )">
@@ -28,7 +28,7 @@ class="btn" ng-class="{'btn-success': expressSelling, 'btn-disabled':!expressSel
          <button ng-if="expressSelling" ng-click="expressSell(p)">
             <i class="fa fa-shopping-cart"></i>
         </button>
-    </div>
+    </span>
 
 </div>
 {% endverbatim %}
diff --git a/assets/css/pages/global.scss b/assets/css/pages/global.scss
index 0a4897fa..8c8378ac 100755
--- a/assets/css/pages/global.scss
+++ b/assets/css/pages/global.scss
@@ -4,24 +4,29 @@ body {
   color: $all-text-color;
 }
 
-#bodyland {
-  padding-top: 1em;
+#wrapper {
+  min-height: 100vh;
 }
 
 .main-screen {
   min-height: 80vh;
 }
 
+h1, .h1, h2, .h2, h3, .h3 {
+  margin-top: 5px;
+  margin-bottom: 0.5em;
+}
+
 .bg-img {
   background-image: url('bg.jpg');
   background-size: cover;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
+  //opacity: 0.2;
+  //filter: alpha(opacity=20);
+  //width: 100vw;
+  //height: 100vh;
+  //position: fixed;
   overflow: hidden;
-  z-index: -1;
+  //z-index: -1;
 }
 
 .logo-main {
@@ -55,3 +60,21 @@ label {
   margin: 0 auto;
   text-align: center;
 }
+
+.padded {
+  padding: 1rem;
+  &-v {
+    padding: 0;
+    padding-top: 1rem;
+    padding-bottom: 1rem;
+  }
+}
+
+.marged {
+  margin: 1rem;
+  &-v {
+    margin: 0;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+  }
+}
diff --git a/assets/css/split/formulaires.scss b/assets/css/split/formulaires.scss
index f3d938c2..474de23c 100755
--- a/assets/css/split/formulaires.scss
+++ b/assets/css/split/formulaires.scss
@@ -11,3 +11,8 @@ table {
 .btn-primary {
   background: $all-text-color;
 }
+
+.product-box {
+  margin-right: 0.5em;
+  margin-bottom: 0.5em;
+}