From 5ce93ef2ed7d84db97b938d3e8107fb458d7b935 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:36:16 -0600 Subject: [PATCH 01/25] Added Nucleo icons --- assets/svg/arrow-left.svg | 3 +++ assets/svg/arrow-right.svg | 3 +++ assets/svg/category.svg | 4 ++++ assets/svg/chat.svg | 4 ++++ assets/svg/chevron-down-large.svg | 2 ++ assets/svg/chevron-down-small.svg | 2 ++ assets/svg/edit.svg | 4 ++++ assets/svg/gallery.svg | 4 ++++ assets/svg/image.svg | 6 ++++++ assets/svg/link.svg | 4 ++++ assets/svg/music.svg | 5 +++++ assets/svg/note.svg | 3 +++ assets/svg/pin.svg | 5 +++++ assets/svg/quote.svg | 4 ++++ assets/svg/status.svg | 2 ++ assets/svg/tag.svg | 3 +++ assets/svg/video-circle.svg | 3 +++ assets/svg/video-square.svg | 3 +++ assets/svg/x.svg | 2 ++ 19 files changed, 66 insertions(+) create mode 100644 assets/svg/arrow-left.svg create mode 100644 assets/svg/arrow-right.svg create mode 100644 assets/svg/category.svg create mode 100644 assets/svg/chat.svg create mode 100644 assets/svg/chevron-down-large.svg create mode 100644 assets/svg/chevron-down-small.svg create mode 100644 assets/svg/edit.svg create mode 100644 assets/svg/gallery.svg create mode 100644 assets/svg/image.svg create mode 100644 assets/svg/link.svg create mode 100644 assets/svg/music.svg create mode 100644 assets/svg/note.svg create mode 100644 assets/svg/pin.svg create mode 100644 assets/svg/quote.svg create mode 100644 assets/svg/status.svg create mode 100644 assets/svg/tag.svg create mode 100644 assets/svg/video-circle.svg create mode 100644 assets/svg/video-square.svg create mode 100644 assets/svg/x.svg diff --git a/assets/svg/arrow-left.svg b/assets/svg/arrow-left.svg new file mode 100644 index 0000000..1175b44 --- /dev/null +++ b/assets/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/assets/svg/arrow-right.svg b/assets/svg/arrow-right.svg new file mode 100644 index 0000000..151f051 --- /dev/null +++ b/assets/svg/arrow-right.svg @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/assets/svg/category.svg b/assets/svg/category.svg new file mode 100644 index 0000000..5234de9 --- /dev/null +++ b/assets/svg/category.svg @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/assets/svg/chat.svg b/assets/svg/chat.svg new file mode 100644 index 0000000..f9b8c84 --- /dev/null +++ b/assets/svg/chat.svg @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/assets/svg/chevron-down-large.svg b/assets/svg/chevron-down-large.svg new file mode 100644 index 0000000..16bfd8c --- /dev/null +++ b/assets/svg/chevron-down-large.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/assets/svg/chevron-down-small.svg b/assets/svg/chevron-down-small.svg new file mode 100644 index 0000000..55d6631 --- /dev/null +++ b/assets/svg/chevron-down-small.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/assets/svg/edit.svg b/assets/svg/edit.svg new file mode 100644 index 0000000..5a14406 --- /dev/null +++ b/assets/svg/edit.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/assets/svg/gallery.svg b/assets/svg/gallery.svg new file mode 100644 index 0000000..59a0846 --- /dev/null +++ b/assets/svg/gallery.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/assets/svg/image.svg b/assets/svg/image.svg new file mode 100644 index 0000000..0bc1443 --- /dev/null +++ b/assets/svg/image.svg @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/assets/svg/link.svg b/assets/svg/link.svg new file mode 100644 index 0000000..9478781 --- /dev/null +++ b/assets/svg/link.svg @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/assets/svg/music.svg b/assets/svg/music.svg new file mode 100644 index 0000000..2da426a --- /dev/null +++ b/assets/svg/music.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/assets/svg/note.svg b/assets/svg/note.svg new file mode 100644 index 0000000..55a4179 --- /dev/null +++ b/assets/svg/note.svg @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/assets/svg/pin.svg b/assets/svg/pin.svg new file mode 100644 index 0000000..7384ca3 --- /dev/null +++ b/assets/svg/pin.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/assets/svg/quote.svg b/assets/svg/quote.svg new file mode 100644 index 0000000..1f92b75 --- /dev/null +++ b/assets/svg/quote.svg @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/assets/svg/status.svg b/assets/svg/status.svg new file mode 100644 index 0000000..4e32c5d --- /dev/null +++ b/assets/svg/status.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/assets/svg/tag.svg b/assets/svg/tag.svg new file mode 100644 index 0000000..6b06e3e --- /dev/null +++ b/assets/svg/tag.svg @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/assets/svg/video-circle.svg b/assets/svg/video-circle.svg new file mode 100644 index 0000000..2267bab --- /dev/null +++ b/assets/svg/video-circle.svg @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/assets/svg/video-square.svg b/assets/svg/video-square.svg new file mode 100644 index 0000000..e42c654 --- /dev/null +++ b/assets/svg/video-square.svg @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/assets/svg/x.svg b/assets/svg/x.svg new file mode 100644 index 0000000..9702dee --- /dev/null +++ b/assets/svg/x.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file From e9d45c3ca064fd2119a7aba4d8747d68bfe3e341 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:36:36 -0600 Subject: [PATCH 02/25] Updated icon animation logic --- assets/js/main.js | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/assets/js/main.js b/assets/js/main.js index b8249fd..a2014a7 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -2,6 +2,21 @@ * Custom js for theme */ +// CustomEvent polyfill +( function() { + if ( 'function' === typeof window.CustomEvent ) { + return false; + } + function CustomEvent( event, params ) { + var evt = document.createEvent( 'CustomEvent' ); + params = params || { bubbles: false, cancelable: false, detail: undefined }; + evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail ); + return evt; + } + CustomEvent.prototype = window.Event.prototype; + window.CustomEvent = CustomEvent; +} )(); + ( function( $ ) { var $window = $( window ), $document = $( document ), @@ -20,9 +35,10 @@ duration: 200, rotation: 'none' }, - menuIcon = $( '#svg-icon-menu-icon' ).length > 0 ? new SVGMorpheus( '#svg-icon-menu-icon', morpheusConfig ) : undefined, - searchIcon = $( '#svg-icon-search-icon' ).length > 0 ? new SVGMorpheus( '#svg-icon-search-icon', morpheusConfig ) : undefined, - bookmarkIcon = $( '#svg-icon-bookmark-icon' ).length > 0 ? new SVGMorpheus( '#svg-icon-bookmark-icon', morpheusConfig ) : undefined; + clickEvent = new CustomEvent( 'click' ), // For programmatically firing the click event on SVG icons + menuIcon = document.getElementById( 'svg-icon-menu-icon' ), + searchIcon = document.getElementById( 'svg-icon-search-icon' ), + bookmarkIcon = document.getElementById( 'svg-icon-bookmark-icon' ); /** * Header @@ -64,7 +80,7 @@ $this.toggleClass( 'toggle-on' ); $this.attr( 'aria-expanded', 'false' == $( this ).attr( 'aria-expanded' ) ? 'true' : 'false' ); - menuIcon.to( $this.hasClass( 'toggle-on' ) ? 'svg-icon-menu-close' : 'svg-icon-menu' ); + menuIcon.dispatchEvent( clickEvent ); searchToggle.toggleClass( 'hide' ); chapterToggle.toggleClass( 'hide' ); @@ -82,7 +98,7 @@ $this.toggleClass( 'toggle-on' ); $this.attr( 'aria-expanded', 'false' == $( this ).attr( 'aria-expanded' ) ? 'true' : 'false' ); - searchIcon.to( $this.hasClass( 'toggle-on' ) ? 'svg-icon-search-close' : 'svg-icon-search' ); + searchIcon.dispatchEvent( clickEvent ); menuToggle.toggleClass( 'hide' ); chapterToggle.toggleClass( 'hide' ); @@ -105,7 +121,7 @@ $this.toggleClass( 'toggle-on' ); $this.attr( 'aria-expanded', 'false' == $( this ).attr( 'aria-expanded' ) ? 'true' : 'false' ); - bookmarkIcon.to( $this.hasClass( 'toggle-on' ) ? 'svg-icon-bookmark-close' : 'svg-icon-bookmark' ); + bookmarkIcon.dispatchEvent( clickEvent ); menuToggle.toggleClass( 'hide' ); searchToggle.toggleClass( 'hide' ); @@ -142,7 +158,6 @@ */ $document.on( 'click', function( e ) { var $toggle = $( '.mini-menu-container .showsub-toggle.sub-on' ); - console.log( e ); if ( $toggle.length > 0 && ( ! $( e.target ).is( '.mini-menu-container .showsub-toggle' ) && ! $( e.target ).closest( '.showsub-toggle' ).is( '.mini-menu-container .showsub-toggle' ) ) ) { @@ -210,7 +225,7 @@ chapterOverlay.removeClass( 'show' ).resize(); menuToggle.removeClass( 'hide' ); searchToggle.removeClass( 'hide' ); - bookmarkIcon.to( 'svg-icon-bookmark' ); + bookmarkIcon.dispatchEvent( clickEvent ); } ); } @@ -225,7 +240,7 @@ menuOverlay.removeClass( 'show' ).resize(); searchToggle.removeClass( 'hide' ); chapterToggle.removeClass( 'hide' ); - menuIcon.to( 'svg-icon-menu' ); + menuIcon.dispatchEvent( clickEvent ); } if ( 27 === e.keyCode && searchOverlay.hasClass( 'show' ) ) { @@ -235,7 +250,7 @@ searchOverlay.removeClass( 'show' ).resize(); menuToggle.removeClass( 'hide' ); chapterToggle.removeClass( 'hide' ); - searchIcon.to( 'svg-icon-search' ); + searchIcon.dispatchEvent( clickEvent ); } if ( 27 === e.keyCode && chapterOverlay.hasClass( 'show' ) ) { @@ -245,7 +260,7 @@ chapterOverlay.removeClass( 'show' ).resize(); menuToggle.removeClass( 'hide' ); searchToggle.removeClass( 'hide' ); - bookmarkIcon.to( 'svg-icon-bookmark' ); + bookmarkIcon.dispatchEvent( clickEvent ); } } ); From 268f0fbdaa2fea250e0e8dc2e1651e618521999c Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:36:47 -0600 Subject: [PATCH 03/25] Added stroke color for new icons --- assets/stylesheets/components/_icons.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/stylesheets/components/_icons.scss b/assets/stylesheets/components/_icons.scss index 6942aff..d1140e2 100644 --- a/assets/stylesheets/components/_icons.scss +++ b/assets/stylesheets/components/_icons.scss @@ -4,6 +4,7 @@ fill: currentColor; height: 1em; position: relative; + stroke: currentColor; width: 1em; .nav-toggle & { From 2dd60ac03c0d39dfa76a7fc51fe424812c19bd5c Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:37:10 -0600 Subject: [PATCH 04/25] Page title styling [WIP] --- assets/stylesheets/layout/_pages.scss | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/assets/stylesheets/layout/_pages.scss b/assets/stylesheets/layout/_pages.scss index 793331a..01875d5 100644 --- a/assets/stylesheets/layout/_pages.scss +++ b/assets/stylesheets/layout/_pages.scss @@ -31,15 +31,15 @@ background-color: $color__background-dark; min-height: 100vh; padding-bottom: 75px; - padding-top: 45vh; + padding-top: 40vh; @include min-width($breakpoint__tablet-portrait) { - padding-top: 60vh; + //padding-top: 60vh; } } .has-featured-video & { - padding-top: 44vh; // 60vh - 16vh + //padding-top: 44vh; // 60vh - 16vh } hr { @@ -71,6 +71,11 @@ max-width: $content__width-large; } + .has-featured-image & { + //margin-top: calc(50vh - 150px); + //transform: translateY(-50%); + } + > hr { margin-left: auto; margin-right: auto; From f5192c0c61af1cd72d753bb4397cb0e9dbe23493 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:37:35 -0600 Subject: [PATCH 05/25] Fixed scrollnav styles --- assets/stylesheets/plugins/_aesop.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/stylesheets/plugins/_aesop.scss b/assets/stylesheets/plugins/_aesop.scss index 68b0fa6..e218ac7 100644 --- a/assets/stylesheets/plugins/_aesop.scss +++ b/assets/stylesheets/plugins/_aesop.scss @@ -239,7 +239,7 @@ } .aesop-timeline, -.scroll-nav { +.singlepage-scroll-nav .scroll-nav { background-color: transparent; bottom: auto; display: none; From e430feed6910b03c91d273a42465affb1a01a25a Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:37:48 -0600 Subject: [PATCH 06/25] Gutenberg styles [WIP] --- assets/stylesheets/plugins/_gutenberg.scss | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/assets/stylesheets/plugins/_gutenberg.scss b/assets/stylesheets/plugins/_gutenberg.scss index 0951ed8..75d1abe 100644 --- a/assets/stylesheets/plugins/_gutenberg.scss +++ b/assets/stylesheets/plugins/_gutenberg.scss @@ -184,7 +184,6 @@ p { &.alignwide { max-width: $content__width-large; - width: 100%; } &.alignfull { @@ -208,17 +207,16 @@ p { margin-top: 3em; &.alignwide { - max-width: $content__width-large; - width: 100%; + @include site-width($content__width-large); } &.alignfull { - max-width: 100%; - width: 100%; + //width: 100%; } - .blocks-gallery-image { - margin: 8px; + &.columns-2 { + // TODO iterate over possible column widths + // TODO small screens should collapse to single column } } From 0d17a90b8e996571db2947b49f81b023f18f7506 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:37:54 -0600 Subject: [PATCH 07/25] Updated version --- assets/stylesheets/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/stylesheets/style.scss b/assets/stylesheets/style.scss index d01e281..f3e64fa 100644 --- a/assets/stylesheets/style.scss +++ b/assets/stylesheets/style.scss @@ -4,7 +4,7 @@ Theme URI: http://eichefam.net/projects/cover2 Author: Paul Eiche Author URI: https://eichefam.net Description: A content-driven blogging theme for WordPress. -Version: 1.0.14 +Version: 1.0.15 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: cover2 From 5287f80b9b16edc679bd7045709d8461c3c73ddb Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 Nov 2017 17:38:39 -0600 Subject: [PATCH 08/25] Replaced Font Awesome icons with Nucleo --- components/header/header-nav.php | 65 ++++++++++++++------ components/header/header-overlay.php | 2 +- components/page/content-page-noheader.php | 2 +- components/page/content-page-singlepage.php | 6 +- components/page/content-page.php | 6 +- components/post/content-single-portfolio.php | 2 +- components/post/content-summary.php | 21 ++++--- components/post/content.php | 4 +- inc/icon-functions.php | 4 +- inc/template-tags.php | 19 ++---- single.php | 4 +- 11 files changed, 77 insertions(+), 58 deletions(-) diff --git a/components/header/header-nav.php b/components/header/header-nav.php index 0367266..b6f5c53 100644 --- a/components/header/header-nav.php +++ b/components/header/header-nav.php @@ -8,13 +8,17 @@ $has_sidebar = false; if ( is_active_sidebar( 'sidebar-overlay' ) || has_nav_menu( 'top' ) || has_nav_menu( 'jetpack-social-menu' ) ) : $has_sidebar = true; ?> - "', '"', false ) ), - '
' . cover2_get_svg( array( 'icon' => 'icon_bg_pencil', 'title' => __( 'Edit Post', 'cover2' ) ) ), + '
' . cover2_get_svg( array( 'icon' => 'edit', 'title' => __( 'Edit Post', 'cover2' ) ) ), '
' ); ?> diff --git a/components/page/content-page-singlepage.php b/components/page/content-page-singlepage.php index c332225..9e12037 100644 --- a/components/page/content-page-singlepage.php +++ b/components/page/content-page-singlepage.php @@ -16,7 +16,7 @@
- + ', '' ); ?> @@ -33,7 +33,7 @@ - 'icon_bg_angle-down' ) ); ?> + 'chevron-down-large' ) ); ?> @@ -103,7 +103,7 @@ esc_html__( 'Edit %s', 'cover2' ), the_title( '"', '"', false ) ), - '
' . cover2_get_svg( array( 'icon' => 'icon_bg_pencil', 'title' => __( 'Edit Post', 'cover2' ) ) ), + '
' . cover2_get_svg( array( 'icon' => 'edit', 'title' => __( 'Edit Post', 'cover2' ) ) ), '
' ); ?> diff --git a/components/page/content-page.php b/components/page/content-page.php index 2473f1a..de3e75d 100644 --- a/components/page/content-page.php +++ b/components/page/content-page.php @@ -16,7 +16,7 @@
- + ', '' ); ?> @@ -33,7 +33,7 @@ - 'icon_bg_angle-down' ) ); ?> + 'chevron-down-large' ) ); ?> @@ -56,7 +56,7 @@ esc_html__( 'Edit %s', 'cover2' ), the_title( '"', '"', false ) ), - '
' . cover2_get_svg( array( 'icon' => 'icon_bg_pencil', 'title' => __( 'Edit Post', 'cover2' ) ) ), + '
' . cover2_get_svg( array( 'icon' => 'edit', 'title' => __( 'Edit Post', 'cover2' ) ) ), '
' ); ?> diff --git a/components/post/content-single-portfolio.php b/components/post/content-single-portfolio.php index 7d00025..4d9a20e 100644 --- a/components/post/content-single-portfolio.php +++ b/components/post/content-single-portfolio.php @@ -18,7 +18,7 @@ diff --git a/components/post/content-summary.php b/components/post/content-summary.php index 45857ed..29f4bfe 100644 --- a/components/post/content-summary.php +++ b/components/post/content-summary.php @@ -14,33 +14,36 @@ 'icon_bg_thumb-tack', 'title' => __( 'Sticky Post', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'pin', 'title' => __( 'Sticky Post', 'cover2' ) ) ); } else if ( get_post_format() ) { $format = get_post_format(); switch ( $format ) { case 'video': - echo cover2_get_svg( array( 'icon' => 'icon_bg_play-circle', 'title' => __( 'Video', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'video-square', 'title' => __( 'Video', 'cover2' ) ) ); break; case 'audio': - echo cover2_get_svg( array( 'icon' => 'icon_bg_music', 'title' => __( 'Audio', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'music', 'title' => __( 'Audio', 'cover2' ) ) ); + break; + case 'gallery': + echo cover2_get_svg( array( 'icon' => 'image', 'title' => __( 'Gallery', 'cover2' ) ) ); break; case 'image': - echo cover2_get_svg( array( 'icon' => 'icon_bg_picture-o', 'title' => __( 'Image', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'image', 'title' => __( 'Image', 'cover2' ) ) ); break; case 'quote': - echo cover2_get_svg( array( 'icon' => 'icon_bg_quote-right', 'title' => __( 'Quote', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'quote', 'title' => __( 'Quote', 'cover2' ) ) ); break; case 'aside': - echo cover2_get_svg( array( 'icon' => 'icon_bg_file-o', 'title' => __( 'Aside', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'note', 'title' => __( 'Aside', 'cover2' ) ) ); break; case 'link': - echo cover2_get_svg( array( 'icon' => 'icon_bg_link', 'title' => __( 'Link', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'link', 'title' => __( 'Link', 'cover2' ) ) ); break; case 'chat': - echo cover2_get_svg( array( 'icon' => 'icon_bg_comments', 'title' => __( 'Chat', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'chat', 'title' => __( 'Chat', 'cover2' ) ) ); break; case 'status': - echo cover2_get_svg( array( 'icon' => 'icon_bg_comment', 'title' => __( 'Status', 'cover2' ) ) ); + echo cover2_get_svg( array( 'icon' => 'status', 'title' => __( 'Status', 'cover2' ) ) ); break; } } diff --git a/components/post/content.php b/components/post/content.php index 4bc452a..9cb2803 100644 --- a/components/post/content.php +++ b/components/post/content.php @@ -18,7 +18,7 @@ @@ -41,7 +41,7 @@ - 'icon_bg_angle-down' ) ); ?> + 'chevron-down-large' ) ); ?> diff --git a/inc/icon-functions.php b/inc/icon-functions.php index 0b9813e..ab61c68 100644 --- a/inc/icon-functions.php +++ b/inc/icon-functions.php @@ -66,9 +66,9 @@ function cover2_get_svg( $args = array() ) { * * However, the title and description can be used to add information to non-decorative SVG icons to improve accessibility. * - * Example 1 with title: 'icon_bg_arrow-right', 'title' => __( 'This is the title', 'textdomain' ) ) ); ?> + * Example 1 with title: 'arrow-right', 'title' => __( 'This is the title', 'textdomain' ) ) ); ?> * - * Example 2 with title and description: 'icon_bg_arrow-right', 'title' => __( 'This is the title', 'textdomain' ), 'desc' => __( 'This is the description', 'textdomain' ) ) ); ?> + * Example 2 with title and description: 'arrow-right', 'title' => __( 'This is the title', 'textdomain' ), 'desc' => __( 'This is the description', 'textdomain' ) ) ); ?> * * See https://www.paciellogroup.com/blog/2013/12/using-aria-enhance-svg-accessibility/. */ diff --git a/inc/template-tags.php b/inc/template-tags.php index 8a21765..f8b3163 100644 --- a/inc/template-tags.php +++ b/inc/template-tags.php @@ -49,35 +49,26 @@ function cover2_entry_footer() { /* translators: used between list items, there is a space after the comma */ $categories_list = get_the_category_list( esc_html__( ', ', 'cover2' ) ); if ( $categories_list && cover2_categorized_blog() ) { - printf( '
' . cover2_get_svg( array( 'icon' => 'icon_bg_folder', 'title' => __( 'Categories', 'cover2' ) ) ) . $categories_list . '
' ); // WPCS: XSS OK. + printf( '
' . cover2_get_svg( array( 'icon' => 'category', 'title' => __( 'Categories', 'cover2' ) ) ) . $categories_list . '
' ); // WPCS: XSS OK. } /* translators: used between list items, there is a space after the comma */ $tags_list = get_the_tag_list( '', esc_html__( ', ', 'cover2' ) ); if ( $tags_list ) { - if ( count( get_the_tags() ) > 1 ) { - $tag_str = 'icon_bg_tags'; - } else { - $tag_str = 'icon_bg_tag'; - } - printf( '
' . cover2_get_svg( array( 'icon' => $tag_str, 'title' => __( 'Tags', 'cover2' ) ) ) . $tags_list . '
' ); // WPCS: XSS OK. + printf( '
' . cover2_get_svg( array( 'icon' => 'tag', 'title' => __( 'Tags', 'cover2' ) ) ) . $tags_list . '
' ); // WPCS: XSS OK. } } if ( 'jetpack-portfolio' === get_post_type() ) { /* translators: used between list items, there is a space after the comma */ $categories_list = get_the_term_list( get_the_ID(), 'jetpack-portfolio-type', '', esc_html__( ', ', 'cover2' ) ); if ( $categories_list && cover2_categorized_blog() ) { - printf( '
' . cover2_get_svg( array( 'icon' => 'icon_bg_folder', 'title' => __( 'Categories', 'cover2' ) ) ) . $categories_list . '
' ); // WPCS: XSS OK. + printf( '
' . cover2_get_svg( array( 'icon' => 'category', 'title' => __( 'Categories', 'cover2' ) ) ) . $categories_list . '
' ); // WPCS: XSS OK. } /* translators: used between list items, there is a space after the comma */ $tags_list = get_the_term_list( get_the_ID(), 'jetpack-portfolio-tag', '', esc_html__( ', ', 'cover2' ) ); if ( $tags_list ) { - $tag_str = 'icon_bg_tag'; - if ( count( wp_get_post_terms( get_the_ID(), 'jetpack-portfolio-tag' ) ) > 1 ) { - $tag_str = 'icon_bg_tags'; - } - printf( '
' . cover2_get_svg( array( 'icon' => $tag_str, 'title' => __( 'Tags', 'cover2' ) ) ) . $tags_list . '
' ); // WPCS: XSS OK. + printf( '
' . cover2_get_svg( array( 'icon' => 'tag', 'title' => __( 'Tags', 'cover2' ) ) ) . $tags_list . '
' ); // WPCS: XSS OK. } } @@ -93,7 +84,7 @@ function cover2_entry_footer() { esc_html__( 'Edit %s', 'cover2' ), the_title( '"', '"', false ) ), - '
' . cover2_get_svg( array( 'icon' => 'icon_bg_pencil', 'title' => __( 'Edit Post', 'cover2' ) ) ), + '
' . cover2_get_svg( array( 'icon' => 'edit', 'title' => __( 'Edit Post', 'cover2' ) ) ), '
' ); } diff --git a/single.php b/single.php index 6baff24..d7cea17 100644 --- a/single.php +++ b/single.php @@ -30,9 +30,9 @@ // Previous/next post navigation. the_post_navigation( array( - 'next_text' => '