<!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>[25864] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: further revise primary navigation functionality, simplify mobile navigation, and clean up the main JS file.</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/25864">25864</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-10-22 16:36:26 +0000 (Tue, 22 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: further revise primary navigation functionality, simplify mobile navigation, and clean up the main JS file. Props obenland, iamtakashi. See <a href="http://core.trac.wordpress.org/ticket/25554">#25554</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenheaderphp">trunk/src/wp-content/themes/twentyfourteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenrtlcss">trunk/src/wp-content/themes/twentyfourteen/rtl.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsfunctionsjs">trunk/src/wp-content/themes/twentyfourteen/js/functions.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsthemejs">trunk/src/wp-content/themes/twentyfourteen/js/theme.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php (25863 => 25864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-10-22 09:48:36 UTC (rev 25863)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2013-10-22 16:36:26 UTC (rev 25864)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> if ( is_active_sidebar( 'sidebar-3' ) )
</span><span class="cx"> wp_enqueue_script( 'jquery-masonry' );
</span><span class="cx">
</span><del>- wp_enqueue_script( 'twentyfourteen-theme', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20130820', true );
</del><ins>+ wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20131011', true );
</ins><span class="cx">
</span><span class="cx"> // Add Lato font used in the main stylesheet.
</span><span class="cx"> wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
</span><span class="lines">@@ -374,6 +374,11 @@
</span><span class="cx"> if ( is_multi_author() )
</span><span class="cx"> $classes[] = 'group-blog';
</span><span class="cx">
</span><ins>+ if ( get_header_image() )
+ $classes[] = 'header-image';
+ else
+ $classes[] = 'masthead-fixed';
+
</ins><span class="cx"> if ( is_archive() || is_search() || is_home() )
</span><span class="cx"> $classes[] = 'list-view';
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/header.php (25863 => 25864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/header.php 2013-10-22 09:48:36 UTC (rev 25863)
+++ trunk/src/wp-content/themes/twentyfourteen/header.php 2013-10-22 16:36:26 UTC (rev 25864)
</span><span class="lines">@@ -39,21 +39,17 @@
</span><span class="cx"> <div class="header-main">
</span><span class="cx"> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx">
</span><del>- <div class="header-extra">
- <div class="search-toggle">
- <a href="#search-container"><?php _e( 'Search', 'twentyfourteen' ); ?></a>
- </div>
</del><ins>+ <div class="search-toggle">
+ <a href="#search-container" class="screen-reader-text"><?php _e( 'Search', 'twentyfourteen' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <nav role="navigation" class="site-navigation primary-navigation">
- <h1 class="screen-reader-text"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></h1>
- <a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a></a>
- <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</del><ins>+ <nav id="primary-navigation" class="site-navigation primary-navigation" role="navigation">
+ <h1 class="menu-toggle"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></h1>
+ <a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a>
+ <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
</ins><span class="cx"> </nav>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="mobile-navigations" class="hide"></div>
-
</del><span class="cx"> <div id="search-container" class="search-box-wrapper hide">
</span><span class="cx"> <div class="search-box clear">
</span><span class="cx"> <?php get_search_form(); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php (25863 => 25864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-10-22 09:48:36 UTC (rev 25863)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-10-22 16:36:26 UTC (rev 25864)
</span><span class="lines">@@ -126,15 +126,19 @@
</span><span class="cx"> input[type="button"],
</span><span class="cx"> input[type="reset"],
</span><span class="cx"> input[type="submit"],
</span><del>- .header-extra,
</del><span class="cx"> .search-toggle,
</span><del>- .primary-navigation ul ul,
- .primary-navigation li:hover > a,
</del><span class="cx"> .hentry .mejs-controls .mejs-time-rail .mejs-time-current,
</span><span class="cx"> .widget_calendar tbody a {
</span><span class="cx"> background-color: ' . $accent_color . ';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ @media screen and (min-width: 782px) {
+ .primary-navigation ul ul,
+ .primary-navigation li:hover > a {
+ background-color: ' . $accent_color . ';
+ }
+ }
+
</ins><span class="cx"> ::-moz-selection {
</span><span class="cx"> background: ' . $accent_color . ';
</span><span class="cx"> }
</span><span class="lines">@@ -160,6 +164,7 @@
</span><span class="cx"> .search-toggle:hover,
</span><span class="cx"> .search-toggle.active,
</span><span class="cx"> .search-box,
</span><ins>+ .primary-navigation ul ul a:hover,
</ins><span class="cx"> .widget_calendar tbody a:hover {
</span><span class="cx"> background-color: ' . $accent_lighter . ';
</span><span class="cx"> }
</span><span class="lines">@@ -178,7 +183,9 @@
</span><span class="cx"> a:focus,
</span><span class="cx"> a:active,
</span><span class="cx"> .site-navigation .current_page_item > a,
</span><ins>+ .site-navigation .current_page_ancestor > a,
</ins><span class="cx"> .site-navigation .current-menu-item > a,
</span><ins>+ .site-navigation .current-menu-ancestor > a,
</ins><span class="cx"> .secondary-navigation a:hover,
</span><span class="cx"> .entry-title a:hover,
</span><span class="cx"> .cat-links a:hover,
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjsfunctionsjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-content/themes/twentyfourteen/js/functions.js (0 => 25864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/functions.js (rev 0)
+++ trunk/src/wp-content/themes/twentyfourteen/js/functions.js 2013-10-22 16:36:26 UTC (rev 25864)
</span><span class="lines">@@ -0,0 +1,101 @@
</span><ins>+( function( $ ) {
+ var body = $( 'body' ),
+ _window = $( window );
+
+ /**
+ * Enables menu toggle for small screens.
+ */
+ ( function() {
+ var nav = $( '#primary-navigation' ), button, menu;
+ if ( ! nav )
+ return;
+
+ button = nav.find( '.menu-toggle' );
+ if ( ! button )
+ return;
+
+ // Hide button if menu is missing or empty.
+ menu = nav.find( '.nav-menu' );
+ if ( ! menu || ! menu.children().length ) {
+ button.hide();
+ return;
+ }
+
+ $( '.menu-toggle' ).on( 'click.twentyfourteen', function() {
+ nav.toggleClass( 'toggled-on' );
+ } );
+ } )();
+
+ /**
+ * Makes "skip to content" link work correctly in IE9 and Chrome for better
+ * accessibility.
+ *
+ * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
+ */
+ _window.on( 'hashchange.twentyfourteen', function() {
+ var element = document.getElementById( location.hash.substring( 1 ) );
+
+ if ( element ) {
+ if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) )
+ element.tabIndex = -1;
+
+ element.focus();
+ };
+ } );
+
+ $( function() {
+ /**
+ * Search toggle.
+ */
+ $( '.search-toggle' ).on( 'click.twentyfourteen', function() {
+ var that = $( this ),
+ wrapper = $( '.search-box-wrapper' );
+
+ that.toggleClass( 'active' );
+ wrapper.toggleClass( 'hide' );
+
+ if ( that.is( '.active' ) )
+ wrapper.find( '.search-field' ).focus();
+ } );
+
+ /**
+ * Fixed navbar.
+ *
+ * The callback on the scroll event is only added if there is a header
+ * image and we are not on mobile.
+ */
+ if ( body.is( '.header-image' ) && _window.width() > 781 ) {
+ var toolbarOffset = body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0,
+ mastheadOffset = $( '#masthead' ).offset().top - toolbarOffset;
+
+ _window.on( 'scroll.twentyfourteen', function() {
+ if ( window.scrollY > mastheadOffset )
+ body.addClass( 'masthead-fixed' );
+ else
+ body.removeClass( 'masthead-fixed' );
+ } );
+ }
+
+ /**
+ * Focus styles for primary menu.
+ */
+ $( '.primary-navigation' ).find( 'a' ).on( 'focus.twentyfourteen blur.twentyfourteen', function() {
+ $( this ).parents().toggleClass( 'focus' );
+ } );
+ } );
+
+ /**
+ * Arranges footer widgets vertically.
+ */
+ if ( $.isFunction( $.fn.masonry ) ) {
+ $( '#footer-sidebar' ).masonry( {
+ itemSelector: '.widget',
+ columnWidth: function( containerWidth ) {
+ return containerWidth / 4;
+ },
+ gutterWidth: 0,
+ isResizable: true,
+ isRTL: $( 'body' ).is( '.rtl' )
+ } );
+ }
+} )( jQuery );
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/src/wp-content/themes/twentyfourteen/js/functions.js
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentyfourteenjsthemejs"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-content/themes/twentyfourteen/js/theme.js (25863 => 25864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/theme.js 2013-10-22 09:48:36 UTC (rev 25863)
+++ trunk/src/wp-content/themes/twentyfourteen/js/theme.js 2013-10-22 16:36:26 UTC (rev 25864)
</span><span class="lines">@@ -1,124 +0,0 @@
</span><del>-( function( $ ) {
-
- $( document ).ready( function() {
-
- var $primaryNaviClone,
- $secondaryNaviClone,
- $masthead = $( '#masthead' ),
- $secondaryTop = $( '#secondary-top' ),
- $mobileNavigations = $( '#mobile-navigations'),
- $searchBoxWrapper = $( 'div.search-box-wrapper' ),
- $searchToggle = $( 'div.search-toggle' ),
- timeout = false;
-
- // Toggle function.
- function menuToggle() {
- $( 'span#nav-toggle' ).toggleClass( 'active' );
- $masthead.find( '#mobile-navigations' ).toggleClass( 'hide' );
- }
-
- // Click event for toggle the search
- $searchToggle.click( function() {
- $( this ).toggleClass( 'active' );
- $searchBoxWrapper.toggleClass( 'hide' );
-
- if ( $( this ).hasClass( 'active' ) )
- $searchBoxWrapper.find( '.search-field' ).focus();
- } );
-
- // DOM manipulations for mobile header
- function mobileHeader() {
- // Check if the toggler exists. If not add it.
- if ( ! $( '#nav-toggle' ).length )
- $( '<span id="nav-toggle" class="genericon" />' ).appendTo( $masthead );
-
- // Clone and detach the primary navigation for use later
- $primaryNaviClone = $masthead.find( 'nav.primary-navigation' ).detach();
-
- // Clone and detach the secondary navigation for use later
- $secondaryNaviClone = $secondaryTop.find( 'nav.secondary-navigation' ).detach();
-
- // Prepend the primary navigation clone to #mobile-navigations and remove the class and add an id
- $primaryNaviClone.prependTo( $mobileNavigations ).removeClass( 'primary-navigation' ).addClass( 'mobile-navigation' ).attr( 'id', 'primary-mobile-navigation' );
-
- // Append the secondary navigation clone to #mobile-navigations and remove the class and add an id
- $secondaryNaviClone.appendTo( $mobileNavigations ).removeClass( 'secondary-navigation' ).addClass( 'mobile-navigation' ).attr( 'id', 'secondary-mobile-navigation' );
-
- // Remove the click event first and bind it after to make sure it's invoked once.
- $( 'span#nav-toggle' ).off( 'click', menuToggle ).click( menuToggle );
- };
-
- // DOM manupilations for desktop header
- function normalHeader() {
- // Check if the toggler exists. If it does remove it.
- if ( $( 'span#nav-toggle').length )
- $( 'span#nav-toggle' ).remove();
-
- // Clone and detach the primary mobile navigation for use later
- $primaryNaviClone = $mobileNavigations.find( '#primary-mobile-navigation' ).detach();
-
- // Clone and detach the secondary mobile navigation for use later
- $secondaryNaviClone = $mobileNavigations.find( '#secondary-mobile-navigation' ).detach();
-
- // Append the secondary navigation clone to #mobile-navigations and remove the class and add an id
- $primaryNaviClone.appendTo( '.header-main' ).removeClass( 'mobile-navigation' ).removeAttr( 'id' ).addClass( 'primary-navigation' );
-
- // Append the secondary navigation clone to #mobile-navigations and remove the class and add an id
- $secondaryNaviClone.appendTo( $secondaryTop ).removeClass( 'mobile-navigation' ).removeAttr( 'id' ).addClass( 'secondary-navigation' );
- };
-
- // Check viewport width when user resizes the browser window.
- $( window ).resize( function() {
- if ( false !== timeout )
- clearTimeout( timeout );
-
- timeout = setTimeout( function() {
- if ( $( window ).width() < 770 ) {
- mobileHeader();
- } else {
- normalHeader();
- }
- }, 100 );
-
- } ).resize();
-
- // Sticky header.
- var $mastheadOffset = -1,
- $toolbarOffset = $( 'body' ).is( '.admin-bar' ) ? 32 : 0,
- $maindiv = $( '#main' );
-
- $( window ).on( 'scroll', false, function() {
- if ( $mastheadOffset < 0 )
- $mastheadOffset = $masthead.offset().top - $toolbarOffset;
-
- if ( ( window.scrollY > $mastheadOffset ) && ( $( window ).width() > 769 ) ) {
- $masthead.addClass( 'masthead-fixed' );
- $maindiv.css( {
- marginTop: $masthead.height()
- } );
- } else {
- $masthead.removeClass( 'masthead-fixed' );
- $maindiv.css( {
- marginTop: 0
- } );
- }
- } );
-
- // Arranges footer widgets vertically.
- if ( $.isFunction( $.fn.masonry ) ) {
-
- $( '#footer-sidebar' ).masonry( {
- itemSelector: '.widget',
- columnWidth: 315,
- gutterWidth: 0,
- isRTL: $( 'body' ).is( '.rtl' )
- } );
- }
-
- } );
-
- /* Focus styles for primary menu. */
- $( '.primary-navigation' ).find( 'a' ).on( 'focus.twentyfourteen blur.twentyfourteen', function() {
- $( this ).parents().toggleClass( 'focus' );
- });
-} )( jQuery );
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/rtl.css (25863 => 25864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/rtl.css 2013-10-22 09:48:36 UTC (rev 25863)
+++ trunk/src/wp-content/themes/twentyfourteen/rtl.css 2013-10-22 16:36:26 UTC (rev 25864)
</span><span class="lines">@@ -59,22 +59,17 @@
</span><span class="cx"> /* =Header
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span><del>-.header-main {
- margin-left: 48px;
- padding-right: 10px;
- padding-left: 0;
</del><ins>+.search-toggle {
+ float: left;
+ margin-left: 38px;
</ins><span class="cx"> margin-right: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.header-extra {
- float: left;
-}
-
</del><span class="cx"> .site-title {
</span><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#nav-toggle {
</del><ins>+.menu-toggle {
</ins><span class="cx"> left: 0;
</span><span class="cx"> right: auto;
</span><span class="cx"> }
</span><span class="lines">@@ -93,18 +88,17 @@
</span><span class="cx"> ----------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> /* Primary Navigation */
</span><del>-.primary-navigation {
- float: left;
- margin: 0 -10px 0 10px;
-}
-
</del><span class="cx"> .primary-navigation ul {
</span><span class="cx"> padding-right: 0;
</span><span class="cx"> padding-left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.primary-navigation ul ul li {
+ margin-left: auto;
+ margin-right: 15px;
+}
+
</ins><span class="cx"> .primary-navigation ul ul {
</span><del>- float: right;
</del><span class="cx"> right: -999em;
</span><span class="cx"> left: auto;
</span><span class="cx"> }
</span><span class="lines">@@ -493,10 +487,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-width: 770px) {
</del><ins>+@media screen and (min-width: 782px) {
</ins><span class="cx"> .header-main {
</span><ins>+ padding: 0 27px 0 0;
+ }
+
+ .search-toggle {
</ins><span class="cx"> margin-left: 0;
</span><del>- margin-right: auto;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (25863 => 25864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2013-10-22 09:48:36 UTC (rev 25863)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2013-10-22 16:36:26 UTC (rev 25864)
</span><span class="lines">@@ -411,6 +411,7 @@
</span><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><ins>+ background-image: -webkit-linear-gradient(hsla(0,0%,100%,0), hsla(0,0%,100%,0)); /* Removing the inner shadow, rounded corners on iOS inputs */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> button,
</span><span class="lines">@@ -728,6 +729,7 @@
</span><span class="cx"> .comment-reply-link:before,
</span><span class="cx"> .comment-reply-login:before,
</span><span class="cx"> .contributor-posts-link:before,
</span><ins>+.menu-toggle:before,
</ins><span class="cx"> .search-toggle:before,
</span><span class="cx"> .widget_twentyfourteen_ephemera .widget-title:before {
</span><span class="cx"> -webkit-font-smoothing: antialiased;
</span><span class="lines">@@ -785,16 +787,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .header-main {
</span><del>- margin-right: 48px;
</del><span class="cx"> min-height: 48px;
</span><del>- padding-left: 10px;
</del><ins>+ padding: 0 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.header-extra {
- background-color: #24890d;
- float: right;
-}
-
</del><span class="cx"> .site-title {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> float: left;
</span><span class="lines">@@ -812,20 +808,12 @@
</span><span class="cx">
</span><span class="cx"> .search-toggle {
</span><span class="cx"> background-color: #24890d;
</span><del>- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- color: #fff;
</del><span class="cx"> cursor: pointer;
</span><del>- display: block;
- float: left;
- font-size: 10px;
- min-width: 70px;
- min-height: 48px;
- padding: 25px 10px 0;
- position: relative;
</del><ins>+ float: right;
+ height: 48px;
+ margin-right: 38px;
</ins><span class="cx"> text-align: center;
</span><del>- text-transform: uppercase;
</del><ins>+ width: 48px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .search-toggle:hover,
</span><span class="lines">@@ -836,22 +824,15 @@
</span><span class="cx"> .search-toggle:before {
</span><span class="cx"> color: #fff;
</span><span class="cx"> content: "\f400";
</span><del>- margin-left: -8px;
- position: absolute;
- top: 9px;
- left: 50%;
</del><ins>+ font-size: 20px;
+ margin-top: 14px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.search-toggle a,
-.search-toggle a:hover {
- color: #fff;
-}
-
</del><span class="cx"> .search-box-wrapper {
</span><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>- position: absolute;
</del><ins>+ position: relative;
</ins><span class="cx"> width: 100%;
</span><span class="cx"> z-index: 2;
</span><span class="cx"> }
</span><span class="lines">@@ -865,27 +846,11 @@
</span><span class="cx"> float: right;
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> margin: 12px 10px;
</span><del>- padding: 3px 6px;
- width: 326px;
</del><ins>+ padding: 3px 2px 3px 6px;
+ width: 240px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-/* Fixed Header */
</del><span class="cx">
</span><del>-.site-header.masthead-fixed {
- box-shadow: 0 1px 8px rgba(0, 0, 0, 0.2);
- position: fixed;
- top: 0;
-}
-
-.admin-bar .site-header.masthead-fixed {
- top: 28px;
-}
-
-.admin-bar.mp6 .site-header.masthead-fixed {
- top: 32px;
-}
-
-
</del><span class="cx"> /**
</span><span class="cx"> * 5.0 Navigations
</span><span class="cx"> * -----------------------------------------------------------------------------
</span><span class="lines">@@ -897,7 +862,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .site-navigation .current_page_item > a,
</span><del>-.site-navigation .current-menu-item > a {
</del><ins>+.site-navigation .current_page_ancestor > a,
+.site-navigation .current-menu-item > a,
+.site-navigation .current-menu-ancestor > a {
</ins><span class="cx"> color: #55d737;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -908,92 +875,65 @@
</span><span class="cx"> /* Primary Navigation */
</span><span class="cx">
</span><span class="cx"> .primary-navigation {
</span><del>- display: none;
- float: right;
- font-size: 11px;
- line-height: 1.6363636363;
- margin: 0 10px 0 -10px;
-}
-
-.primary-navigation ul {
- margin: 0;
- padding-left: 0;
-}
-
-.primary-navigation li {
</del><ins>+ background-color: #000;
</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>- display: inline-block;
- height: 48px;
- line-height: 48px;
- position: relative;
</del><ins>+ font-size: 14px;
+ margin: 0 auto;
+ padding-top: 24px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation a {
- display: inline-block;
- padding: 0 10px;
- text-decoration: none;
- white-space: nowrap;
</del><ins>+.primary-navigation.toggled-on {
+ border-bottom: 1px solid rgba(255, 255, 255, 0.4);
+ margin-bottom: 36px;
+ padding-top: 72px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation ul ul {
- background-color: #24890d;
- float: left;
- position: absolute;
- top: 48px;
- left: -999em;
- z-index: 99999;
</del><ins>+.primary-navigation .nav-menu {
+ display: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation li li {
</del><ins>+.primary-navigation.toggled-on .nav-menu {
</ins><span class="cx"> display: block;
</span><del>- height: auto;
- line-height: 1.6363636363;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation ul ul ul {
- left: -999em;
- top: 0;
</del><ins>+.primary-navigation ul {
+ list-style: none;
+ margin: 0;
+ padding-left: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation ul ul a {
- padding: 9px 12px;
- white-space: normal;
- width: 148px;
</del><ins>+.primary-navigation li {
+ border-top: 1px solid rgba(255, 255, 255, 0.2);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation li:hover > a {
- background-color: #24890d;
- color: #fff;
</del><ins>+.primary-navigation ul ul li {
+ margin-left: 15px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation ul ul a:hover {
- background-color: #000;
</del><ins>+.primary-navigation a {
+ color: #fff;
+ display: block;
+ padding: 7px 0;
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation ul li:hover > ul,
-.primary-navigation ul li.focus > ul {
- left: auto;
</del><ins>+.primary-navigation a:hover {
+ color: rgba(255, 255, 255, 0.7);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.primary-navigation ul ul li:hover > ul,
-.primary-navigation ul ul li.focus > ul {
- left: 100%;
-}
-
</del><span class="cx"> /* Secondary Navigation */
</span><span class="cx">
</span><span class="cx"> .secondary-navigation {
</span><del>- border-bottom: 1px solid rgba(255, 255, 255, 0.4);
</del><ins>+ border-bottom: 1px solid rgba(255, 255, 255, 0.2);
</ins><span class="cx"> font-size: 14px;
</span><del>- margin: 0 auto 48px;
- max-width: 474px;
</del><ins>+ margin: 48px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .secondary-navigation a {
</span><span class="cx"> display: block;
</span><del>- padding: 7px 0;
</del><ins>+ padding: 8px 0 9px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .secondary-navigation a:hover {
</span><span class="lines">@@ -1009,66 +949,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .secondary-navigation li {
</span><del>- border-top: 1px solid rgba(255, 255, 255, 0.4);
-}
-
-.secondary-navigation li li {
</del><span class="cx"> border-top: 1px solid rgba(255, 255, 255, 0.2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Mobile Navigations */
-
-#mobile-navigations {
- margin: 1px auto 0;
- max-width: 474px;
-}
-
-.mobile-navigation {
</del><ins>+.menu-toggle {
</ins><span class="cx"> background-color: #000;
</span><del>- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- font-size: 14px;
- padding: 24px 10px 0;
-}
-
-.mobile-navigation ul {
</del><ins>+ cursor: pointer;
+ font-size: 0;
+ height: 16px;
</ins><span class="cx"> margin: 0;
</span><del>-}
-
-.mobile-navigation li {
- border-top: 1px solid rgba(255, 255, 255, 0.4);
-}
-
-.mobile-navigation li li {
- border-top: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-.mobile-navigation ul ul li {
- margin-left: 15px;
-}
-
-.mobile-navigation a {
- display: block;
- padding: 7px 0;
- text-decoration: none;
-}
-
-.mobile-navigation a:hover {
- color: rgba(255, 255, 255, 0.7);
-}
-
-#nav-toggle {
- background-color: #000;
- cursor: pointer;
- line-height: 1;
</del><span class="cx"> padding: 16px;
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#nav-toggle:before {
</del><ins>+.menu-toggle:before {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> content: "\f419";
</span><span class="cx"> }
</span><span class="lines">@@ -1111,15 +1007,14 @@
</span><span class="cx"> background: #767676;
</span><span class="cx"> background-attachment: fixed;
</span><span class="cx"> background-image: -webkit-linear-gradient(135deg, #767676 12.5%, #fff 12.5%, #fff 50%, #767676 50%, #767676 62.5%, #fff 62.5%);
</span><del>- background-image: linear-gradient(135deg, #767676 12.5%, #fff 12.5%, #fff 50%, #767676 50%, #767676 62.5%, #fff 62.5%);
</del><span class="cx"> background-size: 4px 4px;
</span><span class="cx"> display: none;
</span><span class="cx"> float: none;
</span><ins>+ height: auto;
</ins><span class="cx"> margin: 0;
</span><span class="cx"> min-height: 180px;
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 100%;
</span><del>- height: auto;
</del><span class="cx"> z-index: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1127,7 +1022,6 @@
</span><span class="cx"> background: #919191;
</span><span class="cx"> background-attachment: fixed;
</span><span class="cx"> background-image: -webkit-linear-gradient(135deg, #919191 12.5%, #fff 12.5%, #fff 50%, #919191 50%, #919191 62.5%, #fff 62.5%);
</span><del>- background-image: linear-gradient(135deg, #919191 12.5%, #fff 12.5%, #fff 50%, #919191 50%, #919191 62.5%, #fff 62.5%);
</del><span class="cx"> background-size: 4px 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1279,11 +1173,11 @@
</span><span class="cx"> border-right: 8px solid #767676;
</span><span class="cx"> border-bottom: 10px solid transparent;
</span><span class="cx"> content: "";
</span><ins>+ height: 0;
</ins><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> left: -8px;
</span><span class="cx"> width: 0;
</span><del>- height: 0;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .tag-links a:hover:before,
</span><span class="lines">@@ -1295,11 +1189,11 @@
</span><span class="cx"> background-color: #fff;
</span><span class="cx"> border-radius: 50%;
</span><span class="cx"> content: "";
</span><ins>+ height: 4px;
</ins><span class="cx"> position: absolute;
</span><span class="cx"> top: 8px;
</span><span class="cx"> left: -2px;
</span><span class="cx"> width: 4px;
</span><del>- height: 4px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-moz-document url-prefix() { /* For Firefox to avoid jagged edge */
</span><span class="lines">@@ -1426,10 +1320,10 @@
</span><span class="cx"> background: #fff;
</span><span class="cx"> border: 1px solid #fff;
</span><span class="cx"> display: inline-block;
</span><ins>+ height: 22px;
</ins><span class="cx"> margin: 0 1px 2px 0;
</span><span class="cx"> text-align: center;
</span><span class="cx"> width: 22px;
</span><del>- height: 22px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .page-links a {
</span><span class="lines">@@ -1446,10 +1340,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .page-links > span.page-links-title {
</span><ins>+ height: auto;
</ins><span class="cx"> margin: 0;
</span><span class="cx"> padding-right: 9px;
</span><span class="cx"> width: auto;
</span><del>- height: auto;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* More link */
</span><span class="lines">@@ -1943,12 +1837,12 @@
</span><span class="cx">
</span><span class="cx"> .comment-author .avatar {
</span><span class="cx"> border: 1px solid rgba(0, 0, 0, 0.1);
</span><ins>+ height: 18px;
</ins><span class="cx"> padding: 2px;
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> left: 0;
</span><span class="cx"> width: 18px;
</span><del>- height: 18px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .bypostauthor .avatar {
</span><span class="lines">@@ -2080,11 +1974,12 @@
</span><span class="cx">
</span><span class="cx"> #secondary {
</span><span class="cx"> background-color: #000;
</span><del>- border-bottom: 1px solid rgba(255, 255, 255, 0.2);
</del><ins>+ border-top: 1px solid #000;
</ins><span class="cx"> clear: both;
</span><span class="cx"> color: rgba(255, 255, 255, 0.55);
</span><span class="cx"> font-size: 14px;
</span><span class="cx"> line-height: 1.2857142857;
</span><ins>+ margin-top: -1px;
</ins><span class="cx"> padding: 0 10px;
</span><span class="cx"> position: relative;
</span><span class="cx"> z-index: 2;
</span><span class="lines">@@ -2144,8 +2039,7 @@
</span><span class="cx">
</span><span class="cx"> .widget {
</span><span class="cx"> margin: 0 auto 48px;
</span><del>- max-width: 474px;
- overflow: hidden;
</del><ins>+ width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .widget p {
</span><span class="lines">@@ -2239,6 +2133,13 @@
</span><span class="cx"> background-color: #41a62a;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.footer-sidebar .widget_calendar tbody a,
+.footer-sidebar .widget_calendar tbody a:hover,
+.primary-sidebar .widget_calendar tbody a,
+.primary-sidebar .widget_calendar tbody a:hover {
+ color: #fff;
+}
+
</ins><span class="cx"> .widget_calendar #prev {
</span><span class="cx"> padding-left: 5px;
</span><span class="cx"> }
</span><span class="lines">@@ -2529,6 +2430,10 @@
</span><span class="cx"> * -----------------------------------------------------------------------------
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#supplementary {
+ padding: 0 10px;
+}
+
</ins><span class="cx"> .site-footer {
</span><span class="cx"> background-color: #000;
</span><span class="cx"> color: #949a92;
</span><span class="lines">@@ -2537,18 +2442,9 @@
</span><span class="cx"> z-index: 3;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.site-footer .widget {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- float: left;
- padding: 0 30px;
- width: 315px;
-}
-
</del><span class="cx"> .footer-sidebar {
</span><span class="cx"> border-bottom: 1px solid rgba(255, 255, 255, 0.2);
</span><del>- padding: 48px 10px 0;
</del><ins>+ padding-top: 48px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .site-info {
</span><span class="lines">@@ -2887,10 +2783,6 @@
</span><span class="cx"> padding-left: 30px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #secondary {
- padding: 0 30px;
- }
-
</del><span class="cx"> .content-sidebar {
</span><span class="cx"> border: 0;
</span><span class="cx"> float: right;
</span><span class="lines">@@ -2917,15 +2809,131 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and (min-width: 770px) {
</del><ins>+@media screen and (min-width: 782px) {
</ins><span class="cx"> .header-main {
</span><ins>+ padding: 0 0 0 30px;
+ }
+
+ .search-toggle {
</ins><span class="cx"> margin-right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Fixed Header */
+
+ .masthead-fixed .site-header {
+ box-shadow: 0 1px 8px rgba(0, 0, 0, 0.2);
+ position: fixed;
+ top: 0;
+ }
+
+ .admin-bar.masthead-fixed .site-header {
+ top: 28px;
+ }
+
+ .admin-bar.mp6.masthead-fixed .site-header {
+ top: 32px;
+ }
+
+ .masthead-fixed .site-main {
+ margin-top: 48px;
+ }
+
+ /* Primary Navigation */
+
</ins><span class="cx"> .primary-navigation {
</span><ins>+ float: right;
+ font-size: 11px;
+ margin: 0 10px 0 -10px;
+ padding: 0;
+ text-transform: uppercase;
+ }
+
+ .primary-navigation .menu-toggle {
+ display: none;
+ padding: 0;
+ }
+
+ .primary-navigation .nav-menu {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ .primary-navigation.toggled-on {
+ border-bottom: 0;
+ margin: 0;
+ padding: 0;
+ }
+
+ .primary-navigation li {
+ border: 0;
+ display: inline-block;
+ height: 48px;
+ line-height: 48px;
+ position: relative;
+ }
+
+ .primary-navigation a {
+ display: inline-block;
+ padding: 0 10px;
+ white-space: nowrap;
+ }
+
+ .primary-navigation ul ul {
+ background-color: #24890d;
+ float: left;
+ position: absolute;
+ top: 48px;
+ left: -999em;
+ z-index: 99999;
+ }
+
+ .primary-navigation li li {
+ border: 0;
+ display: block;
+ height: auto;
+ line-height: 1.0909090909;
+ }
+
+ .primary-navigation ul ul ul {
+ left: -999em;
+ top: 0;
+ }
+
+ .primary-navigation ul ul li {
+ margin: 0;
+ }
+
+ .primary-navigation ul ul a {
+ padding: 18px 12px;
+ white-space: normal;
+ width: 144px;
+ }
+
+ .primary-navigation li:hover > a {
+ background-color: #24890d;
+ color: #fff;
+ }
+
+ .primary-navigation ul ul a:hover {
+ background-color: #41a62a;
+ }
+
+ .primary-navigation ul li:hover > ul,
+ .primary-navigation ul li.focus > ul {
+ left: auto;
+ }
+
+ .primary-navigation ul ul li:hover > ul,
+ .primary-navigation ul ul li.focus > ul {
+ left: 100%;
+ }
+
+ .primary-navigation li .current_page_item > a,
+ .primary-navigation li .current_page_ancestor > a,
+ .primary-navigation li .current-menu-item > a,
+ .primary-navigation li .current-menu-ancestor > a {
+ background-color: #000;
+ }
+
</ins><span class="cx"> .attachment-featured-featured {
</span><span class="cx"> height: 213px;
</span><span class="cx"> }
</span><span class="lines">@@ -3001,9 +3009,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-author .avatar {
</span><ins>+ height: 34px;
</ins><span class="cx"> top: 2px;
</span><span class="cx"> width: 34px;
</span><del>- height: 34px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .comment-author,
</span><span class="lines">@@ -3031,10 +3039,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media screen and (min-width: 1008px) {
</span><del>- .header-main {
- padding-left: 30px;
- }
-
</del><span class="cx"> .search-box-wrapper {
</span><span class="cx"> padding-left: 182px;
</span><span class="cx"> }
</span><span class="lines">@@ -3072,13 +3076,14 @@
</span><span class="cx">
</span><span class="cx"> #secondary {
</span><span class="cx"> background-color: transparent;
</span><del>- border-bottom: 0;
</del><ins>+ border-top: 0;
</ins><span class="cx"> clear: none;
</span><span class="cx"> float: left;
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> line-height: 1.6363636363;
</span><span class="cx"> margin: 0 0 0 -100%;
</span><span class="cx"> min-height: 100vh;
</span><ins>+ padding: 0 30px;
</ins><span class="cx"> width: 122px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3115,6 +3120,7 @@
</span><span class="cx"> .secondary-navigation {
</span><span class="cx"> border-bottom: 1px solid rgba(255, 255, 255, 0.2);
</span><span class="cx"> font-size: 11px;
</span><ins>+ margin: 0 0 48px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .secondary-navigation ul,
</span><span class="lines">@@ -3128,10 +3134,6 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .secondary-navigation a {
- padding: 8px 0 9px;
- }
-
</del><span class="cx"> .secondary-navigation ul ul {
</span><span class="cx"> background: rgba(0, 0, 0, 0.9);
</span><span class="cx"> display: none;
</span><span class="lines">@@ -3158,12 +3160,24 @@
</span><span class="cx"> margin-bottom: 18px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ #supplementary {
+ padding: 0;
+ }
+
</ins><span class="cx"> .footer-sidebar {
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> line-height: 1.6363636363;
</span><del>- padding: 48px 0 0;
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ .site-footer .widget {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ float: left;
+ padding: 0 30px;
+ width: 25%;
+ }
+
</ins><span class="cx"> .site-info {
</span><span class="cx"> padding: 15px 30px;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>