From 3711c0664d80dddcc5656777379a52a5865c1a2d Mon Sep 17 00:00:00 2001 From: "David A. Kennedy" Date: Tue, 1 Nov 2016 17:26:32 +0000 Subject: [PATCH] Twenty Seventeen: Replace remaining Genericons with Font Awesome icons * Replaces: icon-pinned with icon-thumb-tack * Replaces: icon-next with icon-arrow-right * Replaces: icon-previous with icon-arrow-left * Replaces: icon-expand with icon-angle-down * Removes: Path, Polldaddy Props sami.keijonen, melchoyce, laurelfulford. Fixes #38488. Built from https://develop.svn.wordpress.org/trunk@39072 git-svn-id: http://core.svn.wordpress.org/trunk@39014 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyseventeen/archive.php | 4 +- .../themes/twentyseventeen/assets/css/ie8.css | 10 ++-- .../assets/images/svg-icons.svg | 30 ++++-------- .../themes/twentyseventeen/comments.php | 4 +- .../themes/twentyseventeen/functions.php | 2 +- .../twentyseventeen/inc/icon-functions.php | 4 +- wp-content/themes/twentyseventeen/index.php | 4 +- wp-content/themes/twentyseventeen/rtl.css | 6 +-- wp-content/themes/twentyseventeen/search.php | 4 +- wp-content/themes/twentyseventeen/single.php | 4 +- wp-content/themes/twentyseventeen/style.css | 49 ++++++++----------- .../template-parts/header/site-branding.php | 2 +- .../navigation/navigation-top.php | 2 +- .../template-parts/post/content-audio.php | 2 +- .../template-parts/post/content-gallery.php | 2 +- .../template-parts/post/content-image.php | 2 +- .../template-parts/post/content-video.php | 2 +- .../template-parts/post/content.php | 2 +- wp-includes/version.php | 2 +- 19 files changed, 58 insertions(+), 79 deletions(-) diff --git a/wp-content/themes/twentyseventeen/archive.php b/wp-content/themes/twentyseventeen/archive.php index 6623321353..6f9e03c37e 100644 --- a/wp-content/themes/twentyseventeen/archive.php +++ b/wp-content/themes/twentyseventeen/archive.php @@ -42,8 +42,8 @@ get_header(); ?> endwhile; the_posts_pagination( array( - 'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'previous' ) ) . '' . __( 'Previous page', 'twentyseventeen' ) . '', - 'next_text' => '' . __( 'Next page', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'next' ) ), + 'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '' . __( 'Previous page', 'twentyseventeen' ) . '', + 'next_text' => '' . __( 'Next page', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ), 'before_page_number' => '' . __( 'Page', 'twentyseventeen' ) . ' ', ) ); diff --git a/wp-content/themes/twentyseventeen/assets/css/ie8.css b/wp-content/themes/twentyseventeen/assets/css/ie8.css index c18f24038a..850240f767 100644 --- a/wp-content/themes/twentyseventeen/assets/css/ie8.css +++ b/wp-content/themes/twentyseventeen/assets/css/ie8.css @@ -51,7 +51,7 @@ img { /* Layout */ .site-content { - padding: 6.5em 0 0; + padding: 6.5em 0 0; } /* Site Branding */ @@ -108,11 +108,11 @@ img { padding: 0.75em 0 0; } -.dropdown-toggle .svg-fallback.icon-expand { +.dropdown-toggle .svg-fallback.icon-angle-down { -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=-1, M12=1.2246467991473532e-16, M21=-1.2246467991473532e-16, M22=-1, SizingMethod='auto expand')"; } -.dropdown-toggle.toggled-on .svg-fallback.icon-expand { +.dropdown-toggle.toggled-on .svg-fallback.icon-angle-down { -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=1, M12=0, M21=0, M22=1, SizingMethod='auto expand')"; } @@ -153,7 +153,7 @@ img { .blog .site-main > article, .archive .site-main > article, .search .site-main > article { - padding-bottom: 4em; + padding-bottom: 4em; } time.updated { @@ -201,4 +201,4 @@ ol.children .children { .rtl ol.children .children { padding-left: 0; padding-right: 2em; -} \ No newline at end of file +} diff --git a/wp-content/themes/twentyseventeen/assets/images/svg-icons.svg b/wp-content/themes/twentyseventeen/assets/images/svg-icons.svg index 50e54b85f7..b3fc4e62cc 100644 --- a/wp-content/themes/twentyseventeen/assets/images/svg-icons.svg +++ b/wp-content/themes/twentyseventeen/assets/images/svg-icons.svg @@ -24,12 +24,6 @@ - - - - - - @@ -39,17 +33,8 @@ - - - - - - - - - - - + + @@ -144,9 +129,14 @@ - - - + + + + + + + + diff --git a/wp-content/themes/twentyseventeen/comments.php b/wp-content/themes/twentyseventeen/comments.php index a515cda696..de52e90049 100644 --- a/wp-content/themes/twentyseventeen/comments.php +++ b/wp-content/themes/twentyseventeen/comments.php @@ -63,8 +63,8 @@ if ( post_password_required() ) { twentyseventeen_get_svg( array( 'icon' => 'previous' ) ) . '' . __( 'Previous', 'twentyseventeen' ) . '', - 'next_text' => '' . __( 'Next', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'next' ) ), + 'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '' . __( 'Previous', 'twentyseventeen' ) . '', + 'next_text' => '' . __( 'Next', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ), ) ); endif; // Check for have_comments(). diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php index 5a0c03cd5a..71eff2307f 100644 --- a/wp-content/themes/twentyseventeen/functions.php +++ b/wp-content/themes/twentyseventeen/functions.php @@ -376,7 +376,7 @@ function twentyseventeen_scripts() { $twentyseventeen_l10n['has_navigation'] = 'true'; $twentyseventeen_l10n['expand'] = __( 'Expand child menu', 'twentyseventeen' ); $twentyseventeen_l10n['collapse'] = __( 'Collapse child menu', 'twentyseventeen' ); - $twentyseventeen_l10n['icon'] = twentyseventeen_get_svg( array( 'icon' => 'expand', 'fallback' => true ) ); + $twentyseventeen_l10n['icon'] = twentyseventeen_get_svg( array( 'icon' => 'angle-down', 'fallback' => true ) ); } wp_enqueue_script( 'twentyseventeen-global', get_theme_file_uri( '/assets/js/global.js' ), array( 'jquery' ), '1.0', true ); diff --git a/wp-content/themes/twentyseventeen/inc/icon-functions.php b/wp-content/themes/twentyseventeen/inc/icon-functions.php index 695ea6e8e8..e52602208f 100644 --- a/wp-content/themes/twentyseventeen/inc/icon-functions.php +++ b/wp-content/themes/twentyseventeen/inc/icon-functions.php @@ -139,7 +139,7 @@ function twentyseventeen_dropdown_icon_to_menu_link( $title, $item, $args, $dept if ( 'top' === $args->theme_location ) { foreach ( $item->classes as $value ) { if ( 'menu-item-has-children' === $value || 'page_item_has_children' === $value ) { - $title = $title . twentyseventeen_get_svg( array( 'icon' => 'expand' ) ); + $title = $title . twentyseventeen_get_svg( array( 'icon' => 'angle-down' ) ); } } } @@ -171,10 +171,8 @@ function twentyseventeen_social_links_icons() { 'linkedin.com' => 'linkedin', 'mailto:' => 'envelope-o', 'medium.com' => 'medium', - 'path.com' => 'path', 'pinterest.com' => 'pinterest-p', 'getpocket.com' => 'get-pocket', - 'polldaddy.com' => 'polldaddy', 'reddit.com' => 'reddit-alien', 'skype.com' => 'skype', 'skype:' => 'skype', diff --git a/wp-content/themes/twentyseventeen/index.php b/wp-content/themes/twentyseventeen/index.php index 4e1186bb63..78d1b4c93e 100644 --- a/wp-content/themes/twentyseventeen/index.php +++ b/wp-content/themes/twentyseventeen/index.php @@ -47,8 +47,8 @@ get_header(); ?> endwhile; the_posts_pagination( array( - 'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'previous' ) ) . '' . __( 'Previous page', 'twentyseventeen' ) . '', - 'next_text' => '' . __( 'Next page', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'next' ) ), + 'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '' . __( 'Previous page', 'twentyseventeen' ) . '', + 'next_text' => '' . __( 'Next page', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ), 'before_page_number' => '' . __( 'Page', 'twentyseventeen' ) . ' ', ) ); diff --git a/wp-content/themes/twentyseventeen/rtl.css b/wp-content/themes/twentyseventeen/rtl.css index 9bfcb36da1..ec91141e74 100644 --- a/wp-content/themes/twentyseventeen/rtl.css +++ b/wp-content/themes/twentyseventeen/rtl.css @@ -123,7 +123,7 @@ input[type="checkbox"] { margin-right: 0; } -.sticky .icon-pinned { +.sticky .icon-thumb-tack { left: auto; right: -1.5em; } @@ -376,7 +376,7 @@ input[type="checkbox"] { /* Blog, Archive, Search */ - .sticky .icon-pinned { + .sticky .icon-thumb-tack { left: auto; right: -2.5em; } @@ -512,7 +512,7 @@ input[type="checkbox"] { /* Sticky posts */ - .sticky .icon-pinned { + .sticky .icon-thumb-tack { left: auto; right: -1.25em; } diff --git a/wp-content/themes/twentyseventeen/search.php b/wp-content/themes/twentyseventeen/search.php index a521e4b58a..c6967f2031 100644 --- a/wp-content/themes/twentyseventeen/search.php +++ b/wp-content/themes/twentyseventeen/search.php @@ -40,8 +40,8 @@ get_header(); ?> endwhile; // End of the loop. the_posts_pagination( array( - 'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'previous' ) ) . '' . __( 'Previous page', 'twentyseventeen' ) . '', - 'next_text' => '' . __( 'Next page', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'next' ) ), + 'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '' . __( 'Previous page', 'twentyseventeen' ) . '', + 'next_text' => '' . __( 'Next page', 'twentyseventeen' ) . '' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ), 'before_page_number' => '' . __( 'Page', 'twentyseventeen' ) . ' ', ) ); diff --git a/wp-content/themes/twentyseventeen/single.php b/wp-content/themes/twentyseventeen/single.php index 704560b655..af7671b5ba 100644 --- a/wp-content/themes/twentyseventeen/single.php +++ b/wp-content/themes/twentyseventeen/single.php @@ -28,8 +28,8 @@ get_header(); ?> endif; the_post_navigation( array( - 'prev_text' => '' . __( 'Previous Post', 'twentyseventeen' ) . ' ' . twentyseventeen_get_svg( array( 'icon' => 'previous' ) ) . '%title', - 'next_text' => '' . __( 'Next Post', 'twentyseventeen' ) . ' %title' . twentyseventeen_get_svg( array( 'icon' => 'next' ) ) . '', + 'prev_text' => '' . __( 'Previous Post', 'twentyseventeen' ) . ' ' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '%title', + 'next_text' => '' . __( 'Next Post', 'twentyseventeen' ) . ' %title' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '', ) ); endwhile; // End of the loop. diff --git a/wp-content/themes/twentyseventeen/style.css b/wp-content/themes/twentyseventeen/style.css index 29604d2a30..1419365961 100644 --- a/wp-content/themes/twentyseventeen/style.css +++ b/wp-content/themes/twentyseventeen/style.css @@ -1827,19 +1827,16 @@ body:not(.has-header-image) .custom-header-image { position: relative; } -.icon-pinned { +.icon-thumb-tack { display: none; } -.sticky .icon-pinned { +.sticky .icon-thumb-tack { display: block; height: 18px; left: -1.5em; position: absolute; top: 1.65em; - -ms-transform: rotate(-45deg); /* IE 9 */ - -webkit-transform: rotate(-45deg); /* Chrome, Safari, Opera */ - transform: rotate(-45deg); width: 20px; } @@ -1902,6 +1899,12 @@ body.page:not(.twentyseventeen-front-page) .entry-title { text-align: center; } +.pagination .icon, +.comments-pagination .icon { + width: 0.666666666em; + height: 0.666666666em; +} + .comments-pagination { border: 0; } @@ -2181,15 +2184,6 @@ body:not(.twentyseventeen-front-page) .entry-header { font-size: 1rem; } -.nav-links .nav-next .nav-title .icon, -.nav-links .nav-previous .nav-title .icon { - height: 24px; - height: 1.5rem; - width: 24px; - width: 1.5rem; - font-weight: 400; -} - .post-navigation .nav-next { margin-top: 1.5em; } @@ -2487,6 +2481,7 @@ h2.widget-title { .widget ul li li { border: 0; + padding-left: 24px; padding-left: 1.5rem; } @@ -2626,10 +2621,8 @@ h2.widget-title { .search-form .search-submit .icon { height: 24px; - height: 1.5rem; top: -2px; width: 24px; - width: 1.5rem; } /* Tag cloud widget */ @@ -3031,7 +3024,7 @@ object { width: 2em; } -.no-svg .dropdown-toggle .svg-fallback.icon-expand { +.no-svg .dropdown-toggle .svg-fallback.icon-angle-down { font-size: 20px; font-size: 1.25rem; font-weight: normal; @@ -3041,13 +3034,13 @@ object { transform: rotate(180deg); } -.no-svg .dropdown-toggle.toggled-on .svg-fallback.icon-expand { +.no-svg .dropdown-toggle.toggled-on .svg-fallback.icon-angle-down { -webkit-transform: rotate(0); /* Chrome, Safari, Opera */ -ms-transform: rotate(0); /* IE 9 */ transform: rotate(0); } -.no-svg .dropdown-toggle .svg-fallback.icon-expand:before { +.no-svg .dropdown-toggle .svg-fallback.icon-angle-down:before { content: "\005E"; } @@ -3487,7 +3480,7 @@ object { display: inline; left: 5px; position: relative; - top: -2px; + top: -1px; } .main-navigation ul ul .menu-item-has-children > a > .icon, @@ -3527,7 +3520,7 @@ object { .site-header .menu-scroll-down { display: block; - padding: 0.5em 0.5em 0.4em; + padding: 1em; position: absolute; right: 0; -webkit-transform: rotate(90deg); /* Chrome, Safari, Opera */ @@ -3542,7 +3535,7 @@ object { .site-header .navigation-top .menu-scroll-down { color: #767676; - top: 0.9em; + top: 0.7em; } .menu-scroll-down:focus { @@ -3550,10 +3543,8 @@ object { } .menu-scroll-down .icon { - height: 32px; - height: 2rem; - width: 32px; - width: 2rem; + height: 18px; + width: 18px; } /* Front Page */ @@ -3666,7 +3657,7 @@ object { /* Blog, archive, search */ - .sticky .icon-pinned { + .sticky .icon-thumb-tack { height: 23px; left: -2.5em; top: 1.5em; @@ -3936,7 +3927,7 @@ object { /* Sticky posts */ - .sticky .icon-pinned { + .sticky .icon-thumb-tack { font-size: 32px; font-size: 2rem; height: 22px; @@ -4012,7 +4003,7 @@ object { .content-bottom-widgets, .header-image, .panel-image-prop, - .icon-pinned, + .icon-thumb-tack, .page-links, .edit-link, .post-navigation, diff --git a/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php b/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php index 5ba9117375..17637a5336 100644 --- a/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php +++ b/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php @@ -28,7 +28,7 @@ - 'next' ) ); ?> + 'arrow-right' ) ); ?> diff --git a/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php b/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php index f44342e4bc..adabb53b29 100644 --- a/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php +++ b/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php @@ -17,6 +17,6 @@ ) ); ?> - 'next' ) ); ?> + 'arrow-right' ) ); ?> diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php b/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php index b23a9195a0..4b64427a56 100644 --- a/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php +++ b/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php @@ -15,7 +15,7 @@
> 'pinned' ) ); + echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) ); endif; ?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php b/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php index 0583fe6782..7f4a643fb4 100644 --- a/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php +++ b/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php @@ -14,7 +14,7 @@
> 'pinned' ) ); + echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) ); endif; ?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-image.php b/wp-content/themes/twentyseventeen/template-parts/post/content-image.php index 52bc0a6bf1..f40e1e67b4 100644 --- a/wp-content/themes/twentyseventeen/template-parts/post/content-image.php +++ b/wp-content/themes/twentyseventeen/template-parts/post/content-image.php @@ -14,7 +14,7 @@
> 'pinned' ) ); + echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) ); endif; ?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-video.php b/wp-content/themes/twentyseventeen/template-parts/post/content-video.php index c3e337d41f..95abee412a 100644 --- a/wp-content/themes/twentyseventeen/template-parts/post/content-video.php +++ b/wp-content/themes/twentyseventeen/template-parts/post/content-video.php @@ -14,7 +14,7 @@
> 'pinned' ) ); + echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) ); endif; ?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content.php b/wp-content/themes/twentyseventeen/template-parts/post/content.php index 9b89202bca..7eeaa20e5c 100644 --- a/wp-content/themes/twentyseventeen/template-parts/post/content.php +++ b/wp-content/themes/twentyseventeen/template-parts/post/content.php @@ -15,7 +15,7 @@
> 'pinned' ) ); + echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) ); endif; ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php index c05b744da0..8bb75bce9b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-beta1-39071'; +$wp_version = '4.7-beta1-39072'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.