add cards

vietanhdtd · May 9, 2019 · df160cb · df160cb
1 parent c494b5f
commit df160cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/index.html b/index.html
@@ -19,15 +19,7 @@
 </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">
@@ -51,15 +43,11 @@
     </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
+                <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>
     </header>
     <section class="" style="background-color: #D86000">
         <div class="environment container py-3">

diff --git a/style.css b/style.css
@@ -13,8 +13,6 @@ body {
 }
 
 nav {
-    background-color: ;
-    min-height: ;
     color: white;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,8 +13,6 @@ body { @@
     }
     nav {
-        background-color: ;
-        min-height: ;
         color: white;
     }
@@ Expand Down @@