edit the footer

vietanhdtd · May 10, 2019 · c776eb4 · c776eb4
1 parent 54b2372
commit c776eb4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/index.html b/index.html
@@ -112,7 +112,7 @@ <h5 class="card-title employee-name text-danger">ANH</h5>
         <div class="container row">
             <a href="#" class="navbar-brand" style="margin-top: 50px;"><img src="img/platypus-logo.png" alt="Startup-logo"
                     height="85px"></a>
-            <div class="footer-links d-flex col-6">
+            <div class="footer-links d-flex col-7">
                 <div class="list-header"><a class="font-weight-bold">Company</a>
                     <ul class="footer-list text-muted">
                         <li><a>About</a></li>
@@ -136,7 +136,7 @@ <h5 class="card-title employee-name text-danger">ANH</h5>
                     </ul>
                 </div>
             </div>
-                <div class="social-media-btn col-4">
+                <div class="social-media-btn col-3">
                     <ul class="row">
                         <li><a href="#" class="fa fa-instagram"></a></li>
                         <li><a href="#" class="fa fa-twitter"></a></li>

diff --git a/style.css b/style.css
@@ -1,4 +1,4 @@
-/*page-structure*/
+/* page-structure */
 
 * {
     margin: 0;
@@ -42,7 +42,7 @@ header {
 }
 
 footer {
-    background-color: black;
+    background-color: #301818;
     min-height: 100px;
     color: white;
 }
@@ -115,34 +115,33 @@ footer {
 }
 
 /* footer style */
-.container {
+
+
+footer .container  {
     display: flex;
     justify-content: space-between;
     margin: auto;
-
+    padding-top: 30px;
 }
 
-li {
+footer li {
     list-style: none;
     color: #F09048;
 }
-li:hover{
-    color: #D86000;
-    cursor: pointer;
-}
 
-.footer-links {
-
+footer li:hover{
+    color: #189090;
+    cursor: pointer;
 }
 
 .list-header {
-    width: 100%;
+    width: 150px;
     color: #D86000;
     line-height: 50px;
     margin-top: 50px;
+    padding-bottom: 70px;
 }
 
-<<<<<<< HEAD
 .social-media-btn {
     justify-content: center;
     display: flex;
@@ -152,22 +151,20 @@ li:hover{
 .fa {
     margin: 0px 20px 0 0;
     padding: 15px;
-    width: 60px;
-    height: 60px;
-    font-size: 30px;
+    font-size: 50px;
     text-align: center;
     border-radius: 50%;
     color: #D86000;
-    background-color: #222326;
     text-decoration: none;
 }
 .fa:hover{
-    color: #D86000;
+    color: #189090;
     cursor: pointer;
 }
-a:hover {
+footer a:hover {
     text-decoration: none;
-=======
+}
+
 /* environment-style */
 
 .card-body-flex {
@@ -203,6 +200,5 @@ a:hover {
 }
 
 #header-button:hover {
-    background-color: black
->>>>>>> 134d7a8dedcc21a84e6046dc21188c6fdfb55215
+    background-color: black;
 }