Merge branch 'master' of https://gitlab.utc.fr/nf17-camp-p14/clivi

css/custom_boostrap.css → css/custom_bootstrap.css

@@ -5,17 +5,12 @@
   /* Set the fixed height of the footer here */
   height: 30px;
   background-color: #108a93;
-}
-
-.footer-container {
-  width: auto;
-  max-width: 680px;
   padding-top: 10px;
   padding-bottom: 0px;
   text-align: center;
+  color: black;
 }
 
 .text-footer {
 	text-align: center;
-	color: black;
 }
\ No newline at end of file

template/footer.php

     <div id="footer">
-      <div class="footer-container">
         <p class="text-footer">NF17 - ©Team CAMP 2014 - Developed by Matthieu GUFFROY, Clément MERCIER, Alexandre CORTYL & Paul GOUJON</p>
-      </div>
     </div>
 
 

template/header.php

@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="http://tuxa.sme.utc/~nf17p110/css/bootstrap.css">
 
     <link href="http://tuxa.sme.utc/~nf17p110/css/sticky-footer.css" rel="stylesheet">
-    
+
     <link rel="stylesheet" href="http://tuxa.sme.utc/~nf17p110/css/custom_bootstrap.css">
 
     <!-- Optional theme -->