<!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>[7031] sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15: WP15 theme: Keep locale switcher in nav bar when it becomes sticky</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/7031">7031</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7031","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-05 04:22:26 +0000 (Thu, 05 Apr 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WP15 theme: Keep locale switcher in nav bar when it becomes sticky
Ensure that the nav bar, with all navigation items and the locale switcher,
remains intact and unchanged when scrolling down past the site header, which
causes the bar to become fixed at the top.
This also changes the layout of the nav bar on narrow screens so that the
locale switcher and the menu toggle button are on separate rows, with the
switcher first, allowing the toggled menu items to expand beneath.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3545">#3545</a>
Props coreymckrill, melchoyce, mcsf</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15functionsphp">sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/functions.php</a></li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15headerphp">sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php</a></li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15stylecss">sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/assets/</li>
<li>sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/assets/js/</li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15assetsjsfrontendjs">sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/assets/js/front-end.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15assetsjsfrontendjs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/assets/js/front-end.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/assets/js/front-end.js (rev 0)
+++ sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/assets/js/front-end.js 2018-04-05 04:22:26 UTC (rev 7031)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,44 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+( function( $ ) {
+
+ 'use strict';
+
+ var app = {
+ $body: $( 'body' ),
+
+ classValue: 'site-navigation-fixed',
+
+ init: function() {
+ var observer;
+
+ app.$nav = app.$body.find( '.navigation-top' );
+ app.$navContainer = app.$body.find( '.navigation-top-container' );
+
+ observer = new MutationObserver( app.observerCallback );
+
+ if ( app.$navContainer.length ) {
+ observer.observe( app.$nav.get(0), {
+ attributes: true,
+ attributeFilter: [ 'class' ]
+ } );
+ }
+ },
+
+ observerCallback: function( events ) {
+ $.each( events, function ( i, event ) {
+ var $target = $( event.target );
+
+ if ( $target.hasClass( app.classValue ) ) {
+ app.$navContainer.addClass( app.classValue );
+ } else {
+ app.$navContainer.removeClass( app.classValue );
+ }
+ } );
+ }
+ };
+
+ $( document ).ready( function() {
+ app.init();
+ } );
+
+} )( jQuery );
</ins></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/functions.php 2018-04-05 04:16:43 UTC (rev 7030)
+++ sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/functions.php 2018-04-05 04:22:26 UTC (rev 7031)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Styles for locale switcher.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'select2' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ wp_enqueue_script(
+ 'twentyseventeen-wp15-front-end',
+ get_theme_file_uri( '/assets/js/front-end.js' ),
+ array( 'jquery', 'twentyseventeen-global' ),
+ 1,
+ true
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15headerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php 2018-04-05 04:16:43 UTC (rev 7030)
+++ sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php 2018-04-05 04:22:26 UTC (rev 7031)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,14 +22,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_template_part( 'template-parts/header/header', 'image' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( has_nav_menu( 'top' ) ) : ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="navigation-top-container">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="navigation-top">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_template_part( 'template-parts/navigation/navigation', 'top' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php Locales\locale_switcher(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <?php Locales\locale_switcher(); ?>
</del><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ( is_single() || ( is_page() && ! twentyseventeen_is_frontpage() ) ) && has_post_thumbnail( get_queried_object_id() ) ) : ?>
</span></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15stylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css 2018-04-05 04:16:43 UTC (rev 7030)
+++ sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css 2018-04-05 04:22:26 UTC (rev 7031)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,29 +161,97 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.navigation-top-container {
+ background-color: white;
+ border-top: 1px solid #eee;
+ border-bottom: 1px solid #eee;
+}
+
+@supports ( display: grid ) {
+ .navigation-top-container {
+ grid-column: 1 / span 2;
+ grid-row: 2;
+ display: grid;
+ grid-template-columns: auto 3fr;
+ }
+
+ @media screen and ( min-width: 48em ) {
+ .navigation-top-container {
+ display: grid;
+ grid-template-columns: auto 300px;
+ }
+ }
+
+ .site-navigation-fixed.navigation-top-container {
+ position: fixed;
+ top: 0;
+ bottom: auto;
+ left: 0;
+ right: 0;
+ width: 100%;
+ z-index: 7;
+ }
+
+ .admin-bar .site-navigation-fixed.navigation-top-container {
+ top: 32px;
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .navigation-top {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grid-column: 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grid-column: 1 / span 2;
</ins><span class="cx" style="display: block; padding: 0 10px"> grid-row: 2;
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 20;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background: transparent;
+ border-top: 0;
+ border-bottom: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.menu-toggle {
- padding-top: 23px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@media screen and ( min-width: 48em ) {
+ .navigation-top {
+ grid-column: 1;
+ grid-row: 1;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.site-navigation-fixed.navigation-top {
+ position: relative;
+ left: auto;
+ right: auto;
+}
+
+.admin-bar .site-navigation-fixed.navigation-top {
+ top: auto;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .main-navigation.toggled-on .menu-top-menu-container {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100vw;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-bottom: 1px solid #eee;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp15-locale-switcher-container {
- grid-column: 2;
- grid-row: 2;
- padding: 20px 30px 0 0;
- background-color: white;
- border-bottom: 1px solid #eee;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@supports ( display: grid ) {
+ .wp15-locale-switcher-container {
+ grid-column: 1 / span 2;
+ grid-row: 1;
+ display: grid;
+ }
+
+ #wp15-locale-switcher-form {
+ padding: 20px 0 0;
+ display: flex;
+ margin: 0 auto;
+ }
+
+ @media screen and ( min-width: 48em ) {
+ .wp15-locale-switcher-container {
+ grid-column: 2;
+ grid-row: 1;
+ }
+
+ #wp15-locale-switcher-form {
+ padding: 20px 30px 0 0;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #wp15-locale-switcher-form label {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,10 +259,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .wp15-locale-switcher-container .dashicons-translation {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 5px 10px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 5px 5px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@media screen and ( min-width: 48em ) {
+ .wp15-locale-switcher-container .dashicons-translation {
+ margin: 5px 10px;
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * About
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>