update the nav

vietanhdtd · May 9, 2019 · 68bdbc7 · 68bdbc7
1 parent 421c701
commit 68bdbc7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 37 deletions.
diff --git a/img/platypus-logo-symbol-white.png → img/logo.png b/img/platypus-logo-symbol-white.png → img/logo.png
diff --git a/index.html b/index.html
@@ -21,9 +21,10 @@
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-    <nav class="navbar-nav navbar-light bg-light">
+    <nav class="navbar-nav navbar-light py-2 bg-black">
         <div class="container">
-            <a href="#" class="navbar-brand">This is Logo</a>
+            <a href="#" class="navbar-brand"><img src="img/logo.png" alt="Startup-logo" height="40px">
+            </a>
         </div>
     </nav>
     <header class="">

diff --git a/style.css b/style.css
@@ -1,4 +1,5 @@
-<<<<<<< HEAD
+/*page-structure*/
+
 * {
     margin: 0;
     padding: 0;
@@ -36,43 +37,11 @@ footer {
     background-color: black;
     min-height: 100px;
     color: white;
-=======
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
 }
 
-body {
-    font-size: 16px;
-    font-family: Arial, Helvetica, sans-serif;
-}
 
-nav {
-    background-color: ;
-    min-height: ;
-    color: white;
-}
+/*nav-style*/
 
-header {
-    background-color: white;
-    min-height: 400px;
-}
-
-.environment {
-    background-color: black;
-    min-height: 300px;
-    color: white;
-}
-
-.employees {
-    background-color: white;
-    min-height: 300px;
-}
-
-footer {
+.bg-black {
     background-color: black;
-    min-height: 100px;
-    color: white;
->>>>>>> d307e2fcb05f6cc5eae07da5c721160f3b487e5a
 }