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

Mary Tian - Spruce #82

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Mary Tian - Spruce #82

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
16 changes: 15 additions & 1 deletion pages/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,23 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="styles.css" rel="stylesheet">
<title>Document</title>
</head>
<body>

<header>
More about Mary Tian
</header>
<h2>
I live in Colorado and I enjoy snowboarding.
</h2>
<nav>
<a href="portfolio.html">
This links to personal portfolio site.
</a>
</nav>
<footer>
Conclusion about Mary Tian
</footer>
</body>
</html>
3 changes: 2 additions & 1 deletion pages/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="indexstyles.css" rel="stylesheet">
<title>Document</title>
</head>
<body>
Mary Tian
</body>
</html>
Empty file added pages/indexstyles.css
View file
Open in desktop
Empty file.
Binary file added pages/istockphoto-1184370791-170667a.jpeg
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.
33 changes: 32 additions & 1 deletion pages/portfolio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,40 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="styles.css" rel="stylesheet">
<title>Document</title>
</head>
<body>

<div class="firstclass">
Task List API:
https://github.com/Ada-C16/task-list-api.git

<p>
There's so much we want to do in the world! When we organize our goals into smaller, bite-sized tasks, we'll be able to track them more easily, and complete them!
</p>
<p>
If we make a web API to organize our tasks, we'll be able to create, read, update, and delete tasks as long as we have access to the Internet and our API is running!
</p>
We also want to do some interesting features with our tasks. We want to be able to:
<p>
Sort tasks
Mark them as complete
Get feedback about our task list through Slack
Organize tasks with goals
</p>
</div>

<img src="istockphoto-1184370791-170667a.jpeg" alt="programmer sitting at computer icon">

<div>
Retro Video Store API:
https://github.com/Ada-C16/retro-video-store.git


<p>
Once upon a time in ye olden days to watch a movie a person had to head down to their local video store and rent a video. We are going to step into the shoes of this old timey retro video store owner and build for ourselves a Video Store API to handle the back end.
</p>
</div>

</body>
</html>
6 changes: 6 additions & 0 deletions pages/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
h2 {color: green}

div {background-color: honeydew;
display: flex}

div.firstclass {background-color: hotpink}