Merge pull request #105 from WildCodeSchool/testConcept

maaaj
typhained · May 15, 2020 · f26cada · f26cada
2 parents e5e6d93 + 137dd1d
commit f26cada
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/public/assets/css/public.css b/public/assets/css/public.css
@@ -138,9 +138,10 @@ nav img{
 #footer-flex {
     display: flex;
     justify-content: space-around;
-    background-color: #a2a2a2;
+    background-color: #34344A;
     padding: 20px 0;
 }
+
 footer ul {
    padding: 20px 0;
     margin-top: 0;
@@ -175,4 +176,9 @@ footer a img {
     text-decoration: none;
     color: white;
 }
-/* Fin de Footer */
+/* Fin de Footer */
+
+/* Force icon navbar */
+#icon-search {
+    color: white;
+}
diff --git a/src/View/Concept/create.html.twig b/src/View/Concept/create.html.twig
@@ -44,7 +44,8 @@
                                 </div>
                                 <div class="uk-card-footer uk-text-center">
                                     <p class="uk-text-center">{{ unit.prix }}€</p>
-                                    <a href="./../../BouquetCat/add/{{ unit.id }}"><span uk-icon="icon: plus-circle"></span></a>
+                                    <a href="./../../BouquetCat/add/{{ unit.id_catalogue_unitaire }}">
+                                        <span uk-icon="icon: plus-circle"></span></a>
                                 </div>
                             </div>
                         </li>

diff --git a/src/View/Layout/navbar.html.twig b/src/View/Layout/navbar.html.twig
@@ -1,5 +1,12 @@
 <!-- Menu Desktop -->
 <nav class="uk-navbar-container uk-visible@m" uk-navbar>
+    <div class="uk-navbar-left">
+        <div class="uk-margin-large-left">
+            <a href="/Front/index">
+                <img src="/assets/images/logo.png" />
+            </a>
+        </div>
+    </div>
     <div class="uk-navbar-center">
         <ul class="uk-navbar-nav">
             <li><a href="/Front/index">Strasbouquet</a></li>
@@ -54,7 +61,7 @@
         <div class="uk-navbar-item">
                 <form action="/Front/recherche" method="post">
                     <input class="uk-input uk-form-width-small uk-border-rounded" type="text" name="mot" placeholder="ex: Bouquet">
-                    <button class="uk-button uk-button-primary uk-border-rounded uk-button-small uk-visible@m" type="submit" name="form" value="Rechercher"><span uk-icon="icon: search"></span></button>
+                    <button class="uk-button uk-button-primary uk-border-rounded uk-button-small uk-visible@m" type="submit" name="form" value="Rechercher"><span id="icon-search" uk-icon="icon: search"></span></button>
                 </form>
         </div>
     </div>