Archived
"Merging changes"
Merge branch 'flexbox-edit-and-review'
This commit was merged in pull request #1.
This commit is contained in:
+51
-69
@@ -8,75 +8,57 @@
|
||||
<link rel="stylesheet" type="text/css" href="styles/main.css" media="screen" />
|
||||
|
||||
</head>
|
||||
<section>
|
||||
<!-- Parent biography component -->
|
||||
<article class="bio">
|
||||
|
||||
<!-- Child biography component -->
|
||||
<section class="bio__name">
|
||||
<h1>Sally Forthwright</h1>
|
||||
</section>
|
||||
|
||||
<!-- Child biography component -->
|
||||
<section class="bio__address">
|
||||
100 Infinity Way, Nashville
|
||||
</section>
|
||||
|
||||
<!-- Child biography component -->
|
||||
<section class="bio__interests">
|
||||
<div class="interest">
|
||||
Oyster harvesting
|
||||
</div>
|
||||
<div class="interest">
|
||||
Juggling
|
||||
</div>
|
||||
<div class="interest">
|
||||
Triathlons
|
||||
</div>
|
||||
<div class="interest">
|
||||
Killing ants
|
||||
</div>
|
||||
<div class="interest">
|
||||
Melting stuff
|
||||
</div>
|
||||
<div class="interest">
|
||||
Coloring
|
||||
</div>
|
||||
<div class="interest">
|
||||
Sleeping
|
||||
</div>
|
||||
<div class="interest">
|
||||
Singing
|
||||
</div>
|
||||
</section>
|
||||
|
||||
</article>
|
||||
<body>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<header class="pageHeader">Coffee Houses of Nashville</header>
|
||||
|
||||
|
||||
<section class="list">
|
||||
<article class="shop">The Jam</article>
|
||||
<article class="shop">The Well</article>
|
||||
<article class="shop">Red Bicycle</article>
|
||||
<article class="shop">Crema</article>
|
||||
<article class="shop">Frothy Monkey</article>
|
||||
<article class="shop">8th & Roast</article>
|
||||
<article class="shop">Bongo Java</article>
|
||||
<article class="shop">Flatrock</article>
|
||||
<article class="shop">Fido</article>
|
||||
<article class="shop">Steadfast Coffee</article>
|
||||
<article class="shop">Dose Coffee</article>
|
||||
<article class="shop">Sam & Zoes</article>
|
||||
<article class="shop">Slow Hand Coffee</article>
|
||||
<article class="shop">The Horn</article>
|
||||
|
||||
<main>
|
||||
<!-- Child biography component -->
|
||||
<section class="bio__name">
|
||||
<h1>Sally Forthwright</h1>
|
||||
</section>
|
||||
</style>
|
||||
</body>
|
||||
|
||||
<body>
|
||||
|
||||
<section>
|
||||
<!-- Parent biography component -->
|
||||
<article class="bio">
|
||||
|
||||
|
||||
|
||||
<!-- Child biography component -->
|
||||
<section class="bio__address">
|
||||
100 Infinity Way, Nashville
|
||||
</section>
|
||||
|
||||
<!-- Child biography component -->
|
||||
<section class="bio__interests">
|
||||
<div class="interest">
|
||||
Oyster harvesting
|
||||
</div>
|
||||
<div class="interest">
|
||||
Juggling
|
||||
</div>
|
||||
<div class="interest">
|
||||
Triathlons
|
||||
</div>
|
||||
<div class="interest">
|
||||
Killing ants
|
||||
</div>
|
||||
<div class="interest">
|
||||
Melting stuff
|
||||
</div>
|
||||
<div class="interest">
|
||||
Coloring
|
||||
</div>
|
||||
<div class="interest">
|
||||
Sleeping
|
||||
</div>
|
||||
<div class="interest">
|
||||
Singing
|
||||
</div>
|
||||
</section>
|
||||
|
||||
</body>
|
||||
|
||||
</main>
|
||||
|
||||
|
||||
</html>
|
||||
+1
-1
@@ -18,7 +18,7 @@ text-align: center;
|
||||
.bio__interests {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-evenly; /* Evenly space the child elements */
|
||||
float: left; /* Evenly space the child elements */
|
||||
}
|
||||
|
||||
.interest {
|
||||
|
||||
Reference in New Issue
Block a user