logo img.

vietanhdtd · May 9, 2019 · 7c6a86e · 7c6a86e
2 parents 552a3a3 + 9f6c5d6
commit 7c6a86e
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -21,7 +21,31 @@
             <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">
+        <div class="container">
+            <a href="#" class="navbar-brand">This is Logo</a>
+        </div>
+    </nav>
+    <header class="">
+        <div class="container">
+            <p>try to update</p>
+        </div>
+    </header>
+    <section class="environment">
+        <div class="container">
 
+        </div>
+    </section>
+    <section class="employees">
+        <div class="container">
+
+        </div>
+    </section>
+    <footer class="">
+        <div class="container">
+
+        </div>
+    </footer>
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>

diff --git a/readme.md b/readme.md
@@ -0,0 +1,18 @@
+## Adopt Platypus ##
+
+Create landing page and about us page
+Landing page: A website that will help people to adopt a platypus. It has info on how to care for platypus. It also has about us section. 
+
+
+## Team Members ##
+
+Phil (Product Owner)
+Anh (Scrum Master)
+Austin (DEV)
+
+## View At ##
+
+https://github.com/vietanhdtd/adopt-platypus
+
+
+
diff --git a/style.css b/style.css
@@ -0,0 +1,78 @@
+<<<<<<< HEAD
+* {
+    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;
+=======
+* {
+    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
+}