add cards to sections

vietanhdtd · May 9, 2019 · c494b5f · c494b5f
1 parent dafbb36
commit c494b5f
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -19,11 +19,15 @@
 </head>
 
 <body>
+<<<<<<< HEAD
     <!--[if lt IE 7]>
             <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="bg-black fixed-top">
+=======
+    <nav class="bg-black fixed-top row">
+>>>>>>> cc555c3489ae38ebda410d7c134b9c099acf240c
         <div class="container navbar-nav navbar-light navbar-expand-lg py-2">
             <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">
@@ -47,8 +51,15 @@
     </nav>
     <header class="">
         <div class="container">
+<<<<<<< HEAD
 
         </div>
+=======
+            <div class="header-style">
+            <h1 class="header-title">Be a Hero! Resucue 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>
+        </div></div>
+>>>>>>> cc555c3489ae38ebda410d7c134b9c099acf240c
     </header>
     <section class="" style="background-color: #D86000">
         <div class="environment container py-3">