made sub projects render as children.

assets/css/default.css

@@ -1043,6 +1043,7 @@ properly.
   /*margin: 36px auto;*/
   text-align: left;
   margin: 0;
+  padding: 0;
 }
 /*.tools ul li {*/
   /*display: inline-block;*/

assets/css/layout.css

@@ -316,10 +316,13 @@ ul#nav li.current a {
   text-transform: uppercase;
   letter-spacing: 1px;
 }
-#skills h1 span {
+#skills span h1 {
   border-bottom: 3px solid #11ABB0;
   padding-bottom: 6px;
 }
+#skills .row.title{
+  margin-bottom: -60px;
+}
 
 /* ------------------------------------------------------------------ */
 
@@ -381,7 +384,7 @@ span.chart h3 {
   text-transform: uppercase;
   letter-spacing: 1px;
 }
-#work h1 span, #education h1 span {
+#work span h1, #education span h1 {
   border-bottom: 3px solid #11ABB0;
   padding-bottom: 6px;
 }
@@ -391,9 +394,6 @@ span.chart h3 {
   line-height: 30px;
   font-weight: 700;
 }
-#work .uber-heading {
-  margin-left: -20px;
-}
 #work .header-col, #education .header-col {
   padding-top: 9px;
 }
@@ -1253,7 +1253,9 @@ footer .social-links li:first-child {
 }
 
 /*extra styles*/
-
+#work .uber-heading {
+  /*margin-left: -20px;*/
+}
 #work .title, #education .title {
   background: #fff;
   padding-bottom: 45px;
@@ -1263,8 +1265,14 @@ footer p {
   font-size: 24px;
   margin-top: 30px;
 }
-.hidden-project-header {
+.project-header {
   cursor: pointer;
+  margin-top: 30px;
+}
+.hidden-project-header {
+  cursor: pointer !important;
+  margin: 0px !important;
+  padding: 0px !important;
 }
 .hidden-project-header:hover {
   color: #11ABB0 !important;
@@ -1274,3 +1282,12 @@ footer p {
 .hidden-project {
   display: none;
 }
+.experience-wrapper{
+  margin-bottom: 30px;
+}
+.experience-wrapper p{
+  /*margin-bottom: 0px;*/
+}
+.project-wrapper {
+  /*margin-top: 30px;*/
+}

package.json

@@ -13,8 +13,8 @@
     "mkdirs": "mkdir dist; mkdir dist/print; mkdir dist/assets; mkdir dist/assets/files; mkdir dist/assets/fonts; mkdir dist/assets/images; mkdir dist/assets/js; mkdir dist/assets/favicons; mkdir dist/assets/css; mkdir dist/inc;",
     "jshint": "jshint assets/js/app.js",
     "min:all": "npm run min:js; npm run min:css; npm run process-html",
-    "min:css": "cleancss --source-map --output dist/assets/css/style.min.css assets/css/*.css",
-    "postcss": "postcss --use postcss-simple-vars postcss-import --output assets/css/output.css assets/css/layout.css",
+    "min:css": "npm run postcss; cleancss --source-map --output dist/assets/css/style.min.css dist/assets/css/style.css",
+    "postcss": "postcss --use postcss-import postcss-simple-vars --output dist/assets/css/style.css src/assets/css/style.css",
     "min:js": "uglifyjs assets/js/jquery.flexslider-2.6.0.js assets/js/jquery.waypoints-4.0.0.js assets/js/waypoints.inview-4.0.0.js  assets/js/jquery.fittext-1.2.js assets/js/jquery.magnific-popup-1.0.1.js assets/js/jquery.nav-3.0.0.js assets/js/jquery.sticky-1.0.3.js assets/js/jquery.easypiechart-2.1.7.js assets/js/app.js --compress --mangle --output dist/assets/js/app.min.js --source-map dist/assets/js/app.min.js.map;",
     "min:html": "html-minifier index.processed.html  --remove-comments --remove-comments-from-cdata --remove-cdatasections-from-cdata --collapse-whitespace --conservative-collapse --preserve-line-breaks --collapse-inline-tag-whitespace --collapse-boolean-attributes --remove-attribute-quotes --prevent-attributes-escaping --use-short-doctype --remove-empty-attributes --remove-script-type-attributes --remove-style-link-type-attributes --minify-js --minify-css --minify-urls --output dist/index.html; rm index.processed.html",
     "copyassets": "cp -r assets/fonts/ dist/assets/fonts; cp print/* dist/print; cp assets/files/* dist/assets/files;  cp assets/images/* dist/assets/images; cp assets/js/Modernizr.js dist/assets/js; cp assets/favicons/* dist/assets/favicons;  cp inc/* dist/inc;",

src/assets/css/style.css

@@ -0,0 +1,9 @@
+@import "../../../assets/css/libre-baskerville.css";
+@import "../../../assets/css/open-sans.css";
+@import "../../../assets/css/fontello.css";
+@import "../../../assets/css/font-awesome.css";
+@import "../../../assets/css/octicons.css";
+@import "../../../assets/css/media-queries.css";
+@import "../../../assets/css/magnific-popup-1.0.1.css";
+@import "../../../assets/css/default.css";
+@import "../../../assets/css/layout.css";

src/buildViews.js

@@ -10,7 +10,7 @@ while (data.skills.length) {
   data.skillRows.push(data.skills.splice(0, 4));
 }
 
-gatherProjects(data.experience);
+data.projects = gatherProjects(data.experience);
 
 templateName = "./print/index-template.html";
 outputPath = "./../print/index.html";
@@ -69,12 +69,14 @@ function gatherProjects(experience) {
   for (var i = 0; i < experience.length; i++) {
     var item = experience[i];
     item.children = [];
+    item.hasChildren = false;
     item.hidden = false;
     if (item.company !== "") {
-      current = experience[i];
+      current = item;
       results.push(current);
     } else {
-      current.children.push(experience[i]);
+      current.hasChildren = true;
+      current.children.push(item);
     }
   }
 
@@ -85,4 +87,6 @@ function gatherProjects(experience) {
       }
     });
   });
+
+  return results;
 }

src/resume.json

@@ -3,8 +3,7 @@
   "intro": {
     "description": "I am an <span>end to end</span> web developer located in Knoxville, Tennessee.<br><span>I solve problems.</span>",
     "profilePic": "head_shot.jpg",
-    "aboutMe": "<p>I am a web developer. I live and work in Knoxville, Tennessee. I work remotely and have for the past eight years. I keep an office in the Bearden area of Knoxville which I share with my Border Collie, Malcolm.</p><p> I have worked with businesses of every size and with technologies spanning the trends of the past fifteen years. The majority of my career has been spent in consulting, but I have worked on small, medium and large teams as an employee as well.</p>",
-    "graphicalResume":"<p>I developed a graphical resume so that you can quickly see the scope of my career. Please download it and take a look.</p>"
+    "aboutMe": "<p>I am a web developer. I live and work in Knoxville, Tennessee. I work remotely and have for the past eight years. I keep an office in the Bearden area of Knoxville which I share with my Border Collie, Malcolm.</p><p> I have worked with businesses of every size and with technologies spanning the trends of the past fifteen years. The majority of my career has been spent in consulting, but I have worked on small, medium and large teams as an employee as well.</p>"
   },
   "socialIcons": [{
     "service": "twitter",

src/web/index-template.html

@@ -28,7 +28,7 @@
 
   {{> skills data=skillRows }}
 
-  {{> experience data=experience }}
+  {{> experience data=projects }}
 
   {{> education data=education }}
 

src/web/partials/__about.html

@@ -14,7 +14,8 @@
       <h2>About Me</h2>
 
       {{{intro.aboutMe}}}
-      {{{intro.graphicalResume}}}
+
+      <p>I developed a graphical resume so that you can quickly see the scope of my career. Please download it and take a look.</p>
 
       <div class="row">
 

src/web/partials/__education.html

@@ -1,18 +1,10 @@
 <section id="education">
 
-  <!-- created a seperate row because title was wrapping -->
-  <div class="row title">
-    <div class="six columns header-col">
-      <h1>
-        <span>Education</span>
-      </h1>
-    </div>
-  </div>
   <!-- Education -->
   <div class="row education">
 
     <div class="three columns header-col">
-      <!-- <h1> <span>Education</span> </h1> -->
+       <span><h1>Education</h1></span> 
     </div>
 
     <div class="nine columns main-col">

src/web/partials/__experience-item.html

@@ -1,43 +1,16 @@
 <!--------------------------- start of record ------------------------------->
-<div class="row item">
-  <div class="twelve columns">
-    {{#if company}}
-      {{#if url}}
-        <h3 class="uber-heading"><a href="{{url}}">{{{company}}}</a></h3>
-      {{else}}
-        <h3 class="uber-heading">{{{company}}}</h3>
-      {{/if}}
-    {{/if}}
-    {{#if location}}
-    <div> <!-- parent wrapper -->
-
-      {{#if hidden}}
-      <p class="info hidden-project-header">
-      {{else}}
-      <p class="info">
-      {{/if}}
-        {{location}}
-        <span>&bull;</span>
-        <em class="date">{{dates}}</em>
-      </p>
-
-      {{#if hidden}}
-      <div class="project hidden-project"><!-- project div -->
-      {{else}}
-      <div class="project"><!-- project div -->
-      {{/if}}
-        <ul class="tools">
-          {{#each tools}}
-            <li class="tool-item ">{{this}}</li>
-          {{/each}}
-        </ul>
-        <p>
-          {{description}}
-        </p>
-      </div><!-- project div end -->
-
-    </div> <!-- end parent wrapper -->
-    {{/if}}
-  </div> <!-- div twelve columns end -->
-</div> <!-- row item end -->
+{{#if company}}
+  {{#if url}}
+    <h3 class="uber-heading"><a href="{{url}}">{{{company}}}</a></h3>
+  {{else}}
+    <h3 class="uber-heading">{{{company}}}</h3>
+  {{/if}}
+{{/if}}
+{{#if data.hasChildren}}
+    {{#each data.children}}
+        {{> project data=this}}
+    {{/each}}
+{{else}}
+    {{> project }}
+{{/if}}
 <!--------------------------- end of record ------------------------------->

src/web/partials/__experience.html

@@ -1,25 +1,18 @@
 <section id="work">
-  <!-- created a seperate row because title was wrapping -->
-  <div class="row title">
-    <div class="six columns header-col">
-      <h1>
-        <span>Professional Experience</span>
-      </h1>
-    </div>
-  </div>
+
   <!-- Work -->
   <div class="row work">
     <!-- title hearder -->
     <div class="three columns header-col">
-      <!-- <h1>
-          <span>Professional Experience</span>
-        </h1> -->
+        <span><h1>Professional<br> Experience</h1></span>
     </div>
     <!-- end title hearder -->
     <div class="nine columns main-col">
       <!-- =============================== Start of Professional Experience ================================   -->
       {{#each data}}
+        <div class="experience-wrapper">
           {{> experience-item data=this}}
+        </div>
       {{/each}}
       <!-- ================================= End of Professional Experience ================================   -->
     </div>

src/web/partials/__project.html

@@ -0,0 +1,32 @@
+<div class="row item">
+  <div class="twelve columns">
+      <div class="project-wrapper"> <!-- project-wrapper -->
+
+        {{#if hidden}}
+        <p class="info hidden-project-header">
+        {{else}}
+        <p class="info">
+        {{/if}}
+          {{location}}
+          <span>&bull;</span>
+          <em class="date">{{dates}}</em>
+        </p>
+
+        {{#if hidden}}
+        <div class="project hidden-project"><!-- project div -->
+        {{else}}
+        <div class="project"><!-- project div -->
+        {{/if}}
+          <ul class="tools">
+            {{#each tools}}
+              <li class="tool-item ">{{this}}</li>
+            {{/each}}
+          </ul>
+          <p>
+            {{description}}
+          </p>
+        </div><!-- project div end -->
+
+      </div> <!-- end parent wrapper -->
+  </div> <!-- div twelve columns end -->
+</div> <!-- row item end -->

src/web/partials/__skills.html

@@ -2,10 +2,8 @@
 <section id="skills">
   <!-- created a seperate row because title was wrapping -->
   <div class="row title">
-    <div class="six columns header-col">
-      <h1>
-        <span>Skills</span>
-      </h1>
+    <div class="three columns header-col">
+        <span><h1>Skills</h1></span>
     </div>
   </div>
   {{#each data}}