Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
new images, getting closer to content
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeMorgan committed Aug 10, 2015
1 parent 2182f46 commit 3a69f88
Show file tree
Hide file tree
Showing 21 changed files with 81 additions and 75 deletions.
4 changes: 1 addition & 3 deletions _data/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

joe_morgan:
name: Joe Morgan
# web: http://thewhip.com
email: [email protected]
bio:
[
"I lead the experience technology group at <a href='http://sapientnitro.com' target='_blank' title='SapientNitro'>SapientNitro</a> in Boston.",
"I'm interesting in learning about devops to improve the experiences that we create for the web."
"A front-end web evangelist and, somewhat recently, a devops enthusiast, I'm a slacker at heart, always looking for ways to work smarter."
]
avatar: Joe.jpg
instagram: stachedaway
Expand Down
3 changes: 0 additions & 3 deletions _data/navigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@

- title: Submit a Post
url: /submission/

# - title: Made Mistakes
# url: http://mademistakes.com
8 changes: 4 additions & 4 deletions _includes/_navigation.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="navigation-wrapper">
<div class="site-name">
<header class="navigation-wrapper">
<h1 class="site-name">
<a href="{{ site.url }}/">{{ site.title }}</a>
</div><!-- /.site-name TODO: Uncomment when ready to launch
</h1>
<div class="top-navigation">
<nav role="navigation" id="site-nav" class="nav">
<ul>
Expand All @@ -16,4 +16,4 @@
</ul>
</nav>
</div><!-- /.top-navigation -->
</div><!-- /.navigation-wrapper -->
</header><!-- /.navigation-wrapper -->
18 changes: 7 additions & 11 deletions _includes/_scripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@
{% if site.owner.google.analytics %}
<!-- Asynchronous Google Analytics snippet -->
<script>
var _gaq = _gaq || [];
var pluginUrl =
'//www.google-analytics.com/plugins/ga/inpage_linkid.js';
_gaq.push(['_require', 'inpage_linkid', pluginUrl]);
_gaq.push(['_setAccount', '{{ site.owner.google.analytics }}']);
_gaq.push(['_trackPageview']);
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-66130276-1', 'auto');
ga('send', 'pageview');

(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
{% endif %}
{% if page.comments %}
Expand Down
67 changes: 42 additions & 25 deletions _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,52 @@

{% include _browser-upgrade.html %}

{% include _navigation.html %}

{% if page.image.feature %}
<div class="image-wrap">
<img src=
{% if page.image.feature contains 'http' %}
"{{ page.image.feature }}"
{% else %}
"{{ site.url }}/images/{{ page.image.feature }}"
<section>
{% include _navigation.html %}
{% if page.image.feature %}
<div class="image-wrap">
<img src=
{% if page.image.feature contains 'http' %}
"{{ page.image.feature }}"
{% else %}
"{{ site.url }}/images/{{ page.image.feature }}"
{% endif %}
alt="{{ page.title }} feature image">
{% if page.image.credit %}
<span class="image-credit">Photo Credit: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></span>
{% endif %}
alt="{{ page.title }} feature image">
{% if page.image.credit %}
<span class="image-credit">Photo Credit: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></span>
</div><!-- /.image-wrap -->
{% endif %}
</div><!-- /.image-wrap -->
{% endif %}
</section>

<div id="main" role="main">

<main id="main" role="main">
<div class="article-author-side">
{% include _author-bio.html %}
</div>
<div id="index">
<!-- <!-- TODO: Uncomment when ready to launch
<h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3> -->
<h1><a href="{{ site.url}}/posts/">Coming Soon</a></h1>
<p>
This blog is scheduled to launch in October. Come back then to join the conversation, or follow me on <a href="http://twitter.com/StachedAway">Twitter</a>.
</p>
<!-- TODO: Uncomment when ready to launch
{% for post in site.posts limit:5 %}

{% for post in site.posts limit:1 %}
<article>
{% if post.link %}
<h1 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a>
<a href="{{ post.link }}" target="_blank" title="{{ post.title }}"><i class="fa fa-link"></i></a></h1>
{% else %}
<h1><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></h1>
{{ post.content | truncate: 1000}}
{% if post.content.size > 1000 %}
<p class="read-more-link">
<a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">Read more</a>
</p>
{% endif %}
{% endif %}
</article>
{% endfor %}

{% if site.posts.size > 1 %}
<section class="recent-posts">
<h3><a href="{{ site.url}}/posts/">Recent Posts</a></h3>
{% for post in site.posts limit:5 offset:1 %}
<article>
{% if post.link %}
<h2 class="link-post"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a>
Expand All @@ -51,9 +67,10 @@ <h2><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.titl
{% endif %}
</article>
{% endfor %}
-->
</section>
{% endif %}
</div><!-- /#index -->
</div><!-- /#main -->
</main><!-- /#main -->

<div class="footer-wrap">
<footer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
layout: post
title: Hello World
author: joe_morgan
excerpt: "Do you feel like you're on the outside of the devops movement, looking in? Are you excited about automation and measurement as tools to improve the way you work, but you don't typically play in the ops space? This is the place for you. Welcome to Devops for the Rest of Us."
tags: [devops, bizdevops, hello world, meta blog]
comments: true
---

Do you feel like you're on the outside of the devops movement, looking in? Are you excited about automation and measurement as tools to improve the way you work, but you don't typically play in the ops space? This is the place for you. Welcome to Devops for the Rest of Us.

## TODO:

This post serves as an introduction to the blog. It will summarize some of the information from the "What is Devops?" and "About" pages (linking to them in the process for more detail). It will also help to set the voice and tone of the blog, but will be fairly short and somewhat of an atypical post.
I lead a group of front-end developers at a [digital ad agency](http://sapientnitro.com "SapientNitro.com") in Boston.

File renamed without changes.
File renamed without changes.
17 changes: 6 additions & 11 deletions _sass/page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ body {
@include grid(12,10);
@include prefix(12,1);
@include suffix(12,1);
margin-bottom: 1em;
float: none;
display: block;
float: none;
line-height:1.3em;
margin-top:0;
@include font-rem(24);
@media #{$small} {
@include grid(12,2);
Expand Down Expand Up @@ -440,14 +441,6 @@ $button-size: 1.5rem;
}
}

/* Post content wrapper */
.article-wrap {
// Dotted line underlines for links
p > a,
li > a {
text-decoration: underline;
}
}

/* Table of contents */
.toc {
Expand Down Expand Up @@ -541,7 +534,9 @@ $button-size: 1.5rem;
}
}
}

.recent-posts{
margin-top:75px;
}
/* Recent grid - not used */
.recent-grid {
@include clearfix;
Expand Down
6 changes: 6 additions & 0 deletions _sass/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ span a {
outline: 0;
}
}
.read-more-link{
font-size:12px !important;
position:relative;
bottom:20px;
}

/*
Figure captions
========================================================================== */
Expand Down
6 changes: 3 additions & 3 deletions about/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ author: joe_morgan
tags: [about, bio, joe, Sapient, CMTOu]
comments: false
image:
feature: sample-image-3.jpg
credit: WeGraphics
creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
feature: night-lights-0.jpg
credit: desktopwallpapers4.me
creditlink: http://www.desktopwallpapers4.me/abstract/blurry-hexagon-lights-10427/
---

## Outline ##
Expand Down
Binary file modified favicon.ico
100755 → 100644
Binary file not shown.
Binary file modified favicon.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/night-lights-0.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/night-lights-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/night-lights-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/night-lights-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: joe_morgan
excerpt: ""
tags: [Jekyll, theme, responsive, blog, template]
image:
feature: sample-image-1.jpg
credit: WeGraphics
creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
feature: night-lights-2.jpg
credit: freeimageslive.co.uk
creditlink: http://www.freeimageslive.co.uk/image/view/1865/_original
---
2 changes: 1 addition & 1 deletion robots.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
User-agent: *
Disallow: /
Disallow:
6 changes: 3 additions & 3 deletions submission/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ author: joe_morgan
tags: [post submission, how-to]
comments: false
image:
feature: sample-image-2.jpg
credit: WeGraphics
creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
feature: night-lights-3.jpg
credit: 4freephotos.com
creditlink: http://www.4freephotos.com/images/batch/Blurred-lights772.jpg
---

## Outline ##
Expand Down
8 changes: 3 additions & 5 deletions what-is-devops/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ author: joe_morgan
tags: [devops, bizdevops, devops-lite]
comments: false
image:
feature: sample-image-2.jpg
credit: WeGraphics
creditlink: http://wegraphics.net/downloads/free-ultimate-blurred-background-pack/
feature: night-lights-1.jpg
credit: static.pexels.com
creditlink: https://static.pexels.com/photos/370/lights-night-dark-abstract.jpeg
---

## Outline ##

This page has much the same point as my WNIN presentation:

1. To provide a brief introduction of devops, setting up the commonly accepted view of devops as automation of operations tasks and the cooperation of development and operations
Expand Down

0 comments on commit 3a69f88

Please sign in to comment.