Merge branch 'master' of github.com:WildCodeSchool/orleans-agrickatho…

…n-equipe7
WildCodeSchool · Nov 17, 2016 · dc5b994 · dc5b994
2 parents 6c2a5bd + f6a02c1
commit dc5b994
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/FrontBundle/Resources/views/Default/fondamentaux.html.twig b/src/FrontBundle/Resources/views/Default/fondamentaux.html.twig
@@ -592,9 +592,9 @@
                                                 <div class="modal-body">
                                                     <form action=mailto:votrenom@provider.com" method="post">
                                                         <div class="row">
-                                                            <div class="col-sm-offset-2 col-sm-4">
+                                                            <div class="col-sm-offset-2 col-sm-6">
                                                                 <label>
-                                                                    <h3 class="text-center">Donner nous votre avis !</h3>
+                                                                    <h3 class="text-center">Donnez nous votre avis !</h3>
                                                                     <span>Email* : </span>
                                                                     <input type="email" placeholder="Votre-email@gmail.com" name="email" id="email" required>
                                                                 </label><br/>
@@ -616,6 +616,11 @@
                                                                 </label> <br/>
                                                             </div>
                                                         </div>
+                                                        <div class="row">
+                                                            <div class="col-sm-12">
+                                                                <h3 class="text-center">L'article était t'il pertinent?</h3>
+                                                            </div>
+                                                        </div>
                                                         <div class="row">
                                                             <div class="col-sm-offset-2 col-sm-4">
                                                                 <div class="radio">

diff --git a/src/FrontBundle/Resources/views/Default/index.html.twig b/src/FrontBundle/Resources/views/Default/index.html.twig
@@ -24,7 +24,7 @@
                     <a href="abonnement"><i class="fa fa-at fa-3x" aria-hidden="true"></i> </a>
                     <a href="contact"><i class="fa fa-envelope fa-3x" aria-hidden="true"></i> </a>
                     <a href="soumettre"><i class="fa fa-comments fa-3x" aria-hidden="true"></i> </a>
-                    <i class="fa fa-bell fa-3x" aria-hidden="true"></i>
+                    <a href="#"><i class="fa fa-bell fa-3x" aria-hidden="true"></i> <span class="badge ">4</span></a>
 
                 </div>
             </div>

diff --git a/web/style/style.css b/web/style/style.css
@@ -43,7 +43,7 @@ footer{
     padding-left:130px;
 }
 .fa-at{
-    padding-left:95px;
+    padding-left:60px;
 }
 .fa{
     padding-right: 8px;
@@ -63,4 +63,7 @@ a{
 }
 .textfooter2{
     padding-left:30px;
+}
+.badge{
+    background-color: red;
 }
diff --git a/web/style/stylefondamentaux.css b/web/style/stylefondamentaux.css
@@ -110,8 +110,8 @@ h1 {
 }
 
 
-
 .logomodalfooter{
+
     text-align: left;
 }
 .vignette{
@@ -122,7 +122,7 @@ h1 {
 .icone{
     color: black;
 }
-#optionsRadios2{
+#optionsRadios2 {
     padding-top: 5px;
 }