Merge pull request #24 from dinfcll/dv_footer

Footer
dinfcll · Nov 21, 2014 · 29ab59b · 29ab59b
2 parents 2189762 + c2381f4
commit 29ab59b
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 4 deletions.
diff --git a/PhotoFun.suo b/PhotoFun.suo
diff --git a/PhotoFun/Content/bootstrap.css b/PhotoFun/Content/bootstrap.css
@@ -29,11 +29,11 @@ summary {
 }
 /******************Ajout*****************/
 .footer {
+  float: right;
   padding-top: 15px;
   color: #777;
   margin-top: 70px;
   border-top: 1px solid #e5e5e5;
-  margin-left: 145px;
 }
 .main
 {

diff --git a/PhotoFun/Views/Shared/_Layout.cshtml b/PhotoFun/Views/Shared/_Layout.cshtml
@@ -62,9 +62,6 @@
                     @RenderBody()
                 </div>   
         </div>
-        <div class="footer">
-             <p>&copy; @DateTime.Now.Year - PhotoFun</p>
-        </div>
     </div>
         @Scripts.Render("~/bundles/jquery")
         @Scripts.Render("~/Scripts/bootstrap.js")

diff --git a/PhotoFun/obj/Debug/PhotoFun.dll b/PhotoFun/obj/Debug/PhotoFun.dll
diff --git a/PhotoFun/obj/Debug/PhotoFun.pdb b/PhotoFun/obj/Debug/PhotoFun.pdb
diff --git a/TestPhotoFun/obj/Debug/TestPhotoFun.csprojResolveAssemblyReference.cache b/TestPhotoFun/obj/Debug/TestPhotoFun.csprojResolveAssemblyReference.cache