Skip to content

Week One #11

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
daniwhkim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Week One #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
587 changes: 587 additions & 0 deletions css/bootstrap-theme.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap-theme.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions css/bootstrap-theme.min.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap-theme.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6,757 changes: 6,757 additions & 0 deletions css/bootstrap.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

461 changes: 461 additions & 0 deletions css/normalize.css
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 42 additions & 16 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,49 @@
@font-face {
font-family: 'Lato';
/* There are a ton of font options on Google Fonts */
src: url(http://fonts.googleapis.com/css?family=Lato);
.header {
background-color: grey;
padding: 20px 0px;
}

body {
font-family: 'Lato';
.center {
text-align: center;
}

.box {
border: 1px solid #000;
margin: 0 auto;
width: 200px;
height: 75px;
padding: 20px;
img {
width: 20px;
height: 20px;
}

/* this won't affect all spans, only spans that are inside of the box hireacrchy */
.box span {
font-size: 12px;
color: red;
.instruction {
padding: 10px;
}

.instruction p {
float: left;
}

.instruction img {
float: right;
}

.border {
border: 1px solid black;
}

p {
margin: 0px;
padding: 0px;
}

.footer {
background-color: grey;
padding: 20px 0px;
height: 60px;
position: fixed;
bottom: 0px;
width: inherit;
}

@media (max-width: 768px) {
.footer {
width: 100%;
}
}
51 changes: 30 additions & 21 deletions week1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,38 @@
<!-- This is super important and allows our devices to reset the zoom on mobile devices -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- This imports an external style sheet -->
<link rel="stylesheet" type="text/css" href="style.css">
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/normalize.css" rel="stylesheet" type="text/css">
<link href="style.css" rel="stylesheet" type="text/css">
</head>
<body>
<!-- this is document style -->
<style>
a {
color: purple;
}

p {
color:blue;
}
</style>
<h1>This is a heading! I got this style for free!</h1>
<p style="font-size: 10px"> And this is a paragraph with inline style</p>
<a href="http://www.google.com">Oh btw, here's a link. It goes to Google.</a>
<ul>
<li>And this is a list of stuff</li>
<li>More stuff</li>
<li>Stuff x 3</li>
</ul>
<div class="box">
<span>I'm inside a box that gets it style from an external sheet!</span>
<div class="container">
<div class="row header">
<div class="col-md-4 col-sm-4 col-xs-4 center">
<img src="https://cdn2.iconfinder.com/data/icons/ios-7-icons/50/opened_folder-48.png">
</div>
<div class="col-md-4 col-sm-4 col-xs-4 center">Poppy</div>
<div class="col-md-4 col-sm-4 col-xs-4 center">
<img src="https://cdn2.iconfinder.com/data/icons/ios-7-icons/50/info-48.png">
</div>
</div>

<div class="row instruction border">
<div class="col-md-12">
<p>Take a photo of your receipt</p>
<img src="https://cdn2.iconfinder.com/data/icons/4web-3/139/close-48.png">
</div>
</div>

<!-- <div class="row camera-feed"></div> -->

<div class="row offset"></div>

<div class="row footer">
<div class="col-md-12 center">
<img src="https://cdn2.iconfinder.com/data/icons/ios-7-icons/50/photo-48.png">
</div>
</div>
</div>
</body>
</html>