Skip to content
This repository has been archived by the owner on Jan 10, 2018. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into typo_doc_cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
noplanman committed Oct 17, 2016
2 parents a11d2b9 + c445bb5 commit 278ea16
Show file tree
Hide file tree
Showing 8 changed files with 195 additions and 41 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Expand Up @@ -47,3 +47,4 @@ Version 1.0:
@yoavf
@karmatosed
@sandesh055
@adammacias
4 changes: 4 additions & 0 deletions assets/css/ie8.css
Expand Up @@ -95,6 +95,10 @@ time.published {
z-index: -1;
}

img {
width: inherit; /* Make images fill their parent's space. */
}

/* Fixes linked images */
.entry-content a img,
.widget a img {
Expand Down
38 changes: 12 additions & 26 deletions assets/js/global.js
Expand Up @@ -26,14 +26,14 @@
/**
* Sets properties of navigation
*/
function setNavProps() {
navigationHeight = $navigation.height();
navigationOuterHeight = $navigation.outerHeight();
navPadding = parseFloat( $navWrap.css( 'padding-top' ) ) * 2;
navMenuItemHeight = $navMenuItem.outerHeight() * 2;
idealNavHeight = navPadding + navMenuItemHeight;
navIsNotTooTall = navigationHeight <= idealNavHeight;
}
function setNavProps() {
navigationHeight = $navigation.height();
navigationOuterHeight = $navigation.outerHeight();
navPadding = parseFloat( $navWrap.css( 'padding-top' ) ) * 2;
navMenuItemHeight = $navMenuItem.outerHeight() * 2;
idealNavHeight = navPadding + navMenuItemHeight;
navIsNotTooTall = navigationHeight <= idealNavHeight;
}

/**
* Makes navigation 'stick'
Expand Down Expand Up @@ -79,23 +79,6 @@
}
}

/**
* 'Scroll Down' arrow in menu area
*/
if ( $( 'body' ).hasClass( 'blog' ) ) {
menuTop -= 30; // The div for latest posts has no space above content, add some to account for this
}
if ( $( 'body' ).hasClass( 'admin-bar' ) ) {
menuTop -= 32;
}
$( '.menu-scroll-down' ).click( function( e ) {
e.preventDefault();
$( window ).scrollTo( '#primary', {
duration: 600,
offset: { 'top': menuTop - $navigation.outerHeight() }
} );
} );

/**
* Add 'below-entry-meta' class to elements.
*/
Expand Down Expand Up @@ -137,11 +120,14 @@
if ( $( 'body' ).hasClass( 'admin-bar' ) ) {
menuTop = -32;
}
if ( $( 'body' ).hasClass( 'blog' ) ) {
menuTop -= 30; // The div for latest posts has no space above content, add some to account for this
}
$menuScrollDown.click( function( e ) {
e.preventDefault();
$( window ).scrollTo( '#primary', {
duration: 600,
offset: { 'top': menuTop }
offset: { 'top': menuTop - navigationOuterHeight }
} );
} );

Expand Down
1 change: 1 addition & 0 deletions components/navigation/navigation-top.php
Expand Up @@ -14,6 +14,7 @@
<?php wp_nav_menu( array(
'theme_location' => 'top',
'menu_id' => 'top-menu',
'fallback_cb' => 'twentyseventeen_fallback_menu',
) ); ?>

<?php if ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) : ?>
Expand Down
2 changes: 1 addition & 1 deletion functions.php
Expand Up @@ -231,7 +231,7 @@ function twentyseventeen_colors_css_wrap() {
return;
}

require_once( 'inc/color-patterns.php' );
require_once( get_parent_theme_file_path( '/inc/color-patterns.php' ) );
$hue = absint( get_theme_mod( 'colorscheme_hue', 250 ) );
?>
<style type="text/css" id="custom-theme-colors" <?php if ( is_customize_preview() ) { echo 'data-hue="' . $hue . '"'; } ?>>
Expand Down
9 changes: 9 additions & 0 deletions inc/template-functions.php
Expand Up @@ -96,3 +96,12 @@ function twentyseventeen_is_frontpage() {
function twentyseventeen_is_page() {
return ( is_page() && ! twentyseventeen_is_frontpage() );
}

/**
* Display a default list of pages if no menu is selected.
*/
function twentyseventeen_fallback_menu() {
wp_page_menu( array(
'link_after' => twentyseventeen_get_svg( array( 'icon' => 'expand' ) ),
) );
}
4 changes: 2 additions & 2 deletions inc/template-tags.php
Expand Up @@ -96,8 +96,8 @@ function twentyseventeen_edit_link() {
$link = edit_post_link(
sprintf(
/* translators: %s: Name of current post */
__( 'Edit %s', 'twentyseventeen' ),
the_title( '<span class="screen-reader-text">"', '"</span>', false )
__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
get_the_title()
),
'<span class="edit-link">',
'</span>'
Expand Down
177 changes: 165 additions & 12 deletions style.css
Expand Up @@ -535,21 +535,106 @@ big {
font-size: 125%;
}

blockquote, q {
blockquote {
quotes: "" "";
}

q {
quotes: "“" "”" "‘" "’";
}

blockquote:before,
blockquote:after,
q:before,
q:after {
blockquote:after {
content: "";
}

:focus {
outline: none;
}

/* Typography for Chinese Font */

html[lang^="zh-"] body,
html[lang^="zh-"] button,
html[lang^="zh-"] input,
html[lang^="zh-"] select,
html[lang^="zh-"] textarea {
font-family: "PingFang TC", "Helvetica Neue", Helvetica, STHeitiTC-Light, Arial, sans-serif;
}

html[lang^="zh-"] h1,
html[lang^="zh-"] h2,
html[lang^="zh-"] h3,
html[lang^="zh-"] h4,
html[lang^="zh-"] h5,
html[lang^="zh-"] h6 {
letter-spacing: normal;
font-weight: 700;
}

/* Typography for Cyrillic Font */

html[lang="bg-BG"] body,
html[lang="bg-BG"] button,
html[lang="bg-BG"] input,
html[lang="bg-BG"] select,
html[lang="bg-BG"] textarea,
html[lang="ru-RU"] body,
html[lang="ru-RU"] button,
html[lang="ru-RU"] input,
html[lang="ru-RU"] select,
html[lang="ru-RU"] textarea,
html[lang="uk"] body,
html[lang="uk"] button,
html[lang="uk"] input,
html[lang="uk"] select,
html[lang="uk"] textarea {
font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, sans-serif;
}

html[lang="bg-BG"] h1,
html[lang="bg-BG"] h2,
html[lang="bg-BG"] h3,
html[lang="bg-BG"] h4,
html[lang="bg-BG"] h5,
html[lang="bg-BG"] h6,
html[lang="ru-RU"] h1,
html[lang="ru-RU"] h2,
html[lang="ru-RU"] h3,
html[lang="ru-RU"] h4,
html[lang="ru-RU"] h5,
html[lang="ru-RU"] h6,
html[lang="uk"] h1,
html[lang="uk"] h2,
html[lang="uk"] h3,
html[lang="uk"] h4,
html[lang="uk"] h5,
html[lang="uk"] h6 {
font-weight: bold;
line-height: 1.2;
}

/* Typography for Greek Font */

html[lang="el"] body,
html[lang="el"] button,
html[lang="el"] input,
html[lang="el"] select,
html[lang="el"] textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}

html[lang="el"] h1,
html[lang="el"] h2,
html[lang="el"] h3,
html[lang="el"] h4,
html[lang="el"] h5,
html[lang="el"] h6 {
font-weight: 700;
line-height: 1.3;
letter-spacing: normal;
}

/* Typography for Hebrew Font */

html[lang="he-IL"] body,
Expand Down Expand Up @@ -1029,7 +1114,8 @@ a:hover .nav-title,

.js .main-navigation ul,
.main-navigation .menu-item-has-children > a > .icon,
.main-navigation .page_item_has_children > a > .icon {
.main-navigation .page_item_has_children > a > .icon,
.main-navigation a > .icon {
display: none;
}

Expand Down Expand Up @@ -2227,7 +2313,6 @@ h2.widget-title {

img {
height: auto; /* Make sure images are scaled correctly. */
width: inherit; /* Make images fill their parent's space. Solves IE8. */
max-width: 100%; /* Adhere to container width. */
}

Expand Down Expand Up @@ -2284,6 +2369,79 @@ object {
border: 0;
}

/* Playlist Style Overrides */

.site-content .wp-playlist {
padding: 0.625em 0.625em 0.3125em;
}

.site-content .wp-playlist-current-item .wp-playlist-item-title {
font-weight: 700;
}

.site-content .wp-playlist-current-item .wp-playlist-item-album {
font-style: normal;
}

.site-content .wp-playlist-current-item .wp-playlist-item-artist {
font-size: 10px;
font-size: 0.625rem;
font-weight: 800;
letter-spacing: 0.1818em;
text-transform: uppercase;
}

.site-content .wp-playlist-item {
padding: 0 0.3125em;
cursor: pointer;
}

.site-content .wp-playlist-item:last-of-type {
border-bottom: none;
}

.site-content .wp-playlist-item a {
padding: 0.3125em 0;
border-bottom: none;
}

.site-content .wp-playlist-item a:hover {
border-bottom: none;
background: transparent;
}

.site-content .wp-playlist-item-length {
top: 5px;
}

/* Playlist Color Overrides */

.site-content .wp-playlist-light {
border-color: #eee;
color: #222;
}

.site-content .wp-playlist-light .wp-playlist-current-item .wp-playlist-item-album {
color: #333;
}

.site-content .wp-playlist-light .wp-playlist-current-item .wp-playlist-item-artist {
color: #767676;
}

.site-content .wp-playlist-light .wp-playlist-item {
border-bottom: 1px dotted #eee;
-webkit-transition: background-color 0.2s ease-in-out, border-color 0.2s ease-in-out, color 0.3s ease-in-out;
transition: background-color 0.2s ease-in-out, border-color 0.2s ease-in-out, color 0.3s ease-in-out;
}

.site-content .wp-playlist-light .wp-playlist-item:hover,
.site-content .wp-playlist-light .wp-playlist-item:focus {
border-bottom-color: rgba(0, 0, 0, 0);
background-color: #767676;
color: #fff;
}

/* SVG Icons base styles */

.icon {
Expand Down Expand Up @@ -2387,13 +2545,8 @@ object {
z-index: 3;
}

.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel:nth-of-type(1) .twentyseventeen-panel-title {
background: #a64b55;
}

.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel:nth-of-type(1)::after {
border-color: #a64b55;
color: #a64b55;
border: none;
}

.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel:nth-of-type(2) .twentyseventeen-panel-title {
Expand Down

0 comments on commit 278ea16

Please sign in to comment.