From 45b37390a9216f39f87638dc045bb435e000f2fc Mon Sep 17 00:00:00 2001
From: Kayn Ty <tykayn@gmail.com>
Date: Fri, 20 Apr 2018 13:57:10 +0200
Subject: [PATCH] more style split

---
 app/Resources/views/logged/dashboard.html.twig |  8 +++++---
 app/config/config.yml                          |  3 ++-
 app/config/parameters.yml.dist                 |  2 ++
 assets/css/app.scss                            |  1 +
 assets/css/pages/global.scss                   | 11 -----------
 assets/css/pages/main_screen.scss              |  0
 assets/css/split/override_libs.scss            |  0
 assets/css/split/typo.scss                     |  5 +++++
 8 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 assets/css/pages/main_screen.scss
 create mode 100644 assets/css/split/override_libs.scss

diff --git a/app/Resources/views/logged/dashboard.html.twig b/app/Resources/views/logged/dashboard.html.twig
index acf2235f..4fb20573 100755
--- a/app/Resources/views/logged/dashboard.html.twig
+++ b/app/Resources/views/logged/dashboard.html.twig
@@ -26,12 +26,14 @@
                                 Client actuel:
                                 {% verbatim %}
                     {{ activeSelling.length }} produit<span ng-if="activeSelling.length!=1">s</span>
-                    <div>
-                        <input type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
+                    <div class="input-group">
+                     <input class="input form-control input-group" type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
 
-                        <button class="btn btn-default" ng-click="sellingComment = ''">
+                        <button type="button" class="btn btn-default input-group-addon" ng-click="sellingComment = ''">
                             <i class="fa fa-times"></i>
                         </button>
+</div>
+                       <div>
 {% endverbatim %}
                                 {#<button class="btn btn-default" ng-click="sellingComment = 'boobbbbbb'">#}
                                 {#<i class="fa fa-arrow-right"></i>#}
diff --git a/app/config/config.yml b/app/config/config.yml
index 64014810..98217576 100755
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -69,7 +69,8 @@ swiftmailer:
     username: '%mailer_user%'
     password: '%mailer_password%'
     spool: { type: memory }
-
+    encryption: '%mailer_encryption%'
+    port:       '%mailer_port%'
 #fos user bundle
 fos_user:
     db_driver: orm # other valid values are 'mongodb' and 'couchdb'
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index a9a2ebf4..ccf9c97e 100755
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -14,6 +14,8 @@ parameters:
     mailer_host: 127.0.0.1
     mailer_user: root
     mailer_password: ~
+    mailer_encryption: tls
+    mailer_port: 465
 
     # A secret key that's used to generate certain security-related tokens
     secret: ThisTokenIsNotSoSecretChangeIt
diff --git a/assets/css/app.scss b/assets/css/app.scss
index e7f67d33..f9d37c71 100755
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -1,4 +1,5 @@
 @import 'pages/libs';
+@import 'split/override_libs';
 @import 'split/custom_vars';
 @import 'split/formulaires';
 @import 'split/typo';
diff --git a/assets/css/pages/global.scss b/assets/css/pages/global.scss
index 8c8378ac..2a288685 100755
--- a/assets/css/pages/global.scss
+++ b/assets/css/pages/global.scss
@@ -12,21 +12,10 @@ body {
   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;
   overflow: hidden;
-  //z-index: -1;
 }
 
 .logo-main {
diff --git a/assets/css/pages/main_screen.scss b/assets/css/pages/main_screen.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/css/split/override_libs.scss b/assets/css/split/override_libs.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/css/split/typo.scss b/assets/css/split/typo.scss
index abce3c5c..e0478455 100644
--- a/assets/css/split/typo.scss
+++ b/assets/css/split/typo.scss
@@ -1,3 +1,8 @@
 h2, h3, h4, h5, h6 {
   color: mix($dark, $all-text-color);
 }
+
+h1, .h1, h2, .h2, h3, .h3 {
+  margin-top: 5px;
+  margin-bottom: 0.5em;
+}