Merge branch 'master' into branch-phil

vietanhdtd · May 10, 2019 · f313a6a · f313a6a
2 parents 03dc080 + 2e6c39e
commit f313a6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 61 deletions.
diff --git a/index.html b/index.html
@@ -63,39 +63,6 @@ <h4 class="header-subtitle">"Because the platypus both lays eggs and produces mi
             </div>
         </div>
     </header>
-<<<<<<< HEAD
-    <section class="" style="background-color: #D86000">
-        <div class="environment container py-5">
-            <div class="card" style="width: 18rem">
-                <img src="img/platypus-food.webp" class="card-img-top" alt="Platypus and Food">
-                <div class="card-body card-body-flex">
-                    <h5 class="card-title">FOOD</h5>
-                    <p class="card-text">- platypus are carnivores<br /> - they feed on annelid worms, insect larvae,
-                        freshwater shrimp, and freshwater yabby (crayfish)<br /> - platypus eats 20% of its body weight
-                        (equivalent to a 150lb human eating 30lbs of food)</p>
-                    <a href="#" class="btn btn-primary">More Info</a>
-                </div>
-            </div>
-            <div class="card" style="width: 18rem">
-                <img src="img/platypus-environment.jpg" class="card-img-top" alt="Platypus Environment">
-                <div class="card-body card-body-flex">
-                    <h5 class="card-title">ENVIRONMENT</h5>
-                    <p class="card-text">-platypus needs a constant source of water (i.e. freshwater lakes, rivers,
-                        lagoons, farm dams, and streams)<br /> - they are considered nocturnal and are non-sociable.
-                        They tend to only gather during mating season.</p>
-                    <a href="#" class="btn btn-primary">More Info</a>
-                </div>
-            </div>
-            <div class="card " style="width: 18rem">
-                <img src="img/platypus-tips.jpg" class="card-img-top" alt="Some Tips">
-                <div class="card-body card-body-flex">
-                    <h5 class="card-title">EXTRA TIPS</h5>
-                    <p class="card-text">- platypus have venomous barb. Be careful when handling them<br /> - it’s
-                        actually ILLEGAL to own a platypus, bylaw according to Australian wildlife<br /> - Those with a
-                        license to handle platypus can rescue them. After rehab platypus
-                        are released back into the wild.</p>
-                    <a href="#" class="btn btn-primary">More Info</a>
-=======
     <section class="">
         <div class="environment container py-5 ">
             <div class="card environment-card " style="width: 18rem ">
@@ -117,6 +84,7 @@ <h5 class="card-title environment-title">ENVIRONMENT</h5>
                     <a href="# " class="btn btn-primary ">More Info</a>
                 </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 ">
@@ -125,7 +93,6 @@ <h5 class="card-title environment-title">EXTRA TIPS</h5>
                     <p class="card-text environment-text border-top pt-3">it’s actually ILLEGAL to own a platypus, bylaw according to Australian wildlife</p>
                     <p class="card-text environment-text border-top pt-3">Those with a license to handle platypus can rescue them. After rehab platypus are released back into the wild.</p>
                     <a href="# " class="btn btn-primary ">More Info</a>
->>>>>>> 2e6c39ea0b37a723919f4fc34e2581b7599f9e7c
                 </div>
             </div>
         </div>
@@ -157,15 +124,9 @@ <h5 class="card-title employee-name text-danger px-4">ANH</h5>
     </section>
     <footer class="">
         <div class="container row">
-<<<<<<< HEAD
-            <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">
->>>>>>> 2e6c39ea0b37a723919f4fc34e2581b7599f9e7c
                 <div class="list-header"><a class="font-weight-bold">Company</a>
                     <ul class="footer-list text-muted">
                         <li><a>About</a></li>
@@ -189,28 +150,15 @@ <h5 class="card-title employee-name text-danger px-4">ANH</h5>
                     </ul>
                 </div>
             </div>
-<<<<<<< HEAD
-            <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>
-
->>>>>>> 2e6c39ea0b37a723919f4fc34e2581b7599f9e7c
-
         </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/style.css b/style.css
@@ -174,9 +174,6 @@ footer li:hover{
     margin-top: 50px;
     padding-bottom: 70px;
 }
-
-<<<<<<< HEAD
-=======
 .social-media-btn {
     justify-content: center;
     display: flex;
@@ -200,7 +197,7 @@ footer a:hover {
     text-decoration: none;
 }
 
->>>>>>> 2e6c39ea0b37a723919f4fc34e2581b7599f9e7c
+
 /* environment-style */
 
 .card-body-flex {
@@ -225,9 +222,6 @@ footer a:hover {
 .avatar {
     border-radius: 50%;
     width: 200px;
-<<<<<<< HEAD
-}
-=======
 }
 
 #header-button {
@@ -241,4 +235,3 @@ footer a:hover {
 #header-button:hover {
     background-color: black;
 }
->>>>>>> 2e6c39ea0b37a723919f4fc34e2581b7599f9e7c