Skip to content

Commit

Permalink
wikipedia add logo and colors
Browse files Browse the repository at this point in the history
  • Loading branch information
EggDice committed Nov 17, 2015
1 parent c017a3c commit 5562686
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 6 deletions.
Binary file added week-2/1-layout/project/wiki/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions week-2/1-layout/project/wiki/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
<input type="search">
</form>
</header>
<main>
<main class="main-content">
<h1>
Margaret Hamilton (scientist)
</h1>
<div class="source">

From Wikipedia, the free encyclopedia
</div>
<p class="warning">
<em>
Expand Down Expand Up @@ -67,7 +67,7 @@ <h2>
</footer>
</div>
<aside class="main-sidebar">
Side
<a href="#" class="logo">Wikipedia</a>
</aside>
</body>
</html>
34 changes: 31 additions & 3 deletions week-2/1-layout/project/wiki/style/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,35 @@ body {
margin: 0;
display: flex;
min-height: 100vh;
background: #f6f6f6;
font-family: sans-serif;
}

h1,
h2 {
font-family: serif;
font-weight: normal;
margin: 0;
border-bottom: 1px solid #aaa;
overflow: hidden;
}

h1 {
font-size: 28.8px;
}

.main-container {
background: yellow;
order: 1;
width: 100%;
}

.main-sidebar {
background: aqua;
order: 0;
width: 176px;
flex: 0 0 auto;
}

.main-header {
background: purple;
height: 80px;
position: relative;
}
Expand Down Expand Up @@ -61,6 +73,13 @@ body {
width: 300px;
}

.main-content {
background: #fff;
border: 1px solid #a7d7f9;
border-right: 0;
padding: 16px;
}

.biography {
width: 270px;
background: #f9f9f9;
Expand All @@ -75,3 +94,12 @@ body {
background: silver;``
height: 150px;
}

.logo {
display: block;
width: 135px;
height: 155px;
background: url(../img/logo.png);
margin: 6px auto 0;
color: rgba(0, 0, 0, 0);
}

0 comments on commit 5562686

Please sign in to comment.