Skip to content

Adding Jill Chatham's project to master #22

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 4 commits into
base: master
Choose a base branch
from
Open

Adding Jill Chatham's project to master #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e16bb34
added MYNAME to project list and added project page link
JillChatham Mar 6, 2014
d167017
added background color sass
JillChatham Mar 6, 2014
d04f833
Merge pull request #1 from JillChatham/add-my-project
JillChatham Mar 6, 2014
6fbe3e0
fixed conflicts
JillChatham Mar 6, 2014
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/1957.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.
11 changes: 6 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ <h2 class="name">Becca Naul</h2>
<h3 class="project-name"><a href="projects/project-beccatbd.html">TBD...</a></h3>
<p class="project-description">
Not 100%, but I think I'm going to work with Daniel!

</p>
</div>
</div>
Expand All @@ -108,12 +109,12 @@ <h3 class="project-name">Real Estate/ Restaurant Templates</h3>
<div class="project">
<div class="project-wrap">
<!-- CHANGE TO YOUR OWN PHOTO AND ID -->
<img src="images/project-puppy.jpg" alt="" class="picture" id="YOURNAME">
<h2 class="name">Your Name</h2>
<h3 class="project-name">Your Project Name</h3>
<img src="images/1957.jpg" alt="boxers" class="picture" id="jill">
<h2 class="name">Jill</h2>
<h3 class="project-name">
<a href="projects/project-jillfamilysite.html">A Family Website</a>
<p class="project-description">
Tell us what you'll be working on in 140 characters or less!
</p>
An old people-friendly, simplified and private version of Facebook for my family.
</div>
</div>
<!-- END -->
Expand Down
34 changes: 34 additions & 0 deletions projects/project-jillfamilysite.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!doctype html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Jill Chatham | Project List | MKS Front-End Cohort 1</title>
<link rel="stylesheet" href="../stylesheets/app.css" />
<script src="../bower_components/modernizr/modernizr.js"></script>
</head>

<!-- change the ID here to your name ID. it should be the same as the ID on the .picture div in index.html -->
<body class="project-page" id="jill">

<!-- YOURNAME Project -->
<div class="project">
<div class="project-wrap">
<div class="picture">
<!-- change to your photo URL -->
<img src="../images/1957.jpg" alt="boxers" class="picture" id="jill">
</div>
<h2 class="name">Jill</h2>
<h3 class="project-name">A Family Website</h3>
<p class="project-description">
An old people-friendly, simplified and private version of Facebook for my family. An easy way to share photos, coordinate family events and so much more! My husband will be doing the back-end coding for this project.
</p>
</div>
</div>
<!-- END -->

<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<script src="../bower_components/foundation/js/foundation.min.js"></script>
<script src="../js/app.js"></script>
</body>
</html>
10 changes: 10 additions & 0 deletions scss/custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ $becca-project-color: #faf6bd;
$alex-project-color: #3c2267;

// add your project main color here:

$jill-project-color: #95a5a6;

$scott-project-color: #0f7b85;



$daniel-project-color: #1EE8D4;


Expand All @@ -24,6 +28,11 @@ $daniel-project-color: #1EE8D4;
#sartaj {}


#jill {
@include readable($jill-project-color); // this readable mixin is in color-test.scss. it determines what the font color should be based on your background color!
}




#scott {
Expand All @@ -37,3 +46,4 @@ $daniel-project-color: #1EE8D4;
@include readable($daniel-project-color);

}