Skip to content

Issues with Screenshot comparison #2

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

Issues with Screenshot comparison #2

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
08023c5
Create initial .html
tessasherinsnidal Feb 28, 2016
39789db
create css main
tessasherinsnidal Feb 28, 2016
f2aab00
Write index.html
tessasherinsnidal Feb 28, 2016
f6638bd
write main.css
tessasherinsnidal Feb 28, 2016
b8ca14d
Fix background issues
tessasherinsnidal Feb 29, 2016
33ca888
fixed issues with color
tessasherinsnidal Feb 29, 2016
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
35 changes: 35 additions & 0 deletions blueberries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="en-ca">
<head>
<meta charset="utf-8">
<title>Berries</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link href="css/main.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Sigmar+One" rel="stylesheet">
</head>

<body>

<header>
<h1>Berries</h1>
<nav>
<ul>
<li><a href="index.html">Home</a></li>
<li><a class="current" href="blueberries.html">Blueberries</a></li>
<li><a href="grapes.html">Grapes</a></li>
<li><a href="red-currants.html">Red Currants</a></li>
</ul>
</nav>
</header>

<main>
<h2>Blueberries</h2>
<img src="images/blueberries.jpg" alt="Blueberries">
<p>Blueberries are perennial flowering plants with indigo-colored berries. Most common fruits sold as “blueberries” and are native to North America.</p>
</main>

<footer><small>© Berries.</small></footer>

</body>

</html>
92 changes: 92 additions & 0 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
html {
font: Georgia, serif;
box-sizing: border-box;
}

*, *::before, *::after {
box-sizing: inherit;
}

body {
margin: 0;
}

header {
background-color: #ffe500;
}

h1 {
color: #cc1465;
text-align: center;
text-transform: capitalize;
font-family: "Sigmar One", cursize;
font-size: 3rem;
margin: 0;
padding-left: 0;
padding-bottom: 0;
}

h2 {
color: #cc1465;
text-transform: capitalize;
font-size: 1.875rem;
font-family: "Sigmar One", cursive;
margin: 0;
padding: 0;
}

nav ul {
margin: 0;
padding: 0;
}

nav {
margin: 0;
padding: 1em;
font-size: 1.25em;
list-style-type: none;
text-align: center;
}

nav li {
display: inline-block;
}

nav .current {
background-color: #cc1465;
}

nav a {
padding: .3em .5em;
background-color: #b2a212;
color: #fff;
text-decoration: none;
border-radius: 3.5px;
text-align: center;
}

nav a:hover {
background-color: #b20953;
}

main {
margin: 0.5em;
background-color: #fff;
}

img {
width: 100%;
}

p {
font-size: 1.125rem;
color: #2f2d13;
}

footer {
background-color: #ffe500;
text-align: center;
padding: 1em;
margin: 0;
font-size: 0.75rem;
}
35 changes: 35 additions & 0 deletions grapes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="en-ca">
<head>
<meta charset="utf-8">
<title>Grapes</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link href="css/main.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Sigmar+One" rel="stylesheet">
</head>

<body>

<header>
<h1>Berries</h1>
<nav>
<ul>
<li><a href="index.html">Home</a></li>
<li><a href="blueberries.html">Blueberries</a></li>
<li><a class="current" href="grapes.html">Grapes</a></li>
<li><a href="red-currants.html">Red Currants</a></li>
</ul>
</nav>
</header>

<main>
<h2>Grapes</h2>
<img src="images/grapes.jpg" alt="Grapes">
<p>Grapes can be eaten raw or they can be used for making wine, jam, juice, jelly, grape seed extract, raisins, vinegar, and grape seed oil.</p>
</main>

<footer><small>© Berries.</small></footer>

</body>

</html>
34 changes: 34 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE html>
<html lang="en-ca">
<head>
<meta charset="utf-8">
<title>Berries</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link href="css/main.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Sigmar+One" rel="stylesheet">
</head>

<body>

<header>
<h1>Berries</h1>
<nav>
<ul>
<li><a class="current" href="index.html">Home</a></li>
<li><a href="blueberries.html">Blueberries</a></li>
<li><a href="grapes.html">Grapes</a></li>
<li><a href="red-currants.html">Red Currants</a></li>
</ul>
</nav>
</header>

<main>
<h2>Berries, berries, oh my!</h2>
<p>In everyday English, “berry” is a term for any <strong>small edible fruit.</strong> These “berries” are usually <b>juicy</b>, <b>round</b>, <b>brightly coloured,</b> sweet or sour, and do not have a stone or pit, although many seeds may be present.</p>
</main>

<footer><small>© Berries.</small></footer>

</body>

</html>
35 changes: 35 additions & 0 deletions red-currants.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="en-ca">
<head>
<meta charset="utf-8">
<title>Red Currant</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link href="css/main.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Sigmar+One" rel="stylesheet">
</head>

<body>

<header>
<h1>Berries</h1>
<nav>
<ul>
<li><a href="index.html">Home</a></li>
<li><a href="blueberries.html">Blueberries</a></li>
<li><a href="grapes.html">Grapes</a></li>
<li><a class="current" href="red-currants.html">Red Currants</a></li>
</ul>
</nav>
</header>

<main>
<h2>Red Currants</h2>
<img src="images/red-currants.jpg" alt="Red-Currants">
<p>With maturity, the tart flavour of redcurrant fruit is slightly greater than its blackcurrant relative, but with the same approximate sweetness.</p>
</main>

<footer><small>© Berries.</small></footer>

</body>

</html>