Skip to content

Master #7

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
annestarley wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Master #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9610d21
Changes made to header and list
annestarley Jun 2, 2017
71eca25
Grammar
annestarley Jun 2, 2017
5bedf07
updated fonts
annestarley Jun 2, 2017
2731cba
updated font colors
annestarley Jun 2, 2017
18c8906
background color update
annestarley Jun 2, 2017
73f1c72
more background color updates
annestarley Jun 2, 2017
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
Binary file added images/russian-tea-cakes.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 7 additions & 9 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,20 @@
<!-- WEB PAGE CONTENT HERE -->

<div class="pageContainer">
<div class="imageContainer">
<img src="images/cookies.jpg" alt="Tray of Chocolate Chip Cookies." />
<div class="imageContainer">
<img src="images/cookies.jpg" alt="Tray of Chocolate Chip Cookies." />
</div>
<div class="textContainer">
<h1>Cookies!</h1>
<h1>Cookies! Me want cookies..</h1>
<p>My Favorite Cookies: </p>
<ul>
<li>Chocolate Chip</li>
<li>Peanut Butter</li>
<li>Christmas</li>
<li>Pumpkin chocolate chip</li>
<li>Russian Teacake (followed closely by Lemon Teacake)</li>
<li>Molasses</li>
</ul>
<p>The above list is in no permanent order.</p>
</div>
</div>

</body>
</html>



38 changes: 19 additions & 19 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@

/*
/*
STYLE.CSS:
One stylesheet to rule them all.

selector { property:value }

*/

@import url(https://fonts.googleapis.com/css?family=Fredericka+the+Great|Lato);
@import url(https://fonts.googleapis.com/css?family=Barrio|Dosis" rel="stylesheet);


body {
background-color: #431901;
background-color: #A0AAA7;
}

.pageContainer {
width: 940px;
margin: 20px auto 0 auto;
padding: 20px;
background-color: #fff;
background-color: #E8AAA7;
}

.imageContainer {
float: left;
width: 620px;
}

.textContainer {
float: left;
width: 300px;
Expand All @@ -35,30 +36,29 @@ body {
img {
width: 100%;
}

h1 {
font-family: 'Fredericka the Great', cursive;
font-family: 'Barrio', cursive;
font-size: 64px;
color: #411000;
color: #FF603A;
}

p, li {
font-family: 'Lato', sans-serif;
font-family: 'Dosis', sans-serif;
font-size: 22px;
color: #984d26;
color: #FF583A;
}




/* ---- Advanced ---- */
/* This tag is a bit advanced for this lesson,
but is needed to wrap the pageContainer
/* This tag is a bit advanced for this lesson,
but is needed to wrap the pageContainer
around any sized content that is floated within it. */

.pageContainer:after {
.pageContainer:after {
content: " ";
display: table;
clear: both;
}