Index: src/wp-content/themes/twentyfourteen/style.css
===================================================================
--- src/wp-content/themes/twentyfourteen/style.css	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/style.css	(working copy)
@@ -233,23 +233,11 @@
 	font-weight: 400;
 	line-height: 1.5;
 }
-blockquote.pull p {
-	margin-bottom: 17px;
-	margin-bottom: 1.7rem;
-}
-blockquote.pull.alignleft,
-blockquote.pull.alignright {
-	border-top: 1px solid rgba(0, 0, 0, 0.1);
-	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-	padding-top: 17px;
-	padding-top: 1.7rem;
-	width: 50%;
-}
-blockquote.pull.alignleft {
+blockquote.alignleft {
 	margin: 7px 24px 7px 0;
 	margin: 0.7rem 2.4rem 0.7rem 0;
 }
-blockquote.pull.alignright {
+blockquote.alignright {
 	margin: 7px 0 7px 24px;
 	margin: 0.7rem 0 0.7rem 2.4rem;
 }
@@ -362,14 +350,16 @@
 }
 input[type="checkbox"],
 input[type="radio"] {
-	box-sizing: border-box; /* Addresses box sizing set to content-box in IE8/9 */
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	padding: 0; /* Addresses excess padding in IE8/9 */
 }
 input[type="search"] {
 	-webkit-appearance: textfield; /* Addresses appearance set to searchfield in S5, Chrome */
-	-moz-box-sizing: content-box;
-	-webkit-box-sizing: content-box; /* Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof) */
-	box-sizing: content-box;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing:    content-box;
+	box-sizing:         content-box;
 }
 input[type="search"]::-webkit-search-decoration { /* Corrects inner padding displayed oddly in S5, Chrome on OSX */
 	-webkit-appearance: none;
@@ -387,9 +377,11 @@
 textarea {
 	border: 1px solid rgba(0, 0, 0, 0.1);
 	border-radius: 2px;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	color: #2b2b2b;
+	line-height: 1;
 }
 input[type="text"]:focus,
 input[type="email"]:focus,
@@ -519,21 +511,16 @@
 
 body {
 	background-color: #f5f5f5;
-	text-rendering: optimizeLegibility;
 }
 .site {
 	background-color: #fff;
-	max-width: 1230px;
-	max-width: 123.0rem;
+	max-width: 1260px;
+	max-width: 126.0rem;
 	position: relative;
 }
-.site-main {
-	max-width: 1230px;
-	max-width: 123.0rem;
-}
 .content-area {
-	padding-top:24px;
-	padding-top:2.4rem;
+	padding-top: 24px;
+	padding-top: 2.4rem;
 }
 #secondary {
 	background-color: #000;
@@ -546,8 +533,9 @@
 	z-index: 2;
 }
 .content-sidebar {
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	padding: 36px 10px 0;
 	padding: 3.6rem 1.0rem 0;
 	position: relative;
@@ -578,8 +566,8 @@
 
 .site-header {
 	background-color: #000;
-	max-width: 1230px;
-	max-width: 123.0rem;
+	max-width: 1260px;
+	max-width: 126.0rem;
 	position: relative;
 	width: 100%;
 	z-index: 3;
@@ -643,8 +631,9 @@
 }
 .search-toggle {
 	background-color: #24890d;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	color: #fff;
 	display: block;
 	float: left;
@@ -664,9 +653,6 @@
 .search-toggle.active {
 	background-color: #35921f;
 }
-.search-toggle {
-	display: none;
-}
 .search-toggle:hover {
 	cursor: pointer;
 }
@@ -685,8 +671,9 @@
 		left: 50%;
 }
 .search-box-wrapper {
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	position: absolute;
 	width: 100%;
 	z-index: 2;
@@ -729,8 +716,9 @@
 	padding-left: 0;
 }
 .primary-navigation li {
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	display: inline-block;
 	height: 48px;
 	height: 4.8rem;
@@ -836,8 +824,9 @@
 }
 .mobile-navigation {
 	background-color: #000;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	font-size: 14px;
 	font-size: 1.4rem;
 	font-weight: 700;
@@ -884,7 +873,7 @@
 	max-width: 67.2rem;
 }
 .attachment-featured-thumbnail {
-	background: #767676 url(images/pattern.png) repeat 0 0;
+	background: #dfdfdf url(images/pattern.png) repeat 0 0;
 	background-size: 5px 5px;
 	display: block;
 	float: none;
@@ -896,6 +885,13 @@
 	height: auto;
 	z-index: 0;
 }
+.attachment-featured-thumbnail:hover {
+	background-color: #767676;
+}
+.full-width .attachment-featured-thumbnail img {
+	display: block;
+	margin: 0 auto;
+}
 .entry-header {
 	position: relative;
 	z-index: 1;
@@ -963,7 +959,8 @@
 	z-index: 2;
 }
 .entry-content a,
-.page-content a, {
+.page-content a,
+.entry-summary a {
 	text-decoration: underline;
 }
 .entry-content table,
@@ -996,12 +993,33 @@
 	margin-bottom: 24px;
 	margin-bottom: 2.4rem;
 }
+.entry-content blockquote.alignleft,
+.entry-content blockquote.alignright {
+	border-top: 1px solid rgba(0, 0, 0, 0.1);
+	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+	padding-top: 17px;
+	padding-top: 1.7rem;
+	width: 50%;
+}
+.entry-content blockquote.alignleft p,
+.entry-content blockquote.alignright p {
+	margin-bottom: 17px;
+	margin-bottom: 1.7rem;
+}
 footer.entry-meta {
 	margin-bottom: 36px;
 	margin-bottom: 3.6rem;
 }
 
 /* .content-area specific styles */
+.content-area .entry-header,
+.content-area .entry-content,
+.content-area .entry-summary,
+.content-area .entry-meta {
+	margin: 0 auto;
+	max-width: 474px;
+	max-width: 47.4rem;
+}
 .content-area .entry-header {
 	background-color: #fff;
 	padding: 24px 10px 12px;
@@ -1023,8 +1041,8 @@
 	text-transform: uppercase;
 }
 .content-area .entry-content,
-.content-area .page-content,
-.content-area .entry-summary {
+.content-area .entry-summary,
+.page-content {
 	background-color: #fff;
 	padding: 12px 10px 0;
 	padding: 1.2rem 1.0rem 0;
@@ -1035,9 +1053,9 @@
 	padding: 0 10px;
 	padding: 0 1.0rem;
 }
-.content-area footer.entry-meta .entry-meta {
-	margin-bottom: 24px;
-	margin-bottom: 2.4rem;
+.content-area footer.entry-meta {
+	margin-bottom: 36px;
+	margin-bottom: 3.6rem;
 }
 .content-area footer.entry-meta .entry-title {
 	font-size: 12px;
@@ -1066,7 +1084,7 @@
 .format-quote .entry-content,
 .format-quote .entry-summary,
 .format-link .entry-content,
-.format-link.entry-summary	{
+.format-link.entry-summary {
 	padding-top: 0;
 }
 
@@ -1087,6 +1105,11 @@
 }
 
 /* Page specific styles */
+.page-content {
+	margin: 0 auto;
+	max-width: 474px;
+	max-width: 47.4rem;
+}
 .page .entry-header,
 .page .entry-content,
 .error404 .page-header,
@@ -1225,10 +1248,9 @@
 }
 .archive-header,
 .page-header {
-	margin: 0 0 24px;
-	margin: 0 0 2.4rem;
-	padding: 0 10px;
-	padding: 0 1.0rem;
+	margin: 0 auto 12px;
+	margin: 0 auto 1.3rem;
+	max-width: 474px;
 }
 .archive-title,
 .page-title {
@@ -1262,10 +1284,6 @@
 .front-page-content-wrapper {
 	width: 100%;
 }
-.front-page-content-area {
-	max-width: 1230px;
-	max-width: 123.0rem;
-}
 
 
 /* =Featured Content
@@ -1274,8 +1292,9 @@
 #featured-content {
 	background: #000 url(images/pattern-dark.png) repeat 0 0;
 	background-size: 5px 5px;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	width: 100%;
 }
 #featured-content .hentry {
@@ -1352,9 +1371,12 @@
 .ephemera {
 	border-top: 1px solid rgba(0, 0, 0, 0.1);
 	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	clear: both;
+	margin: 0 auto;
+	max-width: 494px;
 	padding: 23px 10px 0;
 	padding: 2.3rem 1.0rem 0;
 }
@@ -1476,6 +1498,14 @@
 }
 
 
+/* =Full-width
+----------------------------------------------- */
+
+.full-width .hentry {
+	max-width: 100%;
+}
+
+
 /* =404 Page
 ----------------------------------------------- */
 
@@ -1546,8 +1576,9 @@
 	max-width: 100%;
 }
 .wp-caption-text {
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	font-size: 12px;
 	font-size: 1.2rem;
 	font-style: italic;
@@ -1671,20 +1702,25 @@
 }
 .post-navigation,
 .image-navigation {
+	margin: 24px auto;
+	margin: 2.4rem auto;
+	max-width: 474px;
+	padding: 0 10px;
+}
+.nav-links {
 	border-top: 1px solid rgba(0, 0, 0, 0.1);
-	margin: 24px 0 0;
-	margin: 2.4rem 0 0;
 }
 .post-navigation [rel="prev"],
 .post-navigation [rel="next"],
 .image-navigation .previous-image,
 .image-navigation .next-image  {
 	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 	float: none;
-	padding: 11px 10px;
-	padding: 1.1rem 1.0rem;
+	padding: 11px 0;
+	padding: 1.1rem 0;
 	text-align: left;
 	width: 100%;
 }
@@ -1722,8 +1758,6 @@
 	line-height: 2;
 	margin-bottom: 48px;
 	margin-bottom: 4.8rem;
-	padding-left: 10px;
-	padding-left: 1.0rem;
 	text-transform: uppercase;
 }
 .comment-navigation .nav-previous,
@@ -1744,8 +1778,11 @@
 ----------------------------------------------- */
 
 .comments-area {
-	margin-top: 36px;
-	margin-top: 3.6rem;
+	margin: 36px auto;
+	margin: 3.6rem auto;
+	max-width: 474px;
+	padding: 0 10px;
+	padding: 0 1.0rem;
 }
 .comments-title,
 .comment-reply-title {
@@ -1754,14 +1791,10 @@
 	font-weight: 900;
 	line-height: 1.5;
 	margin-bottom: 0;
-	padding: 0 10px;
-	padding: 0 1.0rem;
 	text-transform: uppercase;
 }
 .comment-form {
 	background: #fff;
-	padding: 0 10px;
-	padding: 0 1.0rem;
 }
 .comment-list {
 	list-style: none;
@@ -1806,8 +1839,8 @@
 	border-top: 1px solid rgba(0, 0, 0, 0.1);
 	margin-bottom: 24px;
 	margin-bottom: 2.4rem;
-	padding: 24px 10px 0;
-	padding: 2.4rem 1.0rem 0;
+	padding-top: 24px;
+	padding-top: 2.4rem;
 }
 .comment-list li:first-child article {
 	border: none;
@@ -1835,7 +1868,7 @@
 	height: 1.8rem;
 }
 .bypostauthor .avatar {
-	background-color: #24890d;
+	background-color: #000;
 }
 .says {
 	display: none;
@@ -1887,8 +1920,8 @@
 }
 .comment-list .children {
 	list-style: none;
-	margin-left: 20px;
-	margin-left: 2.0rem;
+	margin-left: 18px;
+	margin-left: 1.8rem;
 }
 .comments-area .children article {
 	border: none;
@@ -1919,10 +1952,6 @@
 	padding: 0 1.0rem;
 	text-transform: uppercase;
 }
-.comment-form {
-	padding: 0 10px;
-	padding: 0 1.0rem;
-}
 .comment-form label {
 	display: block;
 }
@@ -1936,6 +1965,7 @@
 	margin-bottom: 0;
 }
 
+
 /* =Primary Sidebar
 ----------------------------------------------- */
 
@@ -1977,8 +2007,9 @@
 	color: #fff;
 }
 .widget {
-	margin: 0 0 48px;
-	margin: 0 0 4.8rem;
+	margin: 0 auto 48px;
+	margin: 0 auto 4.8rem;
+	max-width: 474px;
 	overflow: hidden;
 }
 .widget ul,
@@ -2252,8 +2283,9 @@
 ----------------------------------------------- */
 
 .site-footer .widget-area {
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing:    border-box;
+	box-sizing:         border-box;
 }
 .site-footer .widget {
 	float: left;
@@ -2261,6 +2293,7 @@
 	width: 198px;
 }
 
+
 /* =Media Queries
 ----------------------------------------------- */
 
@@ -2329,10 +2362,21 @@
 	.list-view .content-area .format-link .entry-title {
 		display: block;
 	}
+	.archive-header,
+	.page-header {
+		border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+		padding-top: 12px;
+		padding-top: 1.2rem;
+	}
+	.error404 .page-header {
+		border-bottom: 0;
+		padding: 0 10px;
+		padding: 0 1.0rem;
+	}
 }
 
 /* Enable Genricons */
-@media screen and (min-width: 400px) {
+@media screen and (min-width: 401px) {
 	.attachment-featured-thumbnail:hover img {
 		opacity: 0.8;
 	}
@@ -2351,7 +2395,7 @@
 	.content-area .byline a:before,
 	.content-area .comments-link a:before,
 	.entry-meta .edit-link a:before,
-	.attachment .entry-date:before,
+	.attachment span.entry-date:before,
 	.content-area .full-size-link a:before,
 	.content-area .parent-post-link a:before {
 		display: inline-block;
@@ -2398,7 +2442,7 @@
 	}
 	.content-area .post-format + .entry-date a:before,
 	.content-area .entry-date a:before,
-	.attachment .entry-date:before {
+	.attachment span.entry-date:before {
 		content: '\F303';
 		margin: 0 1px 0 0;
 		margin: 0 0.1rem 0 0;
@@ -2424,42 +2468,86 @@
 	.content-area .parent-post-link a:before {
 		content: '\F301';
 	}
-	.page .entry-meta .edit-link a:before {
-		margin: 5px 2px 0 0;
-		margin: 0.5rem 0.2rem 0 0;
+	.archive-header,
+	.page-header {
+		margin-bottom: 24px;
+		margin-bottom: 2.4rem;
+		padding: 0 10px;
+		padding: 0 1.0rem;
 	}
+	.search-results .content-area .type-page {
+		border-top: 1px solid rgba(0, 0, 0, 0.1);
+	}
+	.search-results .content-area .type-page .entry-header {
+		margin-top: 24px;
+		margin-top: 2.4rem;
+	}
 }
 
-/* Post formatted posts and post list start to appear on the right */
-@media screen and (min-width: 672px) {
-	.search-toggle {
-		display: block;
+@media screen and (min-width: 642px) {
+	.content-area .entry-header,
+	.full-width .content-area .entry-header {
+		margin-top: -48px;
+		margin-top: -4.8rem;
+		padding-right: 30px;
+		padding-right: 3.0rem;
+		padding-left: 30px;
+		padding-left: 3.0rem;
 	}
+	.content-area .type-page .entry-header,
+	.page .content-area .entry-header,
+	.attachment .content-area .entry-header {
+		margin-top: 0;
+	}
+}
+
+/* Post formatted posts and content sidebar start to appear on the right */
+@media screen and (min-width: 673px) {
 	.content-area {
 		float: left;
-		padding: 36px 0;
-		padding: 3.6rem 0;
+		padding-top: 36px;
+		padding-top: 3.6rem;
 		width: 100%;
 	}
 	.site-content {
-		margin: 0 33.33333333% 0 0;
+		margin-right: 33.33333333%;
 	}
-	.content-sidebar {
+	.content-area .entry-header {
+		margin-top: 0;
+	}
+	.content-area .entry-content,
+	.content-area .entry-summary,
+	.content-area footer.entry-meta,
+	.archive-header,
+	.page-header,
+	.page-content,
+	.post-navigation,
+	.image-navigation,
+	.comments-area {
+		padding-right: 30px;
+		padding-right: 3.0rem;
+		padding-left: 30px;
+		padding-left: 3.0rem;
+	}
+	.content-sidebar,
+	.ephemera {
 		float: right;
-		margin: 0 0 0 -30.35714285%;
-		padding: 36px 10px 24px 0;
-		padding: 3.6rem 1.0rem 2.4rem 0;
-		width: 30.35714285%;
+		margin-left: -33.33333333%;
+		padding: 36px 30 24px;
+		padding: 3.6rem 3.0rem 2.4rem;
+		width: 33.33333333%;
 	}
 	.ephemera {
 		border: none;
 		clear: none;
-		float: right;
-		margin: 0 0 0 -30.35714285%;
-		padding: 36px 10px 0 0;
-		padding: 3.6rem 1.0rem 0 0;
-		width: 30.35714285%;
 	}
+	#secondary {
+		padding: 48px 30px 0;
+		padding: 4.8rem 3.0rem 0;
+	}
+	.widget {
+		max-width: none;
+	}
 	#featured-content .hentry {
 		float: left;
 		width: 50%;
@@ -2471,56 +2559,68 @@
 		height: 96px;
 		height: 9.6rem;
 	}
-	.full-width.site-content {
-		margin: 0;
+	.full-width .site-content {
+		margin-right: 0;
 	}
-	.full-width.site-content .hentry {
-		max-width: 100%;
+}
+
+@media screen and (min-width: 770px) {
+	.header-main {
+		margin-right: 0;
 	}
+	.primary-navigation {
+		display: block;
+	}
 }
 
-@media screen and (min-width: 740px) {
-	.content-area .entry-header {
-		margin: -48px 4.59183673% 0;
-		margin: -4.8rem 4.59183673% 0;
-		padding: 24px 4.46428571% 12px;
-		padding: 2.4rem 4.46428571% 1.2rem;
+@media screen and (min-width: 810px) {
+	.full-width .entry-content img.size-medium.alignleft,
+	.full-width .entry-content img.size-large.alignleft,
+	.full-width .entry-content img.size-full.alignleft,
+	.full-width .entry-content .wp-caption.alignleft,
+	.full-width .entry-content blockquote.alignleft {
+		margin-left: -168px;
+		margin-left: -16.8rem;
 	}
-	.content-area .entry-content,
-	.content-area .entry-summary {
-		margin: 0 4.59183673%;
-		padding: 12px 4.46428571% 0;
-		padding: 1.2rem 4.46428571% 0;
+	.full-width .entry-content img.size-medium.alignright,
+	.full-width .entry-content img.size-large.alignright,
+	.full-width .entry-content img.size-full.alignright,
+	.full-width .entry-content .wp-caption.alignright,
+	.full-width .entry-content blockquote.alignright {
+		margin-right: -168px;
+		margin-right: -16.8rem;
 	}
-	.content-area footer.entry-meta {
-		margin: 12px 4.59183673% 24px;
-		margin: 1.2rem 4.59183673% 2.4rem;
-		padding: 0 4.46428571%;
+	.full-width .entry-content img.size-full.alignnone,
+	.single-attachment .entry-attachment {
+		margin-right: -168px;
+		margin-right: -16.8rem;
+		margin-left: -168px;
+		margin-left: -16.8rem;
+		max-width: 810px;
+		max-width: 81.0rem;
 	}
-	.archive-header,
-	.page-header {
-		margin: 0 4.59183673% 24px;
-		margin: 0 4.59183673% 2.4rem;
-		padding: 0 4.46428571%;
+	.single-attachment .entry-attachment {
+		text-align: center;
 	}
-	.page .content-area .entry-header,
-	.error404 .content-area .page-header {
-		margin: 0 4.59183673%;
-		padding: 0 4.46428571% 12px;
-		padding: 0 4.46428571% 1.2rem;
+	.full-width .entry-content blockquote.alignleft,
+	.full-width .entry-content blockquote.alignright {
+		width: -webkit-calc(50% + 130px);
+		width:         calc(50% + 130px);
 	}
-	.content-area .full-width .entry-header {
-		margin: 0 6.04307432%;
-		padding: 0 0 12px;
-		padding: 0 0 1.2rem;
+}
+
+@media screen and (min-width: 870px) {
+	.content-area {
+		padding-top: 72px;
+		padding-top: 7.2rem;
 	}
-	.content-area .full-width .entry-content {
-		margin: 0 6.04307432%;
-		padding: 0;
+	.home .content-area {
+		padding-top: 36px;
+		padding-top: 3.6rem;
 	}
-	.content-area .full-width footer.entry-meta {
-		margin: 0 6.04307432%;
-		padding: 0;
+	.content-area .entry-header {
+		margin-top: -48px;
+		margin-top: -4.8rem;
 	}
 	.content-area .format-aside .entry-header,
 	.content-area .format-quote .entry-header,
@@ -2555,97 +2655,17 @@
 	.comment-metadata,
 	.comment-content,
 	.comment-list .reply {
-		padding-left: 60px;
-		padding-left: 6.0rem;
+		padding-left: 58px;
+		padding-left: 5.8rem;
 	}
-	.comments-title,
-	.no-comments,
-	.comment-respond,
-	.comments-area article,
-	.comment-list .trackback,
-	.comment-list .pingback,
-	.post-navigation [rel="prev"],
-	.post-navigation [rel="next"] {
-		padding-right: 9.12778904%;
-		padding-left: 9.12778904%;
+	.comment-list .children {
+		margin-left: 36px;
+		margin-left: 3.6rem;
 	}
-	.comment-reply-title,
-	.comment-form {
-		padding: 0;
-	}
-	.comment-navigation {
-		padding-left: 9.12778904%;
-	}
 	.comment .comment-respond {
 		margin-left: 60px;
 		margin-left: 6.0rem;
 	}
-	.image-navigation .previous-image,
-	.image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width .comment-respond,
-	.full-width .comments-area article,
-	.full-width .comment-list .trackback,
-	.full-width .comment-list .pingback {
-		padding-right: 6.04307432%;
-		padding-left: 6.04307432%;
-	}
-	.full-width .comment-reply-title,
-	.full-width .comment-form {
-		padding: 0;
-	}
-	.content-area .no-results .entry-header {
-		margin: 0 4.59183673%;
-		padding: 0 4.46428571%;
-	}
-}
-
-@media screen and (min-width: 770px) {
-	.header-main {
-		margin-right: 0;
-	}
-	.primary-navigation {
-		display: block;
-	}
-}
-
-@media screen and (min-width: 870px) {
-	.content-area {
-		padding-top: 72px;
-		padding-top: 7.2rem;
-	}
-	.home .content-area {
-		padding-top: 36px;
-		padding-top: 3.6rem;
-	}
-	.content-area .entry-header {
-		margin-right: 8.03571428%;
-		margin-left: 12.5%;
-	}
-	.content-area .entry-content,
-	.content-area .entry-summary {
-		margin-right: 8.03571428%;
-		margin-left: 12.5%;
-	}
-	.content-area footer.entry-meta {
-		margin: 12px 8.03571428% 24px 12.5%;
-		margin: 1.2rem 8.03571428% 2.4rem 12.5%;
-	}
-	.page .content-area .entry-header,
-	.error404 .content-area .page-header {
-		margin: 0 8.03571428% 0 12.5%;
-	}
-	.content-area .full-width .entry-header,
-	.content-area .full-width .entry-content,
-	.content-area .full-width footer.entry-meta {
-		margin: 0 11.30926724%;
-	}
-	.archive-header,
-	.page-header {
-		margin: 0 8.03571428% 24px 12.5%;
-		margin: 0 8.03571428% 2.4rem 12.5%;
-	}
 	.content-sidebar {
 		padding-top: 72px;
 		padding-top: 7.2rem;
@@ -2659,64 +2679,47 @@
 	#featured-content .hentry:nth-child( 3n+1 ) {
 		clear: both;
 	}
-	.comments-title,
-	.no-comments,
-	.comment-respond,
-	.post-navigation [rel="prev"],
-	.post-navigation [rel="next"] {
-		padding-right: 12.39493534%;
-		padding-left: 17.06896551%;
+}
+
+/* Secondary starts appear on the left */
+@media screen and (min-width: 1008px) {
+	.header-main {
+		padding-left: 27px;
+		padding-left: 2.7rem;
 	}
-	.comments-area article,
-	.comment-list .trackback,
-	.comment-list .pingback {
-		padding-right: 11.25%;
-		padding-left: 15.46875%;
+	.search-box-wrapper {
+		padding-left: 182px;
+		padding-left: 18.2rem;
 	}
-	.comment-respond {
-		padding-right: 13.8900862%;
+	.site-content {
+		margin: 0 29.04761904% 0 182px;
+		margin: 0 29.04761904% 0 18.2rem;
 	}
-	.comment .comment-respond {
-		margin-left: 50px;
-		margin-left: 5.0rem;
+	.content-sidebar,
+	.ephemera {
+		margin-left: -29.04761904%;
+		width: 29.04761904%;
 	}
-	.comment-list,
-	.full-width .comment-list {
-		margin-left: -60px;
-		margin-left: -6.0rem;
+	.content-area .entry-header {
+		margin-top: 0;
 	}
-	.comment-navigation {
-		padding-left: 17.06896551%;
+	.content-area .entry-header
+	.content-area .entry-content,
+	.content-area .entry-summary,
+	.content-area footer.entry-meta,
+	.archive-header,
+	.page-header,
+	.page-content,
+	.post-navigation,
+	.image-navigation,
+	.comments-area {
+		padding-right: 0;
+		padding-left: 0;
 	}
-	.image-navigation .previous-image,
-	.image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width .comment-respond,
-	.full-width .comments-area article,
-	.full-width .comment-list .trackback,
-	.full-width .comment-list .pingback {
-		padding-right: 11.30926724%;
-		padding-left: 11.30926724%;
+	.site-footer {
+		padding-left: 27px;
+		padding-left: 2.7rem;
 	}
-	blockquote.pull.alignleft {
-		margin-left: -20%;
-	}
-	blockquote.pull.alignright {
-		margin-right: -20%;
-	}
-	.content-area .no-results .entry-header {
-		margin-right: 8.03571428%;
-		margin-left: 12.5%;
-	}
-	.content-area .no-results .entry-content {
-		margin-right: 8.03571428%;
-		margin-left: 12.5%;
-	}
-}
-
-/* Secondary starts appear on the left */
-@media screen and (min-width: 1008px) {
 	.site:before {
 		background-color: #000;
 		content: '';
@@ -2726,34 +2729,23 @@
 		position: absolute;
 			top: 0;
 			left: 0;
-		width: 222px;
-		width: 22.2rem;
+		width: 182px;
+		width: 18.2rem;
 		z-index: 2;
 	}
-	.header-main {
-		padding-left: 27px;
-		padding-left: 2.7rem;
-	}
-	.search-box-wrapper {
-		padding-left: 222px;
-		padding-left: 22.2rem;
-	}
-	.site-content {
-		margin: 0 27.31707317% 0 222px;
-		margin: 0 27.31707317% 0 22.2rem;
-	}
 	#secondary {
 		background-color: transparent;
 		border-bottom: 0;
 		clear: none;
+		font-size: 11px;
 		font-size: 1.1rem;
 		float: left;
 		line-height: 1.6363636363;
 		margin: 0 0 0 -100%;
 		padding: 0 27px;
 		padding: 0 2.7rem;
-		width: 168px;
-		width: 16.8rem;
+		width: 128px;
+		width: 12.8rem;
 	}
 	.site-description {
 		display: block;
@@ -2761,49 +2753,6 @@
 		margin: -3px 0 21px;
 		margin: -0.3rem 0 2.1rem;
 	}
-	.front-page-content-wrapper {
-		float: left;
-	}
-	.site-content {
-		margin: 0 27.31707317% 0 222px;
-		margin: 0 27.31707317% 0 22.2rem;
-	}
-	.content-sidebar,
-	.ephemera {
-		margin: 0 0 0 -27.31707317%;
-		width: 24.87804878%;
-	}
-	.content-area .entry-header {
-		margin: -48px 4.59183673% 0;
-		margin: -4.8rem 4.59183673% 0;
-		padding: 24px 4.46428571% 12px;
-		padding: 2.4rem 4.46428571% 1.2rem;
-	}
-	.content-area .entry-content,
-	.content-area .page-content,
-	.content-area .entry-summary {
-		margin: 0 4.59183673%;
-		padding: 12px 4.46428571% 0;
-		padding: 1.2rem 4.46428571% 0;
-	}
-	.content-area footer.entry-meta {
-		margin: 12px 4.59183673% 24px;
-		margin: 1.2rem 4.59183673% 2.4rem;
-		padding: 0 4.46428571%;
-	}
-	.archive-header,
-	.page-header {
-		margin: 0 4.59183673% 24px;
-		margin: 0 4.59183673% 2.4rem;
-	}
-	#featured-content {
-		padding-left: 222px;
-		padding-left: 22.2rem;
-	}
-	.site-footer {
-		padding-left: 27px;
-		padding-left: 2.7rem;
-	}
 	.secondary-navigation {
 		border-bottom: 1px solid rgba(255, 255, 255, 0.2);
 		font-size: 11px;
@@ -2830,8 +2779,8 @@
 			top: -0.1rem;
 			left: 168px;
 			left: 16.8rem;
-		width: 168px;
-		width: 16.8rem;
+		width: 128px;
+		width: 12.8rem;
 		z-index: 9999;
 	}
 	.secondary-navigation ul li:hover {
@@ -2840,65 +2789,6 @@
 	.secondary-navigation ul li:hover > ul {
 		display: block;
 	}
-	.page .content-area .entry-header,
-	.error404 .content-area .page-header {
-		margin: 0 4.59183673%;
-		padding: 0 4.46428571% 12px;
-		padding: 0 4.46428571% 1.2rem;
-	}
-	.full-width.site-content {
-		margin-left: 222px;
-		margin-left: 22.2rem;
-	}
-	.content-area .full-width .entry-header {
-		padding: 0 0 12px;
-		padding: 0 0 1.2rem;
-	}
-	.content-area .full-width .entry-header,
-	.content-area .full-width .entry-content,
-	.content-area .full-width .page-content,
-	.content-area .full-width footer.entry-meta {
-		margin: 0 5.882236%;
-	}
-	.comments-title,
-	.no-comments,
-	.comment-respond,
-	.comments-area article,
-	.comment-list .trackback,
-	.comment-list .pingback,
-	.post-navigation [rel="prev"],
-	.post-navigation [rel="next"] {
-		padding-right: 9.87001616%;
-		padding-left: 9.19765166%;
-	}
-	.comment-list,
-	.full-width .comment-list {
-		margin-left: 0;
-	}
-	.comment-navigation {
-		padding-left: 9.19765166%;
-	}
-	.comment .comment-respond {
-		margin-left: 60px;
-		margin-left: 6.0rem;
-	}
-	.image-navigation .previous-image,
-	.image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width .comment-respond,
-	.full-width .comments-area article,
-	.full-width .comment-list .trackback,
-	.full-width .comment-list .pingback {
-		padding-right: 5.882236%;
-		padding-left: 5.882236%;
-	}
-	blockquote.pull.alignleft {
-		margin-left: 0;
-	}
-	blockquote.pull.alignright {
-		margin-right: 0;
-	}
 	#secondary .widget,
 	#supplementary .widget {
 		margin-bottom: 48px;
@@ -2920,115 +2810,113 @@
 		padding-right: 0;
 		padding-left: 0;
 	}
-
+	.front-page-content-wrapper {
+		float: left;
+	}
+	.featured-content {
+		padding-left: 182px;
+		padding-left: 18.2rem;
+	}
 }
 
-@media screen and (min-width: 1150px) {
+@media screen and (min-width: 1040px) {
 	.content-area .entry-header {
-		margin: -48px 8.03571428% 0 12.5%;
-		margin: -4.8rem 8.03571428% 0 12.5%;
+		margin-top: -48px;
+		margin-top: -4.8rem;
 	}
+	.content-area .entry-header,
 	.content-area .entry-content,
-	.content-area .page-content,
-	.content-area .entry-summary {
-		margin: 0 8.03571428% 0 12.5%;
+	.content-area .entry-summary,
+	.content-area footer.entry-meta,
+	.archive-header,
+	.page-header,
+	.page-content,
+	.post-navigation,
+	.image-navigation,
+	.comments-area {
+		padding-right: 15px;
+		padding-right: 1.5rem;
+		padding-left: 15px;
+		padding-left: 1.5rem;
 	}
-	.content-area footer.entry-meta {
-		margin: 12px 8.03571428% 24px 12.5%;
-		margin: 1.2rem 8.03571428% 2.4rem 12.5%;
+}
+
+@media screen and (min-width: 1080px) {
+	.site:before {
+		width: 222px;
+		width: 22.2rem;
 	}
-	.comments-title,
-	.no-comments,
-	.comment-respond,
-	.post-navigation [rel="prev"],
-	.post-navigation [rel="next"] {
-		padding-right: 12.44146986%;
-		padding-left: 16.77524429%;
+	.search-box-wrapper,
+	.featured-content {
+		padding-left: 222px;
+		padding-left: 22.2rem;
 	}
-	.comments-area article,
-	.comment-list .trackback,
-	.comment-list .pingback {
-		padding-right: 11.27596439%;
-		padding-left: 15.2818991%;
+	.site-content {
+		margin-left: 222px;
+		margin-left: 22.2rem;
 	}
-	.comment-respond {
-		padding-right: 13.73697916%;
+	#secondary,
+	.secondary-navigation ul ul {
+		width: 168px;
+		width: 16.8rem;
 	}
-	.comment .comment-respond {
-		margin-left: 50px;
-		margin-left: 5.0rem;
+}
+
+@media screen and (min-width: 1110px) {
+	.content-area .entry-header,
+	.content-area .entry-content,
+	.content-area .entry-summary,
+	.content-area footer.entry-meta,
+	.archive-header,
+	.page-header,
+	.page-content,
+	.post-navigation,
+	.image-navigation,
+	.comments-area {
+		padding-right: 30px;
+		padding-right: 3.0rem;
+		padding-left: 30px;
+		padding-left: 3.0rem;
 	}
-	.comment-list,
-	.full-width .comment-list {
-		margin-left: -60px;
-		margin-left: -6.0rem;
-	}
-	.comment-navigation {
-		padding-left: 16.77524429%;
-	}
+}
+
+@media screen and (min-width: 1218px) {
+	.content-area .entry-header,
+	.content-area .entry-content,
+	.content-area .entry-summary,
+	.content-area footer.entry-meta,
 	.archive-header,
-	.page-header {
-		margin: 0 8.03571428% 24px 12.5%;
-		margin: 0 8.03571428% 2.4rem 12.5%;
+	.page-header,
+	.page-content,
+	.post-navigation,
+	.image-navigation,
+	.comments-area {
+		margin-right: 54px;
 	}
-	.page .content-area .entry-header,
-	.error404 .content-area .page-header {
-		margin: 0 8.03571428% 0 12.5%;
+	.full-width .content-area .entry-header,
+	.full-width .content-area .entry-content,
+	.full-width .content-area .entry-summary,
+	.full-width .content-area footer.entry-meta,
+	.full-width .archive-header,
+	.full-width .page-header,
+	.full-width .page-content,
+	.full-width .post-navigation,
+	.full-width .image-navigation,
+	.full-width .comments-area {
+		margin-right: auto;
 	}
-	.content-area .full-width .entry-header,
-	.content-area .full-width .entry-content,
-	.content-area .full-width .page-content,
-	.content-area .full-width footer.entry-meta {
-		margin: 0 11.21868265%;
-	}
-	.image-navigation .previous-image,
-	.image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width .comment-respond,
-	.full-width .comments-area article,
-	.full-width .comment-list .trackback,
-	.full-width .comment-list .pingback {
-		padding-right: 11.21868265%;
-		padding-left: 11.21868265%;
-	}
-	.content-area .entry-content .wp-caption.alignleft .wp-caption-text {
-		padding-left: 10px;
-		padding-left: 1.0rem;
-	}
-	blockquote.pull.alignleft {
-		margin-left: -20%;
-	}
-	blockquote.pull.alignright {
-		margin-right: -20%;
-	}
 }
 
-@media screen and (min-width: 1230px) {
-	.site,
-	.site-header,
-	.home .site-main {
-		max-width: 1260px;
-		max-width: 126.0rem;
+@media screen and (min-width: 1260px) {
+	.entry-content blockquote.alignleft,
+	.entry-content blockquote.alignright {
+		width: -webkit-calc(50% + 18px);
+		width:         calc(50% + 18px);
 	}
-	.content-sidebar,
-	.ephemera {
-		padding-right: 0;
+	.entry-content blockquote.alignleft {
+		margin-left: -18%;
 	}
-	.content-area .full-width .entry-header,
-	.content-area .full-width .entry-content,
-	.content-area .full-width .page-content,
-	.content-area .full-width footer.entry-meta {
-		margin: 0 0 0 11.21868265%;
+	.entry-content blockquote.alignright {
+		margin-right: -18%;
 	}
-	.image-navigation .previous-image,
-	.image-navigation .next-image,
-	.full-width .comment-navigation,
-	.full-width .comments-title,
-	.full-width .comment-respond,
-	.full-width .comments-area article,
-	.full-width .comment-list .trackback,
-	.full-width .comment-list .pingback {
-		padding-right: 0;
-	}
 }
\ No newline at end of file
Index: src/wp-content/themes/twentyfourteen/featured-content.php
===================================================================
--- src/wp-content/themes/twentyfourteen/featured-content.php	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/featured-content.php	(working copy)
@@ -9,23 +9,21 @@
  */
 ?>
 
-<div class="featured-content-wrapper">
-	<div id="featured-content" class="featured-content">
+<div id="featured-content" class="featured-content">
 
-		<?php
-			do_action( 'twentyfourteen_featured_posts_before' );
+	<?php
+		do_action( 'twentyfourteen_featured_posts_before' );
 
-			$featured_posts = twentyfourteen_get_featured_posts();
-			foreach ( (array) $featured_posts as $order => $post ) :
-				setup_postdata( $post );
+		$featured_posts = twentyfourteen_get_featured_posts();
+		foreach ( (array) $featured_posts as $order => $post ) :
+			setup_postdata( $post );
 
-				get_template_part( 'content', 'featured-post' );
-			endforeach;
+			get_template_part( 'content', 'featured-post' );
+		endforeach;
 
-			do_action( 'twentyfourteen_featured_posts_after' );
+		do_action( 'twentyfourteen_featured_posts_after' );
 
-			wp_reset_postdata();
-		?>
+		wp_reset_postdata();
+	?>
 
-	</div><!-- .featured-content -->
-</div><!-- .featured-content-wrapper -->
+</div><!-- #featured-content .featured-content -->
\ No newline at end of file
Index: src/wp-content/themes/twentyfourteen/content.php
===================================================================
--- src/wp-content/themes/twentyfourteen/content.php	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/content.php	(working copy)
@@ -7,9 +7,16 @@
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<?php if ( 'post' == get_post_type() ) : ?>
 	<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyfourteen' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="<?php the_ID(); ?>" class="attachment-featured-thumbnail">
-		<?php the_post_thumbnail( 'featured-thumbnail-large' ); ?>
+		<?php
+			if ( is_active_sidebar( 'sidebar-3' ) )
+				the_post_thumbnail( 'featured-thumbnail-large' );
+			else
+				the_post_thumbnail( 'featured-thumbnail-full-width' );
+		?>
 	</a>
+	<?php endif; ?>
 
 	<header class="entry-header">
 		<?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
Index: src/wp-content/themes/twentyfourteen/sidebar-content.php
===================================================================
--- src/wp-content/themes/twentyfourteen/sidebar-content.php	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/sidebar-content.php	(working copy)
@@ -5,29 +5,11 @@
  * @package WordPress
  * @subpackage Twenty_Fourteen
  */
+if ( ! is_active_sidebar( 'sidebar-3' ) )
+	return;
 ?>
 <div id="content-sidebar" class="content-sidebar widget-area" role="complementary">
 	<?php do_action( 'before_sidebar' ); ?>
 
-	<?php if ( ! dynamic_sidebar( 'sidebar-3' ) ) : ?>
-		<aside id="search" class="widget widget_search">
-				<?php get_search_form(); ?>
-		</aside>
-
-		<aside id="link" class="widget widget_links">
-			<h1 class="widget-title"><?php _e( 'Blogroll', 'twentyfourteen' ); ?></h1>
-			<ul class="xoxo blogroll">
-				<?php wp_list_bookmarks( array( 'title_li' => '', 'categorize' => 0 ) ); ?>
-			</ul>
-		</aside>
-
-		<aside id="meta" class="widget">
-			<h1 class="widget-title"><?php _e( 'Meta', 'twentyfourteen' ); ?></h1>
-			<ul>
-				<?php wp_register(); ?>
-				<li><?php wp_loginout(); ?></li>
-				<?php wp_meta(); ?>
-			</ul>
-		</aside>
-	<?php endif; // end sidebar widget area ?>
+	<?php dynamic_sidebar( 'sidebar-3' ); ?>
 </div><!-- #content-sidebar -->
Index: src/wp-content/themes/twentyfourteen/full-width-page.php
===================================================================
--- src/wp-content/themes/twentyfourteen/full-width-page.php	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/full-width-page.php	(working copy)
@@ -9,7 +9,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<div id="content" class="site-content full-width" role="main">
+		<div id="content" class="site-content" role="main">
 			<?php
 				while ( have_posts() ) :
 					the_post();
Index: src/wp-content/themes/twentyfourteen/front-page.php
===================================================================
--- src/wp-content/themes/twentyfourteen/front-page.php	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/front-page.php	(working copy)
@@ -8,43 +8,38 @@
 
 get_header(); ?>
 
-	<div class="front-page-content-wrapper">
-		<div class="front-page-content-main">
+<div class="front-page-content-wrapper">
 
-			<?php if ( twentyfourteen_has_featured_posts() ) : ?>
-				<?php get_template_part( 'featured-content' ); ?>
-			<?php endif; ?>
+	<?php
+		if ( twentyfourteen_has_featured_posts() )
+			get_template_part( 'featured-content' );
+	?>
 
-			<div class="front-page-content-area">
+		<div id="primary" class="content-area no-sidebar">
+			<div id="content" class="site-content" role="main">
+			<?php
+				if ( have_posts() ) :
+					while ( have_posts() ) :
+						the_post();
 
-				<div id="primary" class="content-area no-sidebar">
-					<div id="content" class="site-content" role="main">
-					<?php
-						if ( have_posts() ) :
-							while ( have_posts() ) :
-								the_post();
+						get_template_part( 'content', get_post_format() );
 
-								get_template_part( 'content', get_post_format() );
+						comments_template();
+					endwhile;
+					twentyfourteen_paging_nav();
 
-								comments_template();
-							endwhile;
-							twentyfourteen_paging_nav();
+				else :
+					get_template_part( 'content', 'none' );
 
-						else :
-							get_template_part( 'content', 'none' );
+				endif;
+			?>
+			</div><!-- #content .site-content -->
+		</div><!-- #primary .content-area -->
 
-						endif;
-					?>
-					</div><!-- #content .site-content -->
-				</div><!-- #primary .content-area -->
+		<?php get_sidebar( 'ephemera' ); ?>
 
-				<?php get_sidebar( 'ephemera' ); ?>
+</div><!-- .front-page-content-wrapper -->
 
-			</div><!-- .front-page-content-area -->
-
-		</div><!-- .front-page-content-main -->
-	</div><!-- .front-page-content-wrapper -->
-
 <?php
 get_sidebar();
 get_footer();
Index: src/wp-content/themes/twentyfourteen/functions.php
===================================================================
--- src/wp-content/themes/twentyfourteen/functions.php	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/functions.php	(working copy)
@@ -62,9 +62,10 @@
 	add_theme_support( 'post-thumbnails', array( 'post' ) );
 
 	// Adding several sizes for Post Thumbnails.
+	add_image_size( 'featured-thumbnail-formatted', 306, 0 );
+	add_image_size( 'featured-thumbnail-featured', 672, 336, true );
 	add_image_size( 'featured-thumbnail-large', 672, 0 );
-	add_image_size( 'featured-thumbnail-featured', 672, 336, true );
-	add_image_size( 'featured-thumbnail-formatted', 306, 0 );
+	add_image_size( 'featured-thumbnail-full-width', 1038, 0 );
 
 	// This theme uses wp_nav_menu() in two locations.
 	register_nav_menus( array(
@@ -127,7 +128,7 @@
 
 		$featured_posts = apply_filters( 'twentyfourteen_get_featured_posts', array() );
 
-	return is_array( $featured_posts ) && count( $featured_posts ) > absint( $minimum );
+	return is_array( $featured_posts ) && count( $featured_posts ) >= absint( $minimum );
 }
 
 /**
@@ -423,13 +424,15 @@
  */
 function twentyfourteen_body_classes( $classes ) {
 	// Adds a class of group-blog to blogs with more than 1 published author
-	if ( is_multi_author() ) {
+	if ( is_multi_author() )
 		$classes[] = 'group-blog';
-	}
-	if ( is_archive() || is_search() || is_home() ) {
+
+	if ( is_archive() || is_search() || is_home() )
 		$classes[] = 'list-view';
-	}
 
+	if ( ( ! is_front_page() && ! is_active_sidebar( 'sidebar-3' ) ) || is_page_template( 'full-width-page.php' ) || is_attachment() )
+		$classes[] = 'full-width';
+
 	return $classes;
 }
 add_filter( 'body_class', 'twentyfourteen_body_classes' );
Index: src/wp-content/themes/twentyfourteen/image.php
===================================================================
--- src/wp-content/themes/twentyfourteen/image.php	(revision 25222)
+++ src/wp-content/themes/twentyfourteen/image.php	(working copy)
@@ -5,12 +5,13 @@
  * @package WordPress
  * @subpackage Twenty_Fourteen
  */
+$metadata = wp_get_attachment_metadata();
 
 get_header();
 ?>
 
 <section id="primary" class="content-area image-attachment">
-	<div id="content" class="site-content full-width" role="main">
+	<div id="content" class="site-content" role="main">
 
 	<?php while ( have_posts() ) : the_post(); ?>
 
@@ -19,7 +20,6 @@
 				<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 
 				<div class="entry-meta">
-					<?php $metadata = wp_get_attachment_metadata(); ?>
 
 					<span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
 
@@ -70,8 +70,10 @@
 		</article><!-- #post-## -->
 
 		<nav id="image-navigation" class="navigation image-navigation">
+			<div class="nav-links">
 			<?php previous_image_link( false, __( '<div class="previous-image">Previous Image</div>', 'twentyfourteen' ) ); ?>
 			<?php next_image_link( false, __( '<div class="next-image">Next Image</div>', 'twentyfourteen' ) ); ?>
+			</div>
 		</nav><!-- #image-navigation -->
 
 		<?php comments_template(); ?>