Second try to update

vietanhdtd · May 9, 2019 · 421c701 · 421c701
2 parents b5ba126 + d307e2f
commit 421c701
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/img/platypus-logo-symbol-white.png b/img/platypus-logo-symbol-white.png
diff --git a/index.html b/index.html
@@ -28,7 +28,7 @@
     </nav>
     <header class="">
         <div class="container">
-
+            <p>try to update</p>
         </div>
     </header>
     <section class="environment">

diff --git a/style.css b/style.css
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 * {
     margin: 0;
     padding: 0;
@@ -35,4 +36,43 @@ 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;
+}
+
+header {
+    background-color: white;
+    min-height: 400px;
+}
+
+.environment {
+    background-color: black;
+    min-height: 300px;
+    color: white;
+}
+
+.employees {
+    background-color: white;
+    min-height: 300px;
+}
+
+footer {
+    background-color: black;
+    min-height: 100px;
+    color: white;
+>>>>>>> d307e2fcb05f6cc5eae07da5c721160f3b487e5a
 }