merge changes with everyone

vietanhdtd · May 10, 2019 · fa07c69 · fa07c69
2 parents 8e9fd11 + 070a5ed
commit fa07c69
Show file tree

Hide file tree

Showing 3 changed files with 426 additions and 299 deletions.
diff --git a/index.html b/index.html
@@ -23,31 +23,42 @@
     <nav class="bg-black fixed-top">
         <div class="container navbar-nav navbar-light navbar-expand-lg py-2 nav-flex">
             <a href="#" class="navbar-brand"><img src="img/platypus-logo.png" alt="Startup-logo" height="45px"></a>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
+                aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav">
                     <li class="nav-item active">
                         <a class="nav-link nav-linkto " href="#">Home <span class="sr-only">(current)</span></a>
-                    </li>
+                    </li>   
                     <li class="nav-item">
                         <a class="nav-link nav-linkto" href="#">About Us</a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link nav-linkto" href="#">Rescued Platypus</a>
+                    </li>
+                    <li class="nav-item res-invisible-1">
+                        <a class="nav-link nav-linkto" href="#">Help A Platypus</a>
+                    </li>
+                    <li class="nav-item res-invisible-1">
+                        <a class="nav-link nav-linkto" href="#">Search</a>
+                    </li>
                 </ul>
             </div>
-            <form class="form-inline">
-                <button class="mx-2 btn btn-nav my-2 my-sm-0" type="submit">HELP A PLATYPUS</button>
-                <button class="mx-2 btn btn-nav my-2 my-sm-0 search-icon" type="submit"><i
-                        class="fas fa-search"></i></button>
-            </form>
+                <form class="form-inline res-invisible-2">
+                    <button class="mx-2 btn btn-nav my-2 my-sm-0" type="submit">HELP A PLATYPUS</button>
+                    <button class="mx-2 btn btn-nav my-2 my-sm-0 search-icon" type="submit"><i
+                            class="fas fa-search"></i></button>
+                </form>
         </div>
     </nav>
     <header class="">
         <div class="container">
             <div class="header-style">
                 <h1 class="header-title">Be a Hero! Rescue a Platypus.</h1>
-                <h4 class="header-subtitle">"Because the platypus both lays eggs and produces milk, <br /> it's one of the few animals that can make it's own custard."</h4>
+                <h4 class="header-subtitle">"Because the platypus both lays eggs and produces milk, <br /> it's one of
+                    the few animals that can make it's own custard."</h4>
                 <button class="mx-2 btn btn-nav my-2 my-sm-0" id="header-button" type="submit">MORE INFO</button>
             </div>
         </div>
@@ -90,6 +101,7 @@ <h4 class="header-subtitle">"Because the platypus both lays eggs and produces mi
                     </div>
                 </div>
             </div>
+
             <div class="card environment-card " style="width: 18rem ">
                 <img src="img/platypus-tips.jpg " class="card-img-top " alt="Some Tips ">
                 <div class="card-body card-body-flex ">
@@ -144,8 +156,9 @@ <h5 class="card-title employee-name text-danger px-4">ANH</h5>
     </section>
     <footer class="">
         <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">
+            <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-7">
                 <div class="list-header"><a class="font-weight-bold">Company</a>
                     <ul class="footer-list text-muted">
                         <li><a>About</a></li>
@@ -169,23 +182,15 @@ <h5 class="card-title employee-name text-danger px-4">ANH</h5>
                     </ul>
                 </div>
             </div>
-            <div class="social-media-btn col-4">
-                <ul class="row">
-                    <li>
-                        <a href="#" class="fa fa-instagram"></a>
-                    </li>
-                    <li>
-                        <a href="#" class="fa fa-twitter"></a>
-                    </li>
-                    <li>
-                        <a href="#" class="fa fa-facebook"></a>
-                    </li>
-                </ul>
-            </div>
-
+                <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>
+                        <li><a href="#" class="fa fa-facebook"></a></li>
+                    </ul>
+                </div>
         </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">

diff --git a/readme.md b/readme.md
@@ -1,17 +1,19 @@
 ## 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. 
+
+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)
+* Phil (*Product Owner*)
+* Anh (*Scrum Master*)
+* Austin (*DEV*)
+* Vy (*DEV*)
 
 ## View At ##
 
+
 https://github.com/vietanhdtd/adopt-platypus