Skip to content

pull request #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taehh wants to merge 5 commits into
base: master
Choose a base branch
from
Open

pull request #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cadcd7
add index.html
taehh Dec 19, 2018
c2ff966
first commit
taehh Dec 28, 2018
8e31491
second commit
taehh Jan 6, 2019
ab95735
first commit
taehh Jan 16, 2019
80b0e2f
Delete reset.css
taehh Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added css/reset.css
View file
Open in desktop
Empty file.
33 changes: 23 additions & 10 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,49 @@
body
body {
font-size: 14px;
}

/* nav bar style guide */
nav {
background color: yellow;
background-color: yellow;
height: 100px;
margin-top: -10px;
position: fixed;
width: 100%;


section {
margin: 0 auto;
width: 60%;
}

/* header style guide */
h1 {
font-family sans-serif;
font-family: sans-serif;
font-size: 2em;
}

h3 {
font-size: 1.3em;
}

.example, h3 {
padding-top: 30px;
text-align center
text-align: center;
}

h3 {
font-size: 1.3em;
}

/* element style guide */

.element {
background-color: green;
background-color: yellow;
height: 100px;
margin-top: -10px;
position: fixed;
width: 100%;
}

.element2 {
background-color: red;
height: 100px;
margin 10px 0;
margin: 10px;
width: 100%;
}
9 changes: 5 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<head>
<meta charset="utf-8">
<title></title>
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" type="text/css" href="css/reset.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
</head>
<body>
<nav>
Expand All @@ -28,13 +29,13 @@ <h3>This is text for a div element</h3>
<div class="element">
<h3>This is text for a div element</h3>
</div>
<div class="element">
<div class="element2">
<h3>This is text for a div element</h3>
</div>
<div class="element">
<div class="element2">
<h3>This is text for a div element</h3>
</div>
<div class="element">
<div class="element2">
<h3>This is text for a div element</h3>
</div>
</section>
Expand Down