Skip to content
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

Jump to bottom

Carets - Maria McGrew - Static Site #25

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

Carets - Maria McGrew - Static Site #25

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
a1fb2bf
nav bar
mariamcgrew Sep 17, 2017
cd8b19c
index body complete
mariamcgrew Sep 17, 2017
4c0ab16
index page complete
mariamcgrew Sep 18, 2017
99c674e
portfolio page completed
mariamcgrew Sep 18, 2017
255c53b
completed about page
mariamcgrew Sep 18, 2017
142c1e0
completed journal page
mariamcgrew Sep 18, 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
41 changes: 41 additions & 0 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="styles/normalize.css">
<link rel="stylesheet" href="styles/styles.css">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">

<title>ABOUT</title>
</head>

<body>
<header>
<nav>
<ul>
<li><a href="index.html"> HOME </a></li>
<li><a href="portfolio.html"> PORTFOLIO </a></li>
<li><a href="code_journal.html"> CODE JOURNAL </a></li>
</ul>
</nav>
</header>

<section class="about">
<h2> { MARIA : "about" } </h2>
<article>
<p>
Trying really, really hard. Loves naps.
</p>
</article>
<article>
<img alt="a photo of me" src="assets/me.png" />
</article>
</section>

<div id="footer">
<a href="https://github.com/mcgmar"><img alt="Github logo" src="assets/git_hub.png"/></a>
<a href="https://www.instagram.com/mariamurman/"><img alt="Instagram logo" src="assets/insta.png"/></a>
</div>

</body>
</html>
Binary file added assets/calculator.png
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.
Binary file added assets/git_hub.png
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.
Binary file added assets/hotel.png
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.
Binary file added assets/insta.png
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.
Binary file added assets/me.png
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.
Binary file added assets/solar.png
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.
Binary file added assets/supermarket.png
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.
61 changes: 61 additions & 0 deletions code_journal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="styles/normalize.css">
<link rel="stylesheet" href="styles/styles.css">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">

<title>CODE JOURNAL</title>
</head>
<body>
<header>
<nav>
<ul>
<li><a href="index.html"> HOME </a></li>
<li><a href="portfolio.html"> PORTFOLIO </a></li>
<li><a href="about.html"> ABOUT </a></li>
</ul>
</nav>
</header>

<section class="journal">
<h2> { MARIA : "code journal"} </h2>
<section class="entries">
<article>
<h3> Journal entry #1 </h3>
<p class="entry">
A journal entry
</p>
</article>

<article>
<h3> Journal entry #2 </h3>
<p class="entry">
A journal entry
</p>
</article>

<article>
<h3> Journal entry #3 </h3>
<p class="entry">
A journal entry
</p>
</article>

<article>
<h3> Journal entry #4 </h3>
<p class="entry">
A journal entry
</p>
</article>
</section>
</section>

<div id="footer">
<a href="https://github.com/mcgmar"><img alt="Github logo" src="assets/git_hub.png"/></a>
<a href="https://www.instagram.com/mariamurman/"><img alt="Instagram logo" src="assets/insta.png"/></a>
</div>

</body>
</html>
35 changes: 35 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="styles/normalize.css">
<link rel="stylesheet" href="styles/styles.css">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">

<title>HOME</title>
</head>
<body>
<header>
<nav>
<ul>
<li><a href="portfolio.html"> PORTFOLIO </a></li>
<li><a href="code_journal.html"> CODE JOURNAL </a></li>
<li><a href="about.html"> ABOUT </a></li>
</ul>
</nav>
</header>


<section id="home">
<p>
{ MARIA: "coding" }
</p>
</section>


<div id="footer">
<a href="https://github.com/mcgmar"><img alt="Github logo" src="assets/git_hub.png"/></a>
<a href="https://www.instagram.com/mariamurman/"><img alt="Instagram logo" src="assets/insta.png"/></a>
</div>
</body>
</html>
37 changes: 37 additions & 0 deletions portfolio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="styles/normalize.css">
<link rel="stylesheet" href="styles/styles.css">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">

<title>PORTFOLIO</title>
</head>
<body>
<header>
<nav>
<ul>
<li><a href="index.html"> HOME </a></li>
<li><a href="code_journal.html"> CODE JOURNAL </a></li>
<li><a href="about.html"> ABOUT </a></li>
</ul>
</nav>
</header>

<section class="portfolio">
<h2> { MARIA : "portfolio" } </h2>
<a href="https://github.com/mcgmar/Calculator"><img alt="image of a calculator" src="assets/calculator.png"/></a>
<a href="https://github.com/mcgmar/Solar-System"><img alt="image of a solar system" src="assets/solar.png"/></a>
<a href="https://github.com/mcgmar/grocery-store"><img alt="image of grocery store display" src="assets/supermarket.png"/></a>
<a href="https://github.com/mcgmar/hotel"><img alt="image of a hotel" src="assets/hotel.png"/></a>
</section>


<div id="footer">
<a href="https://github.com/mcgmar"><img alt="Github logo" src="assets/git_hub.png"/></a>
<a href="https://www.instagram.com/mariamurman/"><img alt="Instagram logo" src="assets/insta.png"/></a>
</div>

</body>
</html>
Loading