From 0c5a6fb87122b7ec9b055b1e8df72a288bde80b9 Mon Sep 17 00:00:00 2001 From: Sky Shabatura Date: Sat, 23 Nov 2019 12:52:45 -0600 Subject: [PATCH] Import changes from develop --- .browserslistrc | 10 ------ .eslintignore | 1 - .eslintrc | 15 -------- .phpcs.xml.dist | 36 ------------------- .stylelintignore | 1 - .stylelintrc | 13 ------- app/{admin => }/Editor/Editor.php | 2 +- app/{admin => }/Editor/styles/body.php | 0 app/{admin => }/Editor/styles/buttons.php | 0 app/{admin => }/Editor/styles/colors.php | 0 app/{Admin => }/Editor/styles/h1.php | 0 app/{Admin => }/Editor/styles/h2.php | 0 app/{Admin => }/Editor/styles/h3.php | 0 app/{admin => }/Editor/styles/h4.php | 0 app/{admin => }/Editor/styles/h5.php | 0 app/{admin => }/Editor/styles/h6.php | 0 app/{admin => }/Editor/styles/headings.php | 0 app/{admin => }/Editor/styles/page_title.php | 0 app/{admin => }/Editor/styles/post_title.php | 0 app/{Admin => }/Editor/styles/styles.php | 0 .../{AdminProvider.php => EditorProvider.php} | 13 +++---- app/Template/Template.php | 2 +- app/bootstrap-app.php | 2 +- changelog.md | 6 ++++ dist/css/editor.css | 1 - dist/css/screen.css | 1 - dist/js/editor.js | 8 ++--- mix-manifest.json | 20 +++++------ package.json | 2 +- readme.md | 2 +- readme.txt | 2 +- style.css | 2 +- views/partials/post-meta.php | 16 ++++----- .../{page-builder.php => builder.php} | 0 34 files changed, 40 insertions(+), 115 deletions(-) delete mode 100755 .browserslistrc delete mode 100755 .eslintignore delete mode 100755 .eslintrc delete mode 100644 .phpcs.xml.dist delete mode 100755 .stylelintignore delete mode 100755 .stylelintrc rename app/{admin => }/Editor/Editor.php (99%) rename app/{admin => }/Editor/styles/body.php (100%) rename app/{admin => }/Editor/styles/buttons.php (100%) rename app/{admin => }/Editor/styles/colors.php (100%) rename app/{Admin => }/Editor/styles/h1.php (100%) rename app/{Admin => }/Editor/styles/h2.php (100%) rename app/{Admin => }/Editor/styles/h3.php (100%) rename app/{admin => }/Editor/styles/h4.php (100%) rename app/{admin => }/Editor/styles/h5.php (100%) rename app/{admin => }/Editor/styles/h6.php (100%) rename app/{admin => }/Editor/styles/headings.php (100%) rename app/{admin => }/Editor/styles/page_title.php (100%) rename app/{admin => }/Editor/styles/post_title.php (100%) rename app/{Admin => }/Editor/styles/styles.php (100%) rename app/Providers/{AdminProvider.php => EditorProvider.php} (86%) rename views/templates/{page-builder.php => builder.php} (100%) diff --git a/.browserslistrc b/.browserslistrc deleted file mode 100755 index b17edc0..0000000 --- a/.browserslistrc +++ /dev/null @@ -1,10 +0,0 @@ -> 1% -ie >= 11 -last 1 Android versions -last 1 ChromeAndroid versions -last 2 Chrome versions -last 2 Firefox versions -last 2 Safari versions -last 2 iOS versions -last 2 Edge versions -last 2 Opera versions diff --git a/.eslintignore b/.eslintignore deleted file mode 100755 index 7f896dc..0000000 --- a/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -dist/js/**/*.js diff --git a/.eslintrc b/.eslintrc deleted file mode 100755 index d9dcad6..0000000 --- a/.eslintrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "wordpress", - "env": { - "browser": true, - "es6": true, - "jquery": true - }, - "parserOptions": { - "sourceType": "module" - }, - "rules": { - "space-in-parens": 0, - "wrap-iife": 0 - } -} diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist deleted file mode 100644 index c65d325..0000000 --- a/.phpcs.xml.dist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - */vendor/* - - */node_modules/* - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.stylelintignore b/.stylelintignore deleted file mode 100755 index 1521c8b..0000000 --- a/.stylelintignore +++ /dev/null @@ -1 +0,0 @@ -dist diff --git a/.stylelintrc b/.stylelintrc deleted file mode 100755 index 50b3eec..0000000 --- a/.stylelintrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "stylelint-config-wordpress/scss", - "rules": { - "string-quotes": null, - "block-no-empty": null, - "rule-empty-line-before": null, - "declaration-colon-space-after": null, - "function-parentheses-space-inside": null, - "color-named": null, - "declaration-colon-space-before": null, - "at-rule-empty-line-before": null - } -} diff --git a/app/admin/Editor/Editor.php b/app/Editor/Editor.php similarity index 99% rename from app/admin/Editor/Editor.php rename to app/Editor/Editor.php index 06181a1..7542fe0 100644 --- a/app/admin/Editor/Editor.php +++ b/app/Editor/Editor.php @@ -11,7 +11,7 @@ * @link https://taproot-theme.com */ -namespace Taproot\Admin\Editor; +namespace Taproot\Editor; use Hybrid\Contracts\Bootable; use Rootstrap\Styles\Styles; diff --git a/app/admin/Editor/styles/body.php b/app/Editor/styles/body.php similarity index 100% rename from app/admin/Editor/styles/body.php rename to app/Editor/styles/body.php diff --git a/app/admin/Editor/styles/buttons.php b/app/Editor/styles/buttons.php similarity index 100% rename from app/admin/Editor/styles/buttons.php rename to app/Editor/styles/buttons.php diff --git a/app/admin/Editor/styles/colors.php b/app/Editor/styles/colors.php similarity index 100% rename from app/admin/Editor/styles/colors.php rename to app/Editor/styles/colors.php diff --git a/app/Admin/Editor/styles/h1.php b/app/Editor/styles/h1.php similarity index 100% rename from app/Admin/Editor/styles/h1.php rename to app/Editor/styles/h1.php diff --git a/app/Admin/Editor/styles/h2.php b/app/Editor/styles/h2.php similarity index 100% rename from app/Admin/Editor/styles/h2.php rename to app/Editor/styles/h2.php diff --git a/app/Admin/Editor/styles/h3.php b/app/Editor/styles/h3.php similarity index 100% rename from app/Admin/Editor/styles/h3.php rename to app/Editor/styles/h3.php diff --git a/app/admin/Editor/styles/h4.php b/app/Editor/styles/h4.php similarity index 100% rename from app/admin/Editor/styles/h4.php rename to app/Editor/styles/h4.php diff --git a/app/admin/Editor/styles/h5.php b/app/Editor/styles/h5.php similarity index 100% rename from app/admin/Editor/styles/h5.php rename to app/Editor/styles/h5.php diff --git a/app/admin/Editor/styles/h6.php b/app/Editor/styles/h6.php similarity index 100% rename from app/admin/Editor/styles/h6.php rename to app/Editor/styles/h6.php diff --git a/app/admin/Editor/styles/headings.php b/app/Editor/styles/headings.php similarity index 100% rename from app/admin/Editor/styles/headings.php rename to app/Editor/styles/headings.php diff --git a/app/admin/Editor/styles/page_title.php b/app/Editor/styles/page_title.php similarity index 100% rename from app/admin/Editor/styles/page_title.php rename to app/Editor/styles/page_title.php diff --git a/app/admin/Editor/styles/post_title.php b/app/Editor/styles/post_title.php similarity index 100% rename from app/admin/Editor/styles/post_title.php rename to app/Editor/styles/post_title.php diff --git a/app/Admin/Editor/styles/styles.php b/app/Editor/styles/styles.php similarity index 100% rename from app/Admin/Editor/styles/styles.php rename to app/Editor/styles/styles.php diff --git a/app/Providers/AdminProvider.php b/app/Providers/EditorProvider.php similarity index 86% rename from app/Providers/AdminProvider.php rename to app/Providers/EditorProvider.php index 59cf7cb..7fa37eb 100644 --- a/app/Providers/AdminProvider.php +++ b/app/Providers/EditorProvider.php @@ -1,6 +1,6 @@ app->singleton( Editor::class ); - } /** @@ -53,6 +51,5 @@ public function boot() { // Boot the Editor class $this->app->resolve( Editor::class )->boot(); - - } + } } diff --git a/app/Template/Template.php b/app/Template/Template.php index 842a91d..a25dc6e 100644 --- a/app/Template/Template.php +++ b/app/Template/Template.php @@ -115,7 +115,7 @@ public function path() { * @return void */ public function register( $templates ) { - $templates->add('templates/page-builder.php', ['label' => __('Page Builder', 'taproot')]); + $templates->add('templates/builder.php', ['label' => __('Page Builder', 'taproot')]); $templates->add('templates/blank.php', ['label' => __('Blank Template', 'taproot')]); $templates->add('templates/blocks.php', ['label' => __('Block Editor Template', 'taproot')]); } diff --git a/app/bootstrap-app.php b/app/bootstrap-app.php index 553c326..8cb6cc1 100644 --- a/app/bootstrap-app.php +++ b/app/bootstrap-app.php @@ -34,7 +34,7 @@ $taproot->provider( \Taproot\Providers\AppProvider::class ); $taproot->provider( \Taproot\Providers\RootstrapProvider::class ); -$taproot->provider( \Taproot\Providers\AdminProvider::class ); +$taproot->provider( \Taproot\Providers\EditorProvider::class ); $taproot->provider( \Taproot\Providers\CustomizeProvider::class ); $taproot->provider( \Taproot\Providers\TemplateProvider::class ); diff --git a/changelog.md b/changelog.md index 81d860e..4f6ca5e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Change Log += 1.4.2 = +* 10/23/19 +* Fix - Namespacing issue +* Fix - Custom template name collision +* Fix - Post meta template error + = 1.4.1 = * 10/19/19 * Fix - Javascript errors in customizer in WP 5.3 diff --git a/dist/css/editor.css b/dist/css/editor.css index c8debe5..393d76f 100644 --- a/dist/css/editor.css +++ b/dist/css/editor.css @@ -791,7 +791,6 @@ } .editor-styles-wrapper .wp-block-image.is-resized { width: -webkit-min-content; - width: -moz-min-content; width: min-content; display: -ms-inline-grid; -ms-grid-columns: min-content; diff --git a/dist/css/screen.css b/dist/css/screen.css index affef6b..c4cafce 100644 --- a/dist/css/screen.css +++ b/dist/css/screen.css @@ -2972,7 +2972,6 @@ p.has-background { } .wp-block-image.is-resized { width: -webkit-min-content; - width: -moz-min-content; width: min-content; display: -ms-inline-grid; -ms-grid-columns: min-content; diff --git a/dist/js/editor.js b/dist/js/editor.js index a6e8ad5..531a300 100644 --- a/dist/js/editor.js +++ b/dist/js/editor.js @@ -277,7 +277,7 @@ function HeroImageEdit(_ref) { var addImage = function addImage(open) { if ('custom' === heroImageType) return React.createElement("button", { - class: "components-button is-button is-default", + "class": "components-button is-button is-default", style: { marginRight: '10px' }, @@ -292,7 +292,7 @@ function HeroImageEdit(_ref) { var imageReset = 'custom' === heroImageType && heroImage ? React.createElement("button", { - class: "components-button is-button is-default", + "class": "components-button is-button is-default", onClick: reset }, __('Clear')) : null; // return the custom header image picker component @@ -537,7 +537,7 @@ function HeroPreviewEdit(_ref) { className: "media-preview-wrapper" }, React.createElement("img", { src: imageSource, - class: "media-preview" + "class": "media-preview" }), 'none' !== overlayType && React.createElement("div", { className: "taproot-overlay", style: { @@ -546,7 +546,7 @@ function HeroPreviewEdit(_ref) { } }), React.createElement("a", { href: "#", - class: "taproot-overlay-preview-text", + "class": "taproot-overlay-preview-text", style: { color: defaultColor } diff --git a/mix-manifest.json b/mix-manifest.json index d2bfd97..655e44c 100644 --- a/mix-manifest.json +++ b/mix-manifest.json @@ -1,16 +1,16 @@ { "/dist/js/app.js": "/dist/js/app.js?id=ffdad5cc180bc057c6e0", - "/dist/css/screen.css": "/dist/css/screen.css?id=4b8603730bedd1f1bda6", - "/dist/css/editor.css": "/dist/css/editor.css?id=243a1da93a323a6311c5", + "/dist/css/screen.css": "/dist/css/screen.css?id=c3376b523837137d2187", + "/dist/css/editor.css": "/dist/css/editor.css?id=9ef7cfd0f6ec9f378318", "/dist/css/customize-controls.css": "/dist/css/customize-controls.css?id=5ae8a7ff21e1103df669", - "/dist/js/app.js.map": "/dist/js/app.js.map?id=a2e93c728f7280b8f9f2", - "/dist/css/screen.css.map": "/dist/css/screen.css.map?id=a9f8575bf55733a22e21", - "/dist/css/editor.css.map": "/dist/css/editor.css.map?id=e7eeacab6780227a5605", - "/dist/css/customize-controls.css.map": "/dist/css/customize-controls.css.map?id=12285aaf9fb63f8181c5", + "/dist/js/app.js.map": "/dist/js/app.js.map?id=b175560b67e1179afc1a", + "/dist/css/screen.css.map": "/dist/css/screen.css.map?id=46c01bd90ccd3f2adf45", + "/dist/css/editor.css.map": "/dist/css/editor.css.map?id=ead21ac1b3f883ca5801", + "/dist/css/customize-controls.css.map": "/dist/css/customize-controls.css.map?id=f9021e64b4c4abc75ae4", "/dist/js/customize-controls.js": "/dist/js/customize-controls.js?id=ca9d69746344466d7966", - "/dist/js/customize-controls.js.map": "/dist/js/customize-controls.js.map?id=d6331c71acddf9b3b3d6", + "/dist/js/customize-controls.js.map": "/dist/js/customize-controls.js.map?id=0cadd43af5538c6995b6", "/dist/js/customize-preview.js": "/dist/js/customize-preview.js?id=6789d67c883f52b5c3b3", - "/dist/js/customize-preview.js.map": "/dist/js/customize-preview.js.map?id=5164eccd1a37d1411f2f", - "/dist/js/editor.js": "/dist/js/editor.js?id=230e980708b71a115491", - "/dist/js/editor.js.map": "/dist/js/editor.js.map?id=393a5e53ee03548de25e" + "/dist/js/customize-preview.js.map": "/dist/js/customize-preview.js.map?id=ee5e74521731e8b2454d", + "/dist/js/editor.js": "/dist/js/editor.js?id=71043939d8a47bec92f9", + "/dist/js/editor.js.map": "/dist/js/editor.js.map?id=4ecb01516594a32a668e" } diff --git a/package.json b/package.json index fa1197f..cba7e77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taproot", - "version": "1.4.1", + "version": "1.4.2", "description": "Taproot is a multipurpose theme built on Hybrid Core and the Mythic started theme", "author": "Sky Shabatura", "license": "GPL-2.0+", diff --git a/readme.md b/readme.md index c83287f..f700ebb 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ Contributors: skyshab Tags: custom-background, custom-header, custom-colors, custom-menu, featured-images, one-column, two-column, theme-options, block-editor-styles, threaded-comments, translation-ready Requires at least: 5.0 Tested up to: 5.3 -Stable tag: 1.4.1 +Stable tag: 1.4.2 A lightweight yet powerful all-purpose theme. diff --git a/readme.txt b/readme.txt index c83287f..f700ebb 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: skyshab Tags: custom-background, custom-header, custom-colors, custom-menu, featured-images, one-column, two-column, theme-options, block-editor-styles, threaded-comments, translation-ready Requires at least: 5.0 Tested up to: 5.3 -Stable tag: 1.4.1 +Stable tag: 1.4.2 A lightweight yet powerful all-purpose theme. diff --git a/style.css b/style.css index 75425d7..8769124 100644 --- a/style.css +++ b/style.css @@ -2,7 +2,7 @@ * Theme Name: Taproot * Theme URI: https://taproot-theme.com * Description: Taproot is a modern, full featured multipurpose theme for WordPress. Features include a variety of Customizer settings, hooks and filters for developers, and full support for the Gutenberg block editor. - * Version: 1.4.1 + * Version: 1.4.2 * Author: Sky Shabatura * Author URI: https://sky.camp * Tags: custom-background, custom-header, custom-colors, custom-menu, featured-images, theme-options, threaded-comments, translation-ready diff --git a/views/partials/post-meta.php b/views/partials/post-meta.php index 1a23365..033d621 100644 --- a/views/partials/post-meta.php +++ b/views/partials/post-meta.php @@ -56,24 +56,24 @@ // Display Taxonomies if( !empty( $data['taxonomies'] ) ) { - foreach( $data['taxonomies'] as $taxonomy ) { - if( taxonomy_exists($taxonomy) ) { + foreach( $data['taxonomies'] as $tax ) { + if( taxonomy_exists($tax) ) { if( $data['icons'] ) { - $tax_label = ( is_taxonomy_hierarchical( $taxonomy ) ) ? + $tax_label = ( is_taxonomy_hierarchical( $tax ) ) ? icon( 'categories', ['icon' => 'list-ul'] ) : icon( 'tags', ['icon' => 'tags'] ); } else { - $tax_labels = get_taxonomy_labels( get_taxonomy( $taxonomy ) ); - $tax_label = sprintf('%s:', esc_html__($tax_labels->name, 'taproot') ); + $tax_labels = get_taxonomy_labels( get_taxonomy( $tax ) ); + $tax_label = sprintf('%s:', esc_html($tax_labels->name) ); } display_terms([ - 'taxonomy' => $taxonomy, - 'before' => sprintf( '%s', $taxonomy, $tax_label ), + 'taxonomy' => $tax, + 'before' => sprintf( '%s', $tax, $tax_label ), 'after' => '', - 'class' => sprintf( 'taproot-meta__terms taproot-meta__terms--%s', $taxonomy) + 'class' => sprintf( 'taproot-meta__terms taproot-meta__terms--%s', $tax) ]); } } diff --git a/views/templates/page-builder.php b/views/templates/builder.php similarity index 100% rename from views/templates/page-builder.php rename to views/templates/builder.php