Skip to content

Commit

Permalink
fix(syntax): updated syntax to meet Udacity style guide
Browse files Browse the repository at this point in the history
  • Loading branch information
cameronwp committed Jul 1, 2015
1 parent 603c0b7 commit 2568049
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 67 deletions.
97 changes: 48 additions & 49 deletions css/style.css
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,79 +1,92 @@
* {
body,
div,
ul,
li,
p,
h1,
h2,
h3,
h4,
h5,
h6 {
padding:0;
margin:0;
font-family: 'Roboto', sans-serif;
font-family: "Roboto", sans-serif;
}

.clearfix {
.clear-fix {
overflow: auto;
}

.education-entry, .work-entry, .project-entry {
padding-left: 5%;
padding-right: 5%;
.education-entry,
.work-entry,
.project-entry {
padding: 0 5%;
}

h1 {
font-size: 40px;
color: #F5A623;
color: #f5a623;
line-height: 48px;
display: inline;
}

h2 {
font-weight: bold;
font-size: 24px;
color: #999999;
color: #999;
line-height: 29px;
padding: 10px;
}

h3 {
font-style: italic;
font-size: 20px;
color: #000000;
color: #000;
line-height: 22px;
}

h4 {
font-weight: bold;
font-size: 14px;
color: #4A4A4A;
color: #4a4a4a;
line-height: 17px;
}

h2, h3, h4, h5 {
padding:10px;
padding-left: 5%;
padding-right: 5%;
h2,
h3,
h4,
h5 {
padding:10px 5%;

}


.date-text {
font-style: italic;
font-size: 14px;
color: #999999;
color: #999;
line-height: 16px;
float: left;
}

.location-text {
font-style: italic;
font-size: 14px;
color: #999999;
color: #999;
line-height: 16px;
float: right;

}

p {
font-size: 14px;
color: #333333;
color: #333;
line-height: 21px;
}

a {
color: #1199C3;
color: #1199c3;
text-decoration: none;
margin-top: 10px;
display: block;
Expand All @@ -82,36 +95,36 @@ a {
.welcome-message {
font-style: italic;
font-size: 18px;
color: #F3F3F3;
color: #f3f3f3;
line-height: 28px;
}

#skillsH3 {
color: #F5AE23;
#skills-h3 {
color: #f5ae23;
display: none;
}

.orange {
background-color: #F5AE23;
background-color: #f5ae23;
}

.orange-text {
color: #F5AE23;
color: #f5ae23;
}

.white-text {
font-weight: bold;
color: #FFFFFF;
color: #fff;
}

.gray {
background-color: #F3F3F3;
background-color: #f3f3f3;
padding-bottom: 10px;
clear:both;
}

.dark-gray {
background-color: #4A4A4A;
background-color: #4a4a4a;
}

/* TODO: Replace with image later */
Expand All @@ -129,10 +142,7 @@ a {
}

.center-content {
padding-top: 2.5%;
padding-left: 5%;
padding-right: 5%;
padding-bottom: 2.5%
padding: 2.5% 5%;
}

ul {
Expand All @@ -150,28 +160,18 @@ img {
padding: 10px;
}

/* Bar chart stuff */
.chart div {
font: 10px sans-serif;
background-color: #4A4A4A;
text-align: right;
padding: 3px;
margin: 1px;
height: 12px;
color: white;
display: inline-block;
}

span {
padding: 5px;
}

#letsConnect {
#lets-connect {
text-align: center;
}

/* Media queries to handle various device widths */

@media only screen and (max-width: 1024px) {
#letsConnect {
#lets-connect {
margin-top: 5%;
}
}
Expand All @@ -183,7 +183,7 @@ span {
}

@media only screen and (max-width: 750px) {
#letsConnect {
#lets-connect {
margin-top: 10%;
}
.biopic {
Expand All @@ -197,18 +197,17 @@ span {
#map {
display: block;
height: 100%;
margin-left: 5%;
margin-right: 5%;
margin: 0 5%;
}

#mapDiv {
#map-div {
height: 400px;
width: 100%;
padding-bottom: 5%;
}

@media only screen and (min-width: 750px) {
#skillsH3,
#skills-h3,
.biopic {
display: block;
}
Expand Down
26 changes: 13 additions & 13 deletions index.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<title>Resume</title>

<!-- Load the page styles. -->
<link href="css/style.css" rel="stylesheet" type="text/css">
<link href="css/style.css" rel="stylesheet">

<!--
jQuery is a common JavaScript library for reading and making changes to the
Expand All @@ -46,11 +46,11 @@
Uncomment the <script> tag below when you're ready to add an interactive
Google Map to your resume!
-->
<!-- <script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?libraries=places"></script> -->
<!-- <script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?libraries=places"></script> -->

<meta name="viewport" content="width=device-width">
</head>
<body unresolved>
<body>
<div id="main">
Hello world! <!-- You'll be deleting this line in the course -->

Expand All @@ -60,24 +60,24 @@
resume below. You can pretty easily figure out what each section will
display by looking at the id or at what's written between the <h2> tags.
-->
<div id="header" class="center-content clearfix">
<ul id="topContacts" class='flex-box'></ul>
<div id="header" class="center-content clear-fix">
<ul id="topContacts" class="flex-box"></ul>
</div>
<div style='clear: both;'></div>
<div id="workExperience" class='gray'>
<div style="clear: both;"></div>
<div id="workExperience" class="gray">
<h2>Work Experience</h2>
</div>
<div id="projects">
<h2>Projects</h2>
</div>
<div id="education" class='gray'>
<div id="education" class="gray">
<h2>Education</h2>
</div>
<div id="mapDiv">
<div id="map-div">
<h2>Where I've Lived and Worked</h2>
</div>
<div id="letsConnect" class='dark-gray'>
<h2 class='orange center-text'>Let's Connect</h2>
<div id="lets-connect" class="dark-gray">
<h2 class="orange center-text">Let's Connect</h2>
<ul id="footerContacts" class="flex-box">
</ul>
</div>
Expand Down Expand Up @@ -130,10 +130,10 @@ <h2 class='orange center-text'>Let's Connect</h2>
document.getElementById('education').style.display = 'none';
}
if(document.getElementsByClassName('flex-item').length === 0) {
document.getElementById('letsConnect').style.display = 'none';
document.getElementById('lets-connect').style.display = 'none';
}
if(document.getElementById('map') === null) {
document.getElementById('mapDiv').style.display = 'none';
document.getElementById('map-div').style.display = 'none';
}
</script>
</body>
Expand Down
9 changes: 4 additions & 5 deletions js/helper.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var HTMLlocation = '<li class="flex-item"><span class="orange-text">location</sp
var HTMLbioPic = '<img src="%data%" class="biopic">';
var HTMLwelcomeMsg = '<span class="welcome-message">%data%</span>';

var HTMLskillsStart = '<h3 id="skillsH3">Skills at a Glance:</h3><ul id="skills" class="flex-box"></ul>';
var HTMLskillsStart = '<h3 id="skills-h3">Skills at a Glance:</h3><ul id="skills" class="flex-box"></ul>';
var HTMLskills = '<li class="flex-item"><span class="white-text">%data%</span></li>';

var HTMLworkStart = '<div class="work-entry"></div>';
Expand Down Expand Up @@ -109,9 +109,8 @@ function initializeMap() {
disableDefaultUI: true
};

// This next line makes `map` a new Google Map JavaScript Object and attaches it to
// <div id="map">, which is appended as part of an exercise late in the course.
map = new google.maps.Map(document.querySelector('#map'), mapOptions);

map = new google.maps.Map(document.querySelector('#map-div'), mapOptions);


/*
Expand Down Expand Up @@ -238,6 +237,6 @@ Uncomment the code below when you're ready to implement a Google Map!
// Vanilla JS way to listen for resizing of the window
// and adjust map bounds
//window.addEventListener('resize', function(e) {
// Make sure the map bounds get updated on page resize
//Make sure the map bounds get updated on page resize
// map.fitBounds(mapBounds);
//});
3 changes: 3 additions & 0 deletions js/resumeBuilder.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/*
This is empty on purpose! Your code to build the resume will go here.
*/

0 comments on commit 2568049

Please sign in to comment.