<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25762] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: merge Front Page Sidebar and Content Sidebar.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25762">25762</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-10-11 03:16:59 +0000 (Fri, 11 Oct 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Fourteen: merge Front Page Sidebar and Content Sidebar. Props iamtakashi, see <a href="http://core.trac.wordpress.org/ticket/25565">#25565</a>; closes <a href="http://core.trac.wordpress.org/ticket/25565">#25565</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfrontpagephp">trunk/src/wp-content/themes/twentyfourteen/front-page.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsthemejs">trunk/src/wp-content/themes/twentyfourteen/js/theme.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensidebarcontentphp">trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteensidebarfooterphp">trunk/src/wp-content/themes/twentyfourteen/sidebar-footer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenfrontpagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/front-page.php (25761 => 25762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/front-page.php        2013-10-10 21:49:23 UTC (rev 25761)
+++ trunk/src/wp-content/themes/twentyfourteen/front-page.php   2013-10-11 03:16:59 UTC (rev 25762)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">                  </div><!-- #content .site-content -->
</span><span class="cx">          </div><!-- #primary .content-area -->
</span><span class="cx"> 
</span><del>-               <?php get_sidebar( 'ephemera' ); ?>
</del><ins>+                <?php get_sidebar( 'content' ); ?>
</ins><span class="cx"> 
</span><span class="cx"> </div><!-- .front-page-content-wrapper -->
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (25761 => 25762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-10-10 21:49:23 UTC (rev 25761)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php    2013-10-11 03:16:59 UTC (rev 25762)
</span><span class="lines">@@ -149,26 +149,17 @@
</span><span class="cx">          'after_title'   => '</h1>',
</span><span class="cx">  ) );
</span><span class="cx">  register_sidebar( array(
</span><del>-               'name'          => __( 'Front Page Sidebar', 'twentyfourteen' ),
</del><ins>+                'name'          => __( 'Content Sidebar', 'twentyfourteen' ),
</ins><span class="cx">           'id'            => 'sidebar-2',
</span><del>-               'description'   => __( 'Additional sidebar that appears on the right, on the home page.', 'twentyfourteen' ),
</del><ins>+                'description'   => __( 'Additional sidebar that appears on the right.', 'twentyfourteen' ),
</ins><span class="cx">           'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx">          'after_widget'  => '</aside>',
</span><span class="cx">          'before_title'  => '<h1 class="widget-title">',
</span><span class="cx">          'after_title'   => '</h1>',
</span><span class="cx">  ) );
</span><span class="cx">  register_sidebar( array(
</span><del>-               'name'          => __( 'Content Sidebar', 'twentyfourteen' ),
</del><ins>+                'name'          => __( 'Footer Widget Area', 'twentyfourteen' ),
</ins><span class="cx">           'id'            => 'sidebar-3',
</span><del>-               'description'   => __( 'Additional sidebar that appears on the right, on single posts and pages.', 'twentyfourteen' ),
-               'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-               'after_widget'  => '</aside>',
-               'before_title'  => '<h1 class="widget-title">',
-               'after_title'   => '</h1>',
-       ) );
-       register_sidebar( array(
-               'name'          => __( 'Footer Widget Area', 'twentyfourteen' ),
-               'id'            => 'sidebar-4',
</del><span class="cx">           'description'   => __( 'Appears in the footer section of the site.', 'twentyfourteen' ),
</span><span class="cx">          'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><span class="cx">          'after_widget'  => '</aside>',
</span><span class="lines">@@ -470,13 +461,13 @@
</span><span class="cx">  if ( is_archive() || is_search() || is_home() )
</span><span class="cx">          $classes[] = 'list-view';
</span><span class="cx"> 
</span><del>-       if ( ( ! is_front_page() && ! is_active_sidebar( 'sidebar-3' ) )
</del><ins>+        if ( ( ! is_active_sidebar( 'sidebar-2' ) )
</ins><span class="cx">           || is_page_template( 'full-width-page.php' )
</span><span class="cx">          || is_page_template( 'contributor-page.php' )
</span><span class="cx">          || is_attachment() )
</span><span class="cx">          $classes[] = 'full-width';
</span><span class="cx"> 
</span><del>-       if ( is_active_sidebar( 'sidebar-4' ) )
</del><ins>+        if ( is_active_sidebar( 'sidebar-3' ) )
</ins><span class="cx">           $classes[] = 'footer-widgets';
</span><span class="cx"> 
</span><span class="cx">  return $classes;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php (25761 => 25762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php    2013-10-10 21:49:23 UTC (rev 25761)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php       2013-10-11 03:16:59 UTC (rev 25762)
</span><span class="lines">@@ -115,38 +115,23 @@
</span><span class="cx">          .comment-metadata a:hover,
</span><span class="cx">          .comment-list .trackback a:hover,
</span><span class="cx">          .comment-list .pingback a:hover,
</span><del>-               .content-sidebar a:hover,
-               .paging-navigation .page-numbers.current {
</del><ins>+                .paging-navigation .page-numbers.current,
+               .content-sidebar.widget-area a:hover,
+               .content-sidebar .widget_twentyfourteen_ephemera .post-format-archive-link {
</ins><span class="cx">                   color: ' . $accent_color . ';
</span><span class="cx">          }
</span><span class="cx"> 
</span><del>-               button:hover,
-               html input[type="button"]:hover,
-               input[type="reset"]:hover,
-               input[type="submit"]:hover,
-               button:focus,
-               html input[type="button"]:focus,
-               input[type="reset"]:focus,
-               input[type="submit"]:focus,
</del><ins>+                button,
+               html input[type="button"],
+               input[type="reset"],
+               input[type="submit"],
</ins><span class="cx">           .hentry .mejs-controls .mejs-time-rail .mejs-time-current,
</span><span class="cx">          .header-extra,
</span><span class="cx">          .search-toggle,
</span><span class="cx">          .primary-navigation ul ul,
</span><span class="cx">          .primary-navigation li:hover > a,
</span><del>-               .widget-area button,
-               .widget-area html input[type="button"],
-               .widget-area input[type="reset"],
-               .widget-area input[type="submit"],
-               .widget_calendar a,
-               .content-sidebar button:hover,
-               .content-sidebar html input[type="button"]:hover,
-               .content-sidebar input[type="reset"]:hover,
-               .content-sidebar input[type="submit"]:hover,
-               .content-sidebar button:focus,
-               .content-sidebar html input[type="button"]:focus,
-               .content-sidebar input[type="reset"]:focus,
-               .content-sidebar input[type="submit"]:focus,
-               .page-links a:hover {
</del><ins>+                .page-links a:hover,
+               .widget_calendar tbody a {
</ins><span class="cx">                   background-color: ' . $accent_color . ';
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="lines">@@ -167,19 +152,15 @@
</span><span class="cx">          .search-toggle:hover,
</span><span class="cx">          .search-toggle.active,
</span><span class="cx">          .search-box,
</span><del>-               .widget-area button:hover,
-               .widget-area html input[type="button"]:hover,
-               .widget-area input[type="reset"]:hover,
-               .widget-area input[type="submit"]:hover,
-               .widget-area button:focus,
-               .widget-area html input[type="button"]:focus,
-               .widget-area input[type="reset"]:focus,
-               .widget-area input[type="submit"]:focus,
-               .widget-area button:active,
-               .widget-area html input[type="button"]:active,
-               .widget-area input[type="reset"]:active,
-               .widget-area input[type="submit"]:active,
-               .widget_calendar a:hover {
</del><ins>+                button:hover,
+               html input[type="button"]:hover,
+               input[type="reset"]:hover,
+               input[type="submit"]:hover,
+               button:focus,
+               html input[type="button"]:focus,
+               input[type="reset"]:focus,
+               input[type="submit"]:focus,
+               .widget_calendar tbody a:hover {
</ins><span class="cx">                   background-color: ' . $accent_lighter . ';
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="lines">@@ -187,11 +168,7 @@
</span><span class="cx">          button:active,
</span><span class="cx">          html input[type="button"]:active,
</span><span class="cx">          input[type="reset"]:active,
</span><del>-               input[type="submit"]:active,
-               .content-sidebar button:active,
-               .content-sidebar html input[type="button"]:active,
-               .content-sidebar input[type="reset"]:active,
-               .content-sidebar input[type="submit"]:active {
</del><ins>+                input[type="submit"]:active {
</ins><span class="cx">                   background-color: ' . $accent_much_lighter . ';
</span><span class="cx">          }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/theme.js (25761 => 25762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/theme.js   2013-10-10 21:49:23 UTC (rev 25761)
+++ trunk/src/wp-content/themes/twentyfourteen/js/theme.js      2013-10-11 03:16:59 UTC (rev 25762)
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx"> 
</span><span class="cx">                  $( '#footer-sidebar' ).masonry( {
</span><span class="cx">                          itemSelector: '.widget',
</span><del>-                               columnWidth: 225,
-                               gutterWidth: 27,
</del><ins>+                                columnWidth: 315,
+                               gutterWidth: 0,
</ins><span class="cx">                           isRTL: $( 'body' ).is( '.rtl' )
</span><span class="cx">                  } );
</span><span class="cx">          }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensidebarcontentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php (25761 => 25762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php   2013-10-10 21:49:23 UTC (rev 25761)
+++ trunk/src/wp-content/themes/twentyfourteen/sidebar-content.php      2013-10-11 03:16:59 UTC (rev 25762)
</span><span class="lines">@@ -5,11 +5,11 @@
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Twenty_Fourteen
</span><span class="cx">  */
</span><del>-if ( ! is_active_sidebar( 'sidebar-3' ) )
</del><ins>+if ( ! is_active_sidebar( 'sidebar-2' ) )
</ins><span class="cx">   return;
</span><span class="cx"> ?>
</span><span class="cx"> <div id="content-sidebar" class="content-sidebar widget-area" role="complementary">
</span><span class="cx">  <?php do_action( 'before_sidebar' ); ?>
</span><span class="cx"> 
</span><del>-       <?php dynamic_sidebar( 'sidebar-3' ); ?>
</del><ins>+        <?php dynamic_sidebar( 'sidebar-2' ); ?>
</ins><span class="cx"> </div><!-- #content-sidebar -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteensidebarfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/sidebar-footer.php (25761 => 25762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/sidebar-footer.php    2013-10-10 21:49:23 UTC (rev 25761)
+++ trunk/src/wp-content/themes/twentyfourteen/sidebar-footer.php       2013-10-11 03:16:59 UTC (rev 25762)
</span><span class="lines">@@ -6,12 +6,12 @@
</span><span class="cx">  * @subpackage Twenty_Fourteen
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-if ( ! is_active_sidebar( 'sidebar-4' ) )
</del><ins>+if ( ! is_active_sidebar( 'sidebar-3' ) )
</ins><span class="cx">   return;
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div id="supplementary">
</span><del>-       <div id="footer-sidebar" class="widget-area" role="complementary">
-               <?php dynamic_sidebar( 'sidebar-4' ); ?>
</del><ins>+        <div id="footer-sidebar" class="footer-sidebar widget-area" role="complementary">
+               <?php dynamic_sidebar( 'sidebar-3' ); ?>
</ins><span class="cx">   </div><!-- #footer-sidebar -->
</span><span class="cx"> </div><!-- #supplementary -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (25761 => 25762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css     2013-10-10 21:49:23 UTC (rev 25761)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css        2013-10-11 03:16:59 UTC (rev 25762)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> html input[type="button"],
</span><span class="cx"> input[type="reset"],
</span><span class="cx"> input[type="submit"] {
</span><del>-       background-color: #000;
</del><ins>+        background-color: #24890d;
</ins><span class="cx">   border: none;
</span><span class="cx">  border-radius: 2px;
</span><span class="cx">  color: #fff;
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> html input[type="button"]:focus,
</span><span class="cx"> input[type="reset"]:focus,
</span><span class="cx"> input[type="submit"]:focus {
</span><del>-       background-color: #24890d;
</del><ins>+        background-color: #35921f;
</ins><span class="cx">   color: #fff;
</span><span class="cx">  cursor: pointer;
</span><span class="cx"> }
</span><span class="lines">@@ -317,8 +317,7 @@
</span><span class="cx"> html input[type="button"]:active,
</span><span class="cx"> input[type="reset"]:active,
</span><span class="cx"> input[type="submit"]:active {
</span><del>-       background-color: #5FF23D;
-       box-shadow: inset 0 0 8px 2px rgba(0, 0, 0, 0.2), 0 1px 0 0 rgba(0, 0, 0, 0.2);
</del><ins>+        background-color: #5ff23d;
</ins><span class="cx"> }
</span><span class="cx"> input[type="checkbox"],
</span><span class="cx"> input[type="radio"] {
</span><span class="lines">@@ -444,6 +443,8 @@
</span><span class="cx"> .clear:after,
</span><span class="cx"> .hentry:before,
</span><span class="cx"> .hentry:after,
</span><ins>+.footer-sidebar:before,
+.footer-sidebar:after,
</ins><span class="cx"> [class*="content"]:before,
</span><span class="cx"> [class*="content"]:after,
</span><span class="cx"> [class*="site"]:before,
</span><span class="lines">@@ -454,6 +455,7 @@
</span><span class="cx"> 
</span><span class="cx"> .clear:after,
</span><span class="cx"> .hentry:after,
</span><ins>+.footer-sidebar:after,
</ins><span class="cx"> [class*="content"]:after,
</span><span class="cx"> [class*="site"]:after {
</span><span class="cx">  clear: both;
</span><span class="lines">@@ -489,38 +491,6 @@
</span><span class="cx"> .content-area {
</span><span class="cx">  padding-top: 24px;
</span><span class="cx"> }
</span><del>-#secondary {
-       background-color: #000;
-       border-bottom: 1px solid rgba(255, 255, 255, 0.2);
-       clear: both;
-       color: rgba(255, 255, 255, 0.55);
-       padding: 48px 10px 0;
-       position: relative;
-       z-index: 2;
-}
-.content-sidebar {
-       -webkit-box-sizing: border-box;
-       -moz-box-sizing:    border-box;
-       box-sizing:         border-box;
-       padding: 36px 10px 0;
-       position: relative;
-}
-#supplementary {
-       background-color: #000;
-       border-bottom: 1px solid rgba(255, 255, 255, 0.2);
-       color: #949a92;
-       padding: 48px 10px 0;
-       position: relative;
-       z-index: 3;
-}
-.site-footer {
-       background-color: #000;
-       color: rgba(255, 255, 255, 0.55);
-       font-size: 12px;
-       padding: 15px 10px;
-       position: relative;
-       z-index: 3;
-}
</del><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> /* =Header
</span><span class="lines">@@ -880,7 +850,7 @@
</span><span class="cx"> .group-blog .byline {
</span><span class="cx">  display: inline;
</span><span class="cx"> }
</span><del>-.ephemera .entry-title:after,
</del><ins>+.widget_twentyfourteen_ephemera .entry-title:after,
</ins><span class="cx"> .content-area span + .entry-date:before,
</span><span class="cx"> span + .byline:before,
</span><span class="cx"> span + .comments-link:before,
</span><span class="lines">@@ -1248,118 +1218,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-/* =Post Formatted posts column
------------------------------------------------ */
-
-.ephemera {
-       border-top: 1px solid rgba(0, 0, 0, 0.1);
-       border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-       -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;
-}
-.ephemera .widget-title {
-       border-top: 5px solid #000;
-       color: #2b2b2b;
-       font-size: 14px;
-       font-weight: 900;
-       line-height: 1.2857142857;
-       margin-bottom: 18px;
-       padding-top: 1px;
-       text-transform: uppercase;
-}
-.ephemera .entry-content a {
-       word-wrap: break-word;
-}
-.widget_twentyfourteen_ephemera .widget-title:before {
-       background-color: #000;
-       color: #fff;
-       margin-top: -1px;
-       margin-right: 10px;
-       padding: 6px 0 9px;
-       text-align: center;
-       vertical-align: middle;
-       width: 36px;
-}
-.ephemera .video.widget-title:before {
-       content: '\F104';
-}
-.ephemera .image.widget-title:before {
-       content: '\F102';
-}
-.ephemera .gallery.widget-title:before {
-       content: '\F103';
-}
-.ephemera .aside.widget-title:before {
-       content: '\F101';
-}
-.ephemera .quote.widget-title:before {
-       content: '\F106';
-}
-.ephemera .link.widget-title:before {
-       content: '\F107';
-}
-.ephemera .hentry {
-       border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-       margin-bottom: 18px;
-}
-.ephemera .hentry:last-of-type {
-       margin-bottom: 9px;
-}
-.ephemera .entry-title {
-       display: inline;
-       font-size: 12px;
-       font-weight: 400;
-       line-height: 1.5;
-       margin: 0 0 6px 0;
-}
-.ephemera .entry-meta {
-       color: rgba(0, 0, 0, 0.2);
-       line-height: 1.5;
-       margin-bottom: 18px;
-}
-.ephemera .entry-meta a {
-       color: #767676;
-}
-.ephemera .entry-meta a:hover {
-       color: #2b2b2b;
-}
-.ephemera .entry-content p:not(.wp-caption-text) {
-       font-size: 13px;
-       line-height: 1.3846153846;
-       margin-bottom: 18px;
-}
-.ephemera .entry-content blockquote p cite {
-       font-size: 13px;
-       line-height: 1.3846153846;
-}
-.ephemera .wp-caption {
-       margin-bottom: 18px;
-}
-.ephemera .wp-caption-text {
-       line-height: 1.5;
-       margin: 6px 0 0;
-       padding: 0;
-}
-.ephemera .format-gallery .wp-caption-text {
-       margin-bottom: 18px;
-}
-.ephemera .more-link {
-       font-size: 12px;
-       line-height: 1.5;
-}
-.ephemera .post-format-archive-link {
-       display: inline-block;
-       font-size: 12px;
-       font-weight: 900;
-       line-height: 1.5;
-}
-
-
</del><span class="cx"> /* =Media
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><span class="lines">@@ -1788,6 +1646,16 @@
</span><span class="cx"> /* =Primary Sidebar
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><ins>+#secondary {
+       background-color: #000;
+       border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+       clear: both;
+       color: rgba(255, 255, 255, 0.55);
+       padding: 48px 10px 0;
+       position: relative;
+       z-index: 2;
+}
+
</ins><span class="cx"> .site-description {
</span><span class="cx">  color: rgba(255, 255, 255, 0.55);
</span><span class="cx">  display: none;
</span><span class="lines">@@ -1796,47 +1664,44 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-/* =Colophon
------------------------------------------------ */
-
-.site-footer a {
-       color: rgba(255, 255, 255, 0.55);
-}
-.site-footer a:hover {
-       color: #fff;
-}
-
-
</del><span class="cx"> /* =Widgets
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><span class="cx"> .widget-area p {
</span><span class="cx">  margin-bottom: 18px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget-area a {
</span><del>-       color: rgba(255, 255, 255, 0.75);
</del><ins>+        color: #bfbfbf;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget-area a:hover {
</span><del>-       color: #5FF23D;
</del><ins>+        color: #5ff23d;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget-area .widget-title,
</span><del>-.widget-area .widget-title a {
</del><ins>+.widget-area .widget-title a,
+.widget-area .widget-title a:hover {
</ins><span class="cx">   color: #fff;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget {
</span><span class="cx">  margin: 0 auto 48px;
</span><span class="cx">  max-width: 474px;
</span><span class="cx">  overflow: hidden;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget ul,
</span><span class="cx"> .widget ol {
</span><span class="cx">  list-style: none;
</span><span class="cx">  margin: 0;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget li > ul,
</span><span class="cx"> .widget li > ol {
</span><del>-       margin: 0 0 0 10px;
</del><ins>+        margin-left: 10px;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget-title {
</span><span class="cx">  font-size: 14px;
</span><span class="cx">  font-weight: 900;
</span><span class="lines">@@ -1844,30 +1709,15 @@
</span><span class="cx">  margin: 0 0 24px 0;
</span><span class="cx">  text-transform: uppercase;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget-area button,
</span><span class="cx"> .widget-area html input[type="button"],
</span><span class="cx"> .widget-area input[type="reset"],
</span><span class="cx"> .widget-area input[type="submit"] {
</span><del>-       background-color: #24890d;
</del><span class="cx">   font-size: 11px;
</span><span class="cx">  padding: 6px 24px;
</span><span class="cx"> }
</span><del>-.widget-area button:hover,
-.widget-area html input[type="button"]:hover,
-.widget-area input[type="reset"]:hover,
-.widget-area input[type="submit"]:hover,
-.widget-area button:focus,
-.widget-area html input[type="button"]:focus,
-.widget-area input[type="reset"]:focus,
-.widget-area input[type="submit"]:focus {
-       background-color: #35921f;
-}
-.widget-area button:active,
-.widget-area html input[type="button"]:active,
-.widget-area input[type="reset"]:active,
-.widget-area input[type="submit"]:active {
-       background-color: #35921f;
-}
</del><ins>+
</ins><span class="cx"> .widget-area input[type="text"],
</span><span class="cx"> .widget-area input[type="email"],
</span><span class="cx"> .widget-area input[type="url"],
</span><span class="lines">@@ -1880,37 +1730,21 @@
</span><span class="cx">  max-width: 100%;
</span><span class="cx">  padding: 4px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget select,
</span><span class="cx"> .widget iframe {
</span><span class="cx">  margin-left: 1px;
</span><span class="cx">  max-width: 99%;
</span><span class="cx"> }
</span><del>-.widget table:last-child,
-.widget iframe:last-child,
-.widget p:last-child,
-#secondary .widget p:last-child,
-.content-sidebar .widget p:last-child {
-       margin-bottom: 0;
-}
</del><span class="cx"> 
</span><span class="cx"> /* Calendar widget*/
</span><del>-.widget_calendar a {
-       background-color: #24890d;
-       color: #fff;
-       display: block;
-}
-.widget_calendar a:hover {
-       background-color: #35921f;
-}
-.widget-area .widget_calendar a:hover {
-       color: #fff; /* Override custom accent color with more specific selector. */
-}
</del><span class="cx"> .widget_calendar table {
</span><span class="cx">  border: 1px solid rgba(255, 255, 255, 0.2);
</span><span class="cx">  border-width: 1px 0 1px 1px;
</span><span class="cx">  line-height: 2;
</span><span class="cx">  margin: 0;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget_calendar caption {
</span><span class="cx">  color: #fff;
</span><span class="cx">  font-weight: 700;
</span><span class="lines">@@ -1919,15 +1753,32 @@
</span><span class="cx">  text-align: left;
</span><span class="cx">  text-transform: uppercase;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget_calendar thead th,
</span><span class="cx"> .widget_calendar tbody td {
</span><span class="cx">  border: 1px solid rgba(255, 255, 255, 0.2);
</span><span class="cx">  border-width: 0 1px 1px 0;
</span><span class="cx">  text-align: center;
</span><span class="cx"> }
</span><ins>+
+.widget_calendar tbody a {
+       background-color: #24890d;
+       color: #fff;
+       display: block;
+}
+
+.widget_calendar tbody a:hover {
+       background-color: #35921f;
+}
+
+.widget-area .widget_calendar tbody a:hover {
+       color: #fff; /* Override custom accent color with more specific selector. */
+}
+
</ins><span class="cx"> .widget_calendar #prev {
</span><span class="cx">  padding-left: 5px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .widget_calendar #next {
</span><span class="cx">  border-right: 1px solid rgba(255, 255, 255, 0.2);
</span><span class="cx">  padding-right: 5px;
</span><span class="lines">@@ -1935,42 +1786,76 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* Cloud Widgets */
</span><del>-.wp_widget_tag_cloud div,
</del><span class="cx"> .widget_tag_cloud div {
</span><span class="cx">  word-wrap: break-word;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* RSS Widget */
-.widget_rss li {
</del><ins>+/* Ephemera widget*/
+.widget_twentyfourteen_ephemera .hentry {
+       margin-bottom: 0;
+}
+
+.widget_twentyfourteen_ephemera li {
+       border-bottom: 1px solid rgba(255, 255, 255, 0.2);
</ins><span class="cx">   margin-bottom: 18px;
</span><ins>+       padding: 0;
</ins><span class="cx"> }
</span><del>-.widget_rss li:last-child {
-       margin-bottom: 0;
</del><ins>+
+.widget_twentyfourteen_ephemera .entry-title,
+.widget_twentyfourteen_ephemera .entry-meta,
+.widget_twentyfourteen_ephemera .post-format-archive-link {
+       font-size: 11px;
+       line-height: 1.6363636363;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* Recent Comments Widget */
-.widget_recent_comments table {
-       margin-bottom: 0;
</del><ins>+.widget_twentyfourteen_ephemera .entry-title {
+       display: inline;
+       font-weight: 400;
+       margin: 0 0 6px 0;
</ins><span class="cx"> }
</span><del>-.widget_recent_comments .avatar {
-       max-width: none;
</del><ins>+
+.widget_twentyfourteen_ephemera .entry-meta {
+       margin-bottom: 18px;
</ins><span class="cx"> }
</span><del>-.widget_recent_comments .recentcommentsavatartop,
-.widget_recent_comments .recentcommentsavatarend {
-       padding: 8px 8px 8px 0;
</del><ins>+
+.widget_twentyfourteen_ephemera .post-format-archive-link {
+       display: inline-block;
</ins><span class="cx"> }
</span><del>-.widget_recent_comments .recentcommentstexttop,
-.widget_recent_comments .recentcommentstextend {
-       line-height: 1.2857142857;
-       padding: 8px 0 8px 8px;
-       vertical-align: top;
</del><ins>+
+.widget_twentyfourteen_ephemera .wp-caption-text {
+       margin: 6px 0 0;
+       padding: 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.widget_twentyfourteen_ephemera .format-gallery .wp-caption-text {
+       margin-bottom: 18px;
+}
+
+.widget_twentyfourteen_ephemera .entry-content blockquote p cite {
+       font-size: 13px;
+       line-height: 1.3846153846;
+}
+
</ins><span class="cx"> /* Recent Posts Widget */
</span><span class="cx"> .widget_recent_entries .post-date {
</span><span class="cx">  display: block;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+/* RSS Widget */
+.widget_rss a img {
+       display: inline;
+       margin-top: -5px;
+       vertical-align: middle;
+}
+
+.widget_rss li {
+       margin-bottom: 18px;
+}
+
+.widget_rss li:last-child {
+       margin-bottom: 0;
+}
+
</ins><span class="cx"> /* Search widget */
</span><span class="cx"> .search-submit {
</span><span class="cx">  display: none;
</span><span class="lines">@@ -1981,117 +1866,238 @@
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><span class="cx"> .content-sidebar {
</span><ins>+       border-top: 1px solid rgba(0, 0, 0, 0.1);
+       border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+       -webkit-box-sizing: border-box;
+       -moz-box-sizing:    border-box;
+       box-sizing:         border-box;
</ins><span class="cx">   color: #767676;
</span><span class="cx">  font-size: 14px;
</span><span class="cx">  line-height: 1.2857142857;
</span><ins>+       margin: 0 auto;
+       padding: 36px 10px 0;
+       position: relative;
</ins><span class="cx"> }
</span><del>-.content-sidebar p {
-       margin-bottom: 18px;
-}
-.content-sidebar a {
</del><ins>+
+.content-sidebar.widget-area a {
</ins><span class="cx">   color: #2b2b2b;
</span><span class="cx"> }
</span><del>-.content-sidebar a:hover {
</del><ins>+
+.content-sidebar.widget-area a:hover {
</ins><span class="cx">   color: #24890d;
</span><span class="cx"> }
</span><del>-.content-sidebar button,
-.content-sidebar html input[type="button"],
-.content-sidebar input[type="reset"],
-.content-sidebar input[type="submit"] {
-       background-color: #000;
-       font-size: 12px;
-       padding: 6px 24px;
</del><ins>+
+.content-sidebar.widget-area .widget-title {
+       border-top: 5px solid #000;
+       color: #2b2b2b;
+       font-size: 14px;
+       font-weight: 900;
+       margin-bottom: 18px;
+       padding-top: 7px;
+       text-transform: uppercase;
</ins><span class="cx"> }
</span><del>-.content-sidebar button:hover,
-.content-sidebar html input[type="button"]:hover,
-.content-sidebar input[type="reset"]:hover,
-.content-sidebar input[type="submit"]:hover,
-.content-sidebar button:focus,
-.content-sidebar html input[type="button"]:focus,
-.content-sidebar input[type="reset"]:focus,
-.content-sidebar input[type="submit"]:focus {
-       background-color: #24890d;
</del><ins>+
+.content-sidebar.widget-area .widget-title a,
+.content-sidebar.widget-area .widget-title a:hover {
+       color: #2b2b2b;
</ins><span class="cx"> }
</span><del>-.content-sidebar button:active,
-.content-sidebar html input[type="button"]:active,
-.content-sidebar input[type="reset"]:active,
-.content-sidebar input[type="submit"]:active {
-       background-color: #5FF23D;
</del><ins>+
+.content-sidebar.widget-area button,
+.content-sidebar.widget-area html input[type="button"],
+.content-sidebar.widget-area input[type="reset"],
+.content-sidebar.widget-area input[type="submit"] {
+       font-size: 12px;
</ins><span class="cx"> }
</span><del>-.content-sidebar input[type="text"],
-.content-sidebar input[type="email"],
-.content-sidebar input[type="url"],
-.content-sidebar input[type="search"],
-.content-sidebar input[type="password"],
-.content-sidebar textarea {
</del><ins>+
+.content-sidebar.widget-area input[type="text"],
+.content-sidebar.widget-area input[type="email"],
+.content-sidebar.widget-area input[type="url"],
+.content-sidebar.widget-area input[type="search"],
+.content-sidebar.widget-area input[type="password"],
+.content-sidebar.widget-area textarea {
</ins><span class="cx">   background-color: #fff;
</span><span class="cx">  border: 1px solid rgba(0, 0, 0, 0.1);
</span><span class="cx">  color: #2b2b2b;
</span><del>-       padding: 4px;
</del><span class="cx"> }
</span><del>-.content-sidebar .widget-title {
-       border-top: 5px solid #000;
-       color: #2b2b2b;
-       font-size: 14px;
-       font-weight: 900;
-       margin: 0 0 18px 0;
-       padding-top: 7px;
-       text-transform: uppercase;
-}
-.content-sidebar .widget li {
</del><ins>+
+/* List Style Widgets*/
+.content-sidebar .widget_archive li,
+.content-sidebar .widget_categories li,
+.content-sidebar .widget_pages li,
+.content-sidebar .widget_meta li,
+.content-sidebar .widget_recent_comments li,
+.content-sidebar .widget_recent_entries li,
+.content-sidebar .widget_nav_menu li {
</ins><span class="cx">   border-top: 1px solid rgba(0, 0, 0, 0.1);
</span><span class="cx">  padding: 8px 0 9px;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .content-sidebar .widget li:first-child {
</span><span class="cx">  border-top: none;
</span><span class="cx"> }
</span><del>-.content-sidebar .widget .children,
-.content-sidebar .widget .sub-menu {
-       margin: 0 0 0 20px;
-}
</del><ins>+
</ins><span class="cx"> .content-sidebar .widget li li {
</span><span class="cx">  border-top: none;
</span><span class="cx">  padding-bottom: 0;
</span><span class="cx"> }
</span><ins>+
+.content-sidebar .widget .children,
+.content-sidebar .widget .sub-menu {
+       margin-left: 18px;
+}
+
+/* Calendar widget*/
</ins><span class="cx"> .content-sidebar .widget_calendar table,
</span><span class="cx"> .content-sidebar .widget_calendar thead th,
</span><span class="cx"> .content-sidebar .widget_calendar tbody td,
</span><span class="cx"> .content-sidebar .widget_calendar #next {
</span><span class="cx">  border-color: rgba(0, 0, 0, 0.1);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .content-sidebar .widget_calendar caption {
</span><span class="cx">  color: #2b2b2b;
</span><span class="cx">  font-size: 14px;
</span><span class="cx">  font-weight: 900;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .content-sidebar .widget_calendar thead th {
</span><span class="cx">  background-color: rgba(0, 0, 0, 0.02);
</span><span class="cx"> }
</span><del>-.content-sidebar .widget_rss li {
-       margin-bottom: 0;
</del><ins>+
+.content-sidebar .widget_calendar tbody a,
+.content-sidebar.widget-area .widget_calendar tbody a:hover {
+       color: #fff; /* Override custom accent color with more specific selector. */
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+/* Ephemera widget*/
+.content-sidebar .widget_twentyfourteen_ephemera .widget-title {
+       line-height: 1.2857142857;
+       padding-top: 1px;
+}
</ins><span class="cx"> 
</span><del>-/* =Footer Sidebar
</del><ins>+.content-sidebar .widget_twentyfourteen_ephemera .widget-title:before {
+       background-color: #000;
+       color: #fff;
+       margin-top: -1px;
+       margin-right: 10px;
+       padding: 6px 0 9px;
+       text-align: center;
+       vertical-align: middle;
+       width: 36px;
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .video.widget-title:before {
+       content: "\f104";
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .image.widget-title:before {
+       content: "\f102";
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .gallery.widget-title:before {
+       content: "\f103";
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .aside.widget-title:before {
+       content: "\f101";
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .quote.widget-title:before {
+       content: "\f106";
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .link.widget-title:before {
+       content: "\f107";
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera li {
+       border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .entry-title,
+.content-sidebar .widget_twentyfourteen_ephemera .entry-meta,
+.content-sidebar .widget_twentyfourteen_ephemera .wp-caption-text,
+.content-sidebar .widget_twentyfourteen_ephemera .more-link,
+.content-sidebar .widget_twentyfourteen_ephemera .post-format-archive-link {
+       font-size: 12px;
+       line-height: 1.5;
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .entry-title {
+       font-weight: 400;
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .entry-meta {
+       color: rgba(0, 0, 0, 0.2);
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .entry-meta a {
+       color: #767676;
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .entry-meta a:hover{
+       color: #2b2b2b;
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .post-format-archive-link {
+       color: #24890d;
+       font-weight: 900;
+}
+
+.content-sidebar .widget_twentyfourteen_ephemera .post-format-archive-link:hover {
+       color: #5ff23d;
+}
+
+
+/* =Footer
</ins><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><del>-.site-footer .widget-area {
</del><ins>+#supplementary {
+       background-color: #000;
+       border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+       color: #949a92;
+       padding: 48px 10px 0;
+       position: relative;
+       z-index: 3;
+}
+
+.site-footer {
+       background-color: #000;
+       color: rgba(255, 255, 255, 0.55);
+       font-size: 12px;
+       position: relative;
+       z-index: 3;
+}
+
+.site-footer .widget {
</ins><span class="cx">   -webkit-box-sizing: border-box;
</span><span class="cx">  -moz-box-sizing:    border-box;
</span><span class="cx">  box-sizing:         border-box;
</span><del>-}
-.site-footer .widget {
</del><span class="cx">   float: left;
</span><del>-       padding-left: 27px;
-       width: 198px;
</del><ins>+        padding: 0 27px;
+       width: 315px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.site-info {
+       color: #bfbfbf;
+       padding: 15px 10px;
+}
</ins><span class="cx"> 
</span><ins>+.site-info a {
+       color: #bfbfbf;
+}
+
+.site-info a:hover {
+       color: #fff;
+}
+
+
</ins><span class="cx"> /* =Contributor Page
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx"> 
</span><span class="cx"> .contributor {
</span><span class="cx">  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
</span><ins>+       -webkit-box-sizing: border-box;
</ins><span class="cx">   -moz-box-sizing: border-box;
</span><span class="cx">  box-sizing:      border-box;
</span><span class="cx">  padding: 48px 10px;
</span><span class="lines">@@ -2325,17 +2331,13 @@
</span><span class="cx">          padding-right: 30px;
</span><span class="cx">          padding-left: 30px;
</span><span class="cx">  }
</span><del>-       .content-sidebar,
-       .ephemera {
</del><ins>+        .content-sidebar {
+               border: 0;
</ins><span class="cx">           float: right;
</span><span class="cx">          margin-left: -33.33333333%;
</span><span class="cx">          padding: 36px 30px 24px;
</span><span class="cx">          width: 33.33333333%;
</span><span class="cx">  }
</span><del>-       .ephemera {
-               border: none;
-               clear: none;
-       }
</del><span class="cx">   #secondary {
</span><span class="cx">          padding: 48px 30px 0;
</span><span class="cx">  }
</span><span class="lines">@@ -2406,8 +2408,7 @@
</span><span class="cx"> 
</span><span class="cx"> @media screen and (min-width: 870px) {
</span><span class="cx">  .content-area,
</span><del>-       .content-sidebar,
-       .ephemera {
</del><ins>+        .content-sidebar {
</ins><span class="cx">           padding-top: 72px;
</span><span class="cx">  }
</span><span class="cx">  .content-area .has-featured-image .entry-header,
</span><span class="lines">@@ -2464,17 +2465,13 @@
</span><span class="cx">  .site-content {
</span><span class="cx">          margin: 0 29.04761904% 0 182px;
</span><span class="cx">  }
</span><del>-       .content-sidebar,
-       .ephemera {
</del><ins>+        .content-sidebar {
</ins><span class="cx">           margin-left: -29.04761904%;
</span><span class="cx">          width: 29.04761904%;
</span><span class="cx">  }
</span><span class="cx">  .content-area .entry-header {
</span><span class="cx">          margin-top: 0;
</span><span class="cx">  }
</span><del>-       .site-footer {
-               padding-left: 27px;
-       }
</del><span class="cx">   .site:before {
</span><span class="cx">          background-color: #000;
</span><span class="cx">          content: '';
</span><span class="lines">@@ -2552,9 +2549,11 @@
</span><span class="cx">  #supplementary {
</span><span class="cx">          font-size: 11px;
</span><span class="cx">          line-height: 1.6363636363;
</span><del>-               padding-right: 0;
-               padding-left: 0;
</del><ins>+                padding: 48px 0 0;
</ins><span class="cx">   }
</span><ins>+       .site-info {
+               padding-left: 27px;
+       }
</ins><span class="cx">   .front-page-content-wrapper {
</span><span class="cx">          float: left;
</span><span class="cx">  }
</span></span></pre>
</div>
</div>

</body>
</html>