diff --git a/project/assets/css/style.css b/project/assets/css/style.css index 36236e6..88bd686 100644 --- a/project/assets/css/style.css +++ b/project/assets/css/style.css @@ -63,10 +63,16 @@ h2{ font-weight: 600; font-size: 17px; } +<<<<<<< HEAD .test{ height: 300vh; +======= + +.contenue{ + height: 285vh; +>>>>>>> 5029010f15d22427dc323fafc747a1a08afbeb77 } -.test2{ +.articleHome{ margin: auto; text-align: center; margin-top: 100px; @@ -75,7 +81,7 @@ h2{ padding-right: 2%; } @media only screen and (min-width: 992px) { - .test2 { + .articleHome { padding-right: 10%; padding-left: 10%; } @@ -320,6 +326,22 @@ input {outline: none} background-color: #110230; } +.fullFooter{ + height: 220px; + background-color: grey; +} +.iconFooter{ + height: 160px; + background-color: lightgray; + text-align: center; +} + +.iconOnFooter{ + padding-top:125px; + display: inline-block; + color: black; + +} #twi{ height: 18px; width: 18px; @@ -380,7 +402,7 @@ input {outline: none} .test1{ margin-top: 30px; } - .test2{ + .articleHome2{ margin-top:30px; } #titre-home{ @@ -408,7 +430,7 @@ input {outline: none} .test1{ margin-top: 20px; } - .test2{ + .articleHome{ margin-top: 20px; } #titre-home{ diff --git a/project/assets/html/includes/footer.html b/project/assets/html/includes/footer.html index 41679a0..37f6149 100644 --- a/project/assets/html/includes/footer.html +++ b/project/assets/html/includes/footer.html @@ -2,12 +2,14 @@
-
+
- - +
    +
  • +
  • +
-
+
diff --git a/project/assets/html/index.html b/project/assets/html/index.html index c77310d..018b105 100644 --- a/project/assets/html/index.html +++ b/project/assets/html/index.html @@ -6,13 +6,13 @@
-
+

L'actualité de nos campus...

-
+

Ceci est un magnifique titre

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed