Merge branch 'bettin-post-markdown'

swcool · swcool · commit 722aa9e1fe39 · 2015-04-11T20:51:06.000-07:00
diff --git a/_includes/page_content.html b/_includes/page_content.html
@@ -12,7 +12,7 @@
                     <hr class="section-heading-spacer">
                     <div class="clearfix"></div>
                     <h2 class="section-heading">{{ post.title }}</h2>
-                    {{ post.description }}
+                    <div class="lead">{{ post.content }}</div>
                 </div>
                 <div class="col-lg-5 col-lg-offset-2 col-sm-6">
                     <img class="img-responsive" src="img/services/{{ post.img }}" alt="">
@@ -35,7 +35,7 @@ <h2 class="section-heading">{{ post.title }}</h2>
                     <hr class="section-heading-spacer">
                     <div class="clearfix"></div>
                     <h2 class="section-heading">{{ post.title }}</h2>
-                    {{ post.description }}
+                    <div class="lead">{{ post.content }}</div>
                 </div>
                 <div class="col-lg-5 col-sm-pull-6  col-sm-6">
                   <img class="img-responsive" src="img/services/{{ post.img }}" alt="">
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -5,9 +5,9 @@
 	<body>
 		{% include header.html %}
 		{% include about.html %}
-		{% include services.html %}
+		{% include page_content.html %}
 		{% include contact.html %}
 		{% include footer.html %}
 		{% include js.html %}
 	</body>
-</html>
+</html>
diff --git a/_posts/2014-09-21-services-1.markdown b/_posts/2014-09-21-services-1.markdown
@@ -4,9 +4,5 @@ img: ipad.png
 category: Services
 title: Death to the Stock Photo:<br>Special Thanks
 description: |
-  <p class="lead">A special thanks to <a target="_blank"
-  href="http://join.deathtothestockphoto.com/">Death to the Stock
-  Photo</a> for providing the photographs that you see in this template.
-  Visit their website to become a member!</p>
-
 ---
+  A special thanks to [Death to the Stock Photo](http://join.deathtothestockphoto.com/) for providing the photographs that you see in this template.  Visit their website to become a member!
diff --git a/_posts/2014-09-22-services-2.markdown b/_posts/2014-09-22-services-2.markdown
@@ -4,10 +4,7 @@ img: dog.png
 category: Services
 title: 3D Device Mockups<br>by PSDCovers
 description: |
-  <p class="lead">Turn your 2D designs into high quality, 3D
-  product shots in seconds using free Photoshop actions by <a
-  target="_blank" href="http://www.psdcovers.com/">PSDCovers</a>! Visit
-  their website to download some of their awesome, free photoshop
-  actions!</p>
-
 ---
+  Turn your 2D designs into high quality, 3D
+  product shots in seconds using free Photoshop actions by [PSDCovers](http://www.psdcovers.com/)! Visit
+  their website to download some of their awesome, free photoshop actions!
diff --git a/_posts/2014-09-23-services-3.markdown b/_posts/2014-09-23-services-3.markdown
@@ -4,9 +4,5 @@ img: phones.png
 category: Services
 title: Google Web Fonts and<br>Font Awesome Icons
 description: |
-  <p class="lead">This template features the 'Lato' font,
-  part of the <a target="_blank" href="http://www.google.com/fonts">Google
-  Web Font library</a>, as well as <a target="_blank"
-  href="http://fontawesome.io">icons from Font Awesome</a>.</p>
-
 ---
+This template features the 'Lato' font, part of the [Google Web Font library](http://www.google.com/fonts), as well as [icons from Font Awesome](http://fontawesome.io).
