diff --git a/.gitignore b/.gitignore
index 5b70da7..34806bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ package-lock.json
gridd-plus.zip
inc/acf/plugin
assets/css/*.css
-assets/css/**/*.css
\ No newline at end of file
+assets/css/**/*.css
+inc/acf/
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d841661..3f3b3c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## v3.0.0
+2020-05-24
+
+* FIX: Nested Grid styles.
+* FIX: Refactored scroll-to-top link & styles.
+* FIX: Typography scales now using a slider.
+* UPDATED: ACF-Pro v5.8.11.
+* REMOVED: Custom grid metabox in posts & pages.
+* REMOVED: Separate mobile grids.
+* REMOVED: Grid parts padding options.
+
## v1.0.7
2019-09-04
diff --git a/assets/css/anchor-links.scss b/assets/css/anchor-links.scss
index b565eac..24c9b26 100644
--- a/assets/css/anchor-links.scss
+++ b/assets/css/anchor-links.scss
@@ -1,6 +1,9 @@
.anchor-injected {
opacity: 0;
transition: all 250ms;
+ text-decoration: none !important;
+ border-color: transparent !important;
+ box-shadow: none !important;
&:before {
content: "🔗";
diff --git a/assets/css/grid-part-breadcrumbs.scss b/assets/css/grid-part-breadcrumbs.scss
deleted file mode 100644
index c7d6a9e..0000000
--- a/assets/css/grid-part-breadcrumbs.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.gridd-tp-breadcrumbs {
- font-size: calc(var(--brd-fs) * 1em);
-}
diff --git a/assets/css/grid-part-offcanvas-sidebar.scss b/assets/css/grid-part-offcanvas-sidebar.scss
deleted file mode 100644
index a0f4992..0000000
--- a/assets/css/grid-part-offcanvas-sidebar.scss
+++ /dev/null
@@ -1,134 +0,0 @@
-.gridd-tp-offcanvas-sidebar {
- position: fixed;
- top: 0;
- display: block;
- width: var(--ocnv-w);
- max-width: 100vw;
- padding: var(--ocnv-pd);
- background-color: var(--ocnv-bg);
- color: var(--ocnv-cl);
- z-index: 999999;
- height: 100vh;
- overflow-y: scroll;
- overflow-x: hidden;
-
- &.position-left {
- left: calc(0px - var(--ocnv-w));
- transition: left 200ms;
- }
-
- &.position-right {
- right: calc(0px - var(--ocnv-w));
- transition: right 200ms;
- }
-
- h1,
- h2,
- h3,
- h4,
- h5,
- h6 {
- color: var(--ocnv-cl);
- }
-
- a,
- a:hover,
- a:focus,
- a:visited {
- color: var(--ocnv-lc)
- }
-}
-
-.toggle-gridd-plus-offcanvas-sidebar {
- position: fixed;
- top: 50%;
- transform: translateY(-50%);
- z-index: 1000000;
- background-color: var(--ocnv-bg);
- color: var(--ocnv-cl);
- box-shadow: none;
- border: none;
- display: flex;
- border-radius: 2em;
- opacity: .7;
-
- svg {
- fill: var(--ocnv-cl);
- }
-
- &.toggled-on,
- &[aria-expanded=true] {
- opacity: 1;
- box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
- z-index: 100;
-
- svg {
- transform: rotate(180deg);
- }
-
- +.gridd-tp-offcanvas-sidebar {
- box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
- }
- }
-
- &.position-left {
- left: -2em;
- transition: left 200ms;
- padding: 1em .5em 1em 2em;
-
- &:hover,
- &:active,
- &:focus {
- left: -1.5em;
- }
-
- &.toggled-on,
- &[aria-expanded=true] {
- left: calc(var(--ocnv-w) - 1.5em);
-
- svg {
- transform: rotate(180deg);
- }
-
- +.gridd-tp-offcanvas-sidebar {
- left: 0;
- }
- }
- }
-
- &.position-right {
- right: -2em;
- transition: right 200ms;
- padding: 1em 2em 1em .5em;
-
- &:hover,
- &:active,
- &:focus {
- right: -1.5em;
- }
-
- svg {
- transform: rotate(180deg);
- }
-
- &.toggled-on,
- &[aria-expanded=true] {
- right: calc(var(--ocnv-w) - 1.5em);
-
- svg {
- transform: rotate(0deg);
- }
-
- +.gridd-tp-offcanvas-sidebar {
- right: 0;
- }
- }
- }
-
- &:hover,
- &:active,
- &:focus {
- box-shadow: none;
- opacity: 1;
- }
-}
\ No newline at end of file
diff --git a/assets/css/navigation-collapsed.scss b/assets/css/navigation-collapsed.scss
deleted file mode 100644
index 197a414..0000000
--- a/assets/css/navigation-collapsed.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-// We use the "ID" (all caps) as a placeholder.
-// The ID will be replaced by the actual navigation-ID via PHP
-// when the style is included inline in the document.
-.gridd-tp.gridd-tp-nav_ID {
-
- .gridd-toggle-navigation {
- &.gridd-toggle {
- padding: var(--nv-ID-ipd);
- height: var(--nv-ID-cis);
- align-items: center;
-
- svg {
- width: var(--nv-ID-cis);
- }
- }
-
- .icon {
- &.close {
- transform: translateX(calc(.01px - var(--nv-ID-cis)));
- }
- }
- }
-}
\ No newline at end of file
diff --git a/assets/css/navigation-main.scss b/assets/css/navigation-main.scss
deleted file mode 100644
index d788a2f..0000000
--- a/assets/css/navigation-main.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-// We use the "ID" (all caps) as a placeholder.
-// The ID will be replaced by the actual navigation-ID via PHP
-// when the style is included inline in the document.
-.gridd-tp-nav_ID {
- .gridd-navigation {
- a {
- padding: calc(var(--nv-ID-ipd) / 1.618) var(--nv-ID-ipd);
- }
-
- .gridd-toggle {
- padding-top: var(--nv-ID-ipd);
- padding-bottom: var(--nv-ID-ipd);
- }
- }
-}
diff --git a/assets/css/navigation-vertical.scss b/assets/css/navigation-vertical.scss
deleted file mode 100644
index 3499e41..0000000
--- a/assets/css/navigation-vertical.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// // We use the "ID" (all caps) as a placeholder.
-// // The ID will be replaced by the actual navigation-ID via PHP
-// // when the style is included inline in the document.
-// .gridd-tp-nav_ID {
-// li {
-
-// &.menu-item-has-children,
-// &.page_item_has_children {
-// >a {
-// width: calc(100% - var(--nv-ID-ipd) - 1em - 0.01px);
-// }
-// }
-// }
-// }
diff --git a/assets/css/nested-grid-default.scss b/assets/css/nested-grid-default.scss
index 3baa9f9..5c18eb3 100644
--- a/assets/css/nested-grid-default.scss
+++ b/assets/css/nested-grid-default.scss
@@ -2,15 +2,15 @@
// The ID will be replaced by the actual nested-grid ID via PHP
// when the style is included inline in the document.
.gridd-tp-nested-grid-ID {
- background-color: var(--ns-gr-ID-bg);
- padding: var(--ns-gr-ID-pd);
+ background-color: var(--bg);
+ padding: 1em;
display: flex;
justify-content: center;
overflow: visible;
- box-shadow: var(--ns-gr-ID-bs);
+ box-shadow: var(--bs);
> .inner {
width: 100%;
- max-width: var(--ns-gr-ID-mw);
+ max-width: var(--mw);
}
}
diff --git a/assets/css/nested-grid-large.scss b/assets/css/nested-grid-large.scss
index f8a9de8..ca235c9 100644
--- a/assets/css/nested-grid-large.scss
+++ b/assets/css/nested-grid-large.scss
@@ -5,6 +5,6 @@
> .inner {
display:-ms-grid;
display: grid;
- grid-gap: var(--ns-gr-ID-gg);
+ grid-gap: var(--gg);
}
}
diff --git a/assets/css/totop.scss b/assets/css/totop.scss
index 6a1ff03..e6153b2 100644
--- a/assets/css/totop.scss
+++ b/assets/css/totop.scss
@@ -1,76 +1,36 @@
// CSS for this implementation is a slightly tweaked version of https://codepen.io/rolandtoth/pen/eMamVK/
-@mixin setScrolltopColors($bgColor: #333, $arrowColor: white, $bgColorHover: $bgColor, $arrowColorHover: $arrowColor) {
- #scrolltop-bg {
- fill: $bgColor;
- }
-
- #scrolltop-arrow {
- fill: $arrowColor;
- }
-
- a:hover {
- #scrolltop-bg {
- fill: $bgColorHover;
- }
-
- #scrolltop-arrow {
- fill: $arrowColorHover;
- }
- }
-}
-
.scrolltop-wrap {
- $size: 3rem;
- $offsetBottom: 2rem;
- $offsetHorizontal: 2rem;
- $scrollToRevealDistance: 35vh; // scroll offset to reveal scroll-to-top link
box-sizing: border-box;
- position: absolute;
- top: $scrollToRevealDistance;
- right: $offsetHorizontal;
- bottom: 0;
- pointer-events: none;
- backface-visibility: hidden;
- @include setScrolltopColors(var(--lc), white, var(--lch));
+ position: fixed;
+ bottom: -2em;
+ right: 2em;
+ transition: all 200ms;
+
+ .gridd-scroll-to-top & {
+ bottom: 0;
+ }
- // prevent extra page height if content is smaller than viewport
- // Firefox only
- @supports (-moz-appearance: meterbar) {
- clip: rect(0, $size, auto, 0);
+ body.rtl & {
+ right: auto;
+ left: 2em;
}
a {
- $offset: - ($size + $offsetBottom); // pull up + add a small bottom space
- position: fixed; // fallback
- position: sticky;
- top: $offset;
- width: $size;
- height: $size;
- margin-bottom: $offset;
- transform: translateY(100vh); // push to bottom from top (when stuck)
- backface-visibility: hidden;
- display: inline-block;
+ display: flex;
+ justify-content: center;
+ width: 2em;
+ height: 2em;
+ line-height: 1.2;
+ background: var(--lc);
+ color: var(--bg);
text-decoration: none;
- user-select: none;
- pointer-events: all;
- outline: none;
- overflow: hidden;
-
- svg {
- display: block;
- border-radius: 50%;
- width: 100%;
- height: 100%;
+ transform: rotate(180deg);
+ border-radius: 0 0 4px 4px;
- path {
- transition: all 0.1s;
- }
- }
-
- #scrolltop-arrow {
- transform: scale(0.66);
- transform-origin: center;
+ &:hover {
+ background: var(--cl);
+ text-decoration: none;
}
}
@@ -78,8 +38,3 @@
display: none !important;
}
}
-
-.q-scroll-totop {
- bottom: 80;
- padding: .5em;
-}
diff --git a/assets/css/woocommerce.scss b/assets/css/woocommerce.scss
index 8e2a6cb..2f65544 100644
--- a/assets/css/woocommerce.scss
+++ b/assets/css/woocommerce.scss
@@ -19,7 +19,7 @@
}
.widget {
- padding: 0 1em;
+ padding: 1em 1em 0 1em;
.total {
border-top: none;
diff --git a/assets/js/anchor-headers.js b/assets/js/anchor-headers.js
index b809d08..3537008 100644
--- a/assets/js/anchor-headers.js
+++ b/assets/js/anchor-headers.js
@@ -1,16 +1,16 @@
( function() {
var headers = document.querySelectorAll( 'h1,h2,h3,h4,h5,h6' ),
- id,
- el,
- i;
-for ( i = 0; i < headers.length; i++ ) {
- id = headers[ i ].getAttribute( 'id' );
- if ( id ) {
- el = document.createElement( 'a' );
- el.setAttribute( 'class', 'anchor-injected' );
- el.setAttribute( 'href', '#' + id );
- el.setAttribute( 'aria-label', 'section anchor link' );
- headers[ i ].appendChild( el );
+ id,
+ el,
+ i;
+ for ( i = 0; i < headers.length; i++ ) {
+ id = headers[ i ].getAttribute( 'id' );
+ if ( id ) {
+ el = document.createElement( 'a' );
+ el.setAttribute( 'class', 'anchor-injected' );
+ el.setAttribute( 'href', '#' + id );
+ el.setAttribute( 'aria-label', 'section anchor link' );
+ headers[ i ].appendChild( el );
+ }
}
-}
} () );
diff --git a/composer.json b/composer.json
index a8aefdf..3a3fed6 100644
--- a/composer.json
+++ b/composer.json
@@ -6,9 +6,13 @@
"license": "GPLv2 or later",
"require": {
"php": ">=7",
- "composer/installers": "~1.0"
+ "wplemon/control-wcag-textcolor": "dev-master",
+ "wplemon/control-wcag-linkcolor": "dev-master",
+ "kirki-framework/control-base": "dev-master",
+ "kirki-framework/field": "dev-master"
},
"require-dev": {
+ "composer/installers": "~1.0",
"phpunit/phpunit": "*",
"dealerdirect/phpcodesniffer-composer-installer": "*",
"wp-coding-standards/wpcs": "*",
diff --git a/gridd-plus.php b/gridd-plus.php
index 92c459e..f52bc33 100644
--- a/gridd-plus.php
+++ b/gridd-plus.php
@@ -4,7 +4,7 @@
* Plugin URI: https://wplemon.com
* Author: Ari Stathopoulos
* Author URI: http://aristath.github.io
- * Version: 1.0.7
+ * Version: 3.0.0
* Description: Premium addon plugin for the Gridd theme.
* Text Domain: gridd-plus
*
@@ -23,7 +23,7 @@
// Define the URL.
if ( ! defined( 'GRIDD_PLUS_VERSION' ) ) {
- define( 'GRIDD_PLUS_VERSION', '1.0.7' );
+ define( 'GRIDD_PLUS_VERSION', '3.0.0' );
}
// Define the path.
@@ -52,3 +52,16 @@ function gridd_plus_bootstrap() {
require_once GRIDD_PLUS_PATH . '/inc/bootstrap.php';
}
add_action( 'gridd_setup', 'gridd_plus_bootstrap' );
+
+/**
+ * Filter sidebars number.
+ *
+ * This needs to be in the main plugin file because of filter priorities.
+ *
+ * @since 2.0.0
+ * @return int
+ */
+function gridd_plus_sidebars_number() {
+ return (int) get_theme_mod( 'widget_areas_number', 10 );
+}
+add_filter( 'gridd_get_number_of_widget_areas', 'gridd_plus_sidebars_number' );
diff --git a/inc/acf/fields.php b/inc/acf/fields.php
deleted file mode 100644
index 1d1a08b..0000000
--- a/inc/acf/fields.php
+++ /dev/null
@@ -1,231 +0,0 @@
-get_parts();
-$parts_array = [];
-foreach ( $all_parts as $part ) {
- if ( isset( $part['id'] ) ) {
- $part['label'] = isset( $part['label'] ) ? $part['label'] : $part['id'];
- $parts_array[ $part['id'] ] = $part['label'];
- }
-}
-
-if ( function_exists( 'acf_add_local_field_group' ) ) :
-
- acf_add_local_field_group(
- array(
- 'key' => 'group_5c976c1f62554',
- 'title' => esc_html__( 'Gridd Plus', 'gridd-plus' ),
- 'fields' => array(
- array(
- 'key' => 'field_5c976c83f3aca',
- 'label' => esc_html__( 'Hide Title', 'gridd-plus' ),
- 'name' => 'gridd_plus_hide_title',
- 'type' => 'true_false',
- 'instructions' => '',
- 'required' => 0,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'message' => esc_html__( 'Enable this option to hide the page title', 'gridd-plus' ),
- 'default_value' => 0,
- 'ui' => 0,
- 'ui_on_text' => '',
- 'ui_off_text' => '',
- ),
- array(
- 'key' => 'field_5c976e36561dd',
- 'label' => esc_html__( 'Custom Grid Column Dimensions', 'gridd-plus' ),
- 'name' => 'gridd_plus_custom_grid_column_dimensions',
- 'type' => 'text',
- 'instructions' => esc_html__( 'Enter comma-separated dimensions for the grid columns. If no values are entered in this field, values will be auto-calculated.', 'gridd-plus' ),
- 'required' => 0,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'default_value' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => '',
- 'maxlength' => '',
- ),
- array(
- 'key' => 'field_5c976e88561de',
- 'label' => esc_html__( 'Custom Grid Row Dimensions', 'gridd-plus' ),
- 'name' => 'gridd_plus_custom_grid_row_dimensions',
- 'type' => 'text',
- 'instructions' => esc_html__( 'Enter comma-separated dimensions for the grid rows. If no values are entered in this field, values will be auto-calculated.', 'gridd-plus' ),
- 'required' => 0,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'default_value' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => '',
- 'maxlength' => '',
- ),
- array(
- 'key' => 'field_5c976ebf3c525',
- 'label' => esc_html__( 'Custom Grid', 'gridd-plus' ),
- 'name' => 'gridd_plus_custom_grid',
- 'type' => 'repeater',
- 'instructions' => esc_html__( 'Add the grid-parts this page should have, and select where these parts should be placed in your grid.', 'gridd-plus' ),
- 'required' => 0,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'collapsed' => 'field_5c976ef83c526',
- 'min' => 0,
- 'max' => 0,
- 'layout' => 'table',
- 'button_label' => '',
- 'sub_fields' => array(
- array(
- 'key' => 'field_5c976ef83c526',
- 'label' => esc_html__( 'Grid Part', 'gridd-plus' ),
- 'name' => 'grid_part',
- 'type' => 'select',
- 'instructions' => '',
- 'required' => 1,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'choices' => $parts_array,
- 'default_value' => array(),
- 'allow_null' => 0,
- 'multiple' => 0,
- 'ui' => 0,
- 'return_format' => 'value',
- 'ajax' => 0,
- 'placeholder' => '',
- ),
- array(
- 'key' => 'field_5c976f3f3c527',
- 'label' => esc_html__( 'Start Column', 'gridd-plus' ),
- 'name' => 'start_column',
- 'type' => 'number',
- 'instructions' => '',
- 'required' => 1,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'default_value' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => '',
- 'min' => 1,
- 'max' => '',
- 'step' => 1,
- ),
- array(
- 'key' => 'field_5c976f5b3c528',
- 'label' => esc_html__( 'Column Span', 'gridd-plus' ),
- 'name' => 'column_span',
- 'type' => 'number',
- 'instructions' => '',
- 'required' => 1,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'default_value' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => '',
- 'min' => 1,
- 'max' => '',
- 'step' => 1,
- ),
- array(
- 'key' => 'field_5c976f803c529',
- 'label' => esc_html__( 'Start Row', 'gridd-plus' ),
- 'name' => 'start_row',
- 'type' => 'number',
- 'instructions' => '',
- 'required' => 1,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'default_value' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => '',
- 'min' => 1,
- 'max' => '',
- 'step' => 1,
- ),
- array(
- 'key' => 'field_5c976fa53c52a',
- 'label' => esc_html__( 'Row Span', 'gridd-plus' ),
- 'name' => 'row_span',
- 'type' => 'number',
- 'instructions' => '',
- 'required' => 1,
- 'conditional_logic' => 0,
- 'wrapper' => array(
- 'width' => '',
- 'class' => '',
- 'id' => '',
- ),
- 'default_value' => '',
- 'placeholder' => '',
- 'prepend' => '',
- 'append' => '',
- 'min' => 1,
- 'max' => '',
- 'step' => 1,
- ),
- ),
- ),
- ),
- 'location' => array(
- array(
- array(
- 'param' => 'post_type',
- 'operator' => '==',
- 'value' => 'page',
- ),
- ),
- ),
- 'menu_order' => 0,
- 'position' => 'normal',
- 'style' => 'default',
- 'label_placement' => 'top',
- 'instruction_placement' => 'label',
- 'hide_on_screen' => '',
- 'active' => 1,
- 'description' => '',
- )
- );
-
-endif;
diff --git a/inc/acf/primer.json b/inc/acf/primer.json
deleted file mode 100644
index 30cbf12..0000000
--- a/inc/acf/primer.json
+++ /dev/null
@@ -1,212 +0,0 @@
-[
- {
- "key": "group_5c976c1f62554",
- "title": "Gridd Plus",
- "fields": [
- {
- "key": "field_5c976c83f3aca",
- "label": "Hide Title",
- "name": "gridd_plus_hide_title",
- "type": "true_false",
- "instructions": "",
- "required": 0,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "message": "Enable this option to hide the page title",
- "default_value": 0,
- "ui": 0,
- "ui_on_text": "",
- "ui_off_text": ""
- },
- {
- "key": "field_5c976e36561dd",
- "label": "Custom Grid Column Dimensions",
- "name": "gridd_plus_custom_grid_column_dimensions",
- "type": "text",
- "instructions": "Enter comma-separated dimensions for the grid columns. If no values are entered in this field, values will be auto-calculated.",
- "required": 0,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "default_value": "",
- "placeholder": "",
- "prepend": "",
- "append": "",
- "maxlength": ""
- },
- {
- "key": "field_5c976e88561de",
- "label": "Custom Grid Row Dimensions",
- "name": "gridd_plus_custom_grid_row_dimensions",
- "type": "text",
- "instructions": "Enter comma-separated dimensions for the grid rows. If no values are entered in this field, values will be auto-calculated.",
- "required": 0,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "default_value": "",
- "placeholder": "",
- "prepend": "",
- "append": "",
- "maxlength": ""
- },
- {
- "key": "field_5c976ebf3c525",
- "label": "Custom Grid",
- "name": "gridd_plus_custom_grid",
- "type": "repeater",
- "instructions": "Add the grid-parts this page should have, and select where these parts should be placed in your grid.",
- "required": 0,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "collapsed": "field_5c976ef83c526",
- "min": 0,
- "max": 0,
- "layout": "table",
- "button_label": "",
- "sub_fields": [
- {
- "key": "field_5c976ef83c526",
- "label": "Grid Part",
- "name": "grid_part",
- "type": "select",
- "instructions": "",
- "required": 1,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "choices": {
- "foo": "Foo",
- "bar": "Bar"
- },
- "default_value": [],
- "allow_null": 0,
- "multiple": 0,
- "ui": 0,
- "return_format": "value",
- "ajax": 0,
- "placeholder": ""
- },
- {
- "key": "field_5c976f3f3c527",
- "label": "Start Column",
- "name": "start_column",
- "type": "number",
- "instructions": "",
- "required": 1,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "default_value": "",
- "placeholder": "",
- "prepend": "",
- "append": "",
- "min": 1,
- "max": "",
- "step": 1
- },
- {
- "key": "field_5c976f5b3c528",
- "label": "Column Span",
- "name": "column_span",
- "type": "number",
- "instructions": "",
- "required": 1,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "default_value": "",
- "placeholder": "",
- "prepend": "",
- "append": "",
- "min": 1,
- "max": "",
- "step": 1
- },
- {
- "key": "field_5c976f803c529",
- "label": "Start Row",
- "name": "start_row",
- "type": "number",
- "instructions": "",
- "required": 1,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "default_value": "",
- "placeholder": "",
- "prepend": "",
- "append": "",
- "min": 1,
- "max": "",
- "step": 1
- },
- {
- "key": "field_5c976fa53c52a",
- "label": "Row Span",
- "name": "row_span",
- "type": "number",
- "instructions": "",
- "required": 1,
- "conditional_logic": 0,
- "wrapper": {
- "width": "",
- "class": "",
- "id": ""
- },
- "default_value": "",
- "placeholder": "",
- "prepend": "",
- "append": "",
- "min": 1,
- "max": "",
- "step": 1
- }
- ]
- }
- ],
- "location": [
- [
- {
- "param": "post_type",
- "operator": "==",
- "value": "page"
- }
- ]
- ],
- "menu_order": 0,
- "position": "normal",
- "style": "default",
- "label_placement": "top",
- "instruction_placement": "label",
- "hide_on_screen": "",
- "active": 1,
- "description": ""
- }
-]
\ No newline at end of file
diff --git a/inc/bootstrap.php b/inc/bootstrap.php
index df9d29c..01d9e06 100644
--- a/inc/bootstrap.php
+++ b/inc/bootstrap.php
@@ -8,6 +8,11 @@
namespace Gridd_Plus;
+// Make sure we have everything we need.
+if ( ! class_exists( '\Kirki\Field\ReactColor' ) ) {
+ return;
+}
+
/**
* The Gridd-Plus Autoloader.
*
@@ -54,7 +59,8 @@ function( $class ) {
new Grid_Part\Nested_Grid();
new Grid_Part\Layer_Slider();
new Grid_Part\Slider_Revolution();
-new Grid_Part\Offcanvas_Sidebar();
+new \Gridd_Plus\Offcanvas_Sidebar();
+new \Gridd_Plus\Breadcrumbs();
/**
* Add the customizer modifications.
@@ -75,13 +81,6 @@ function( $class ) {
*/
new Scroll_To_Top();
-/**
- * Add Grid mods.
- *
- * @since 1.0
- */
-new Grid();
-
/**
* Add styles.
*
@@ -110,10 +109,11 @@ function( $class ) {
*/
new Post();
+require_once GRIDD_PLUS_PATH . '/vendor/autoload.php';
+
/**
* Include the updater.
*
* @since 1.0
*/
require_once GRIDD_PLUS_PATH . '/inc/updater/updater.php';
-
diff --git a/inc/classes/ACF.php b/inc/classes/ACF.php
index dbaab04..de78ec2 100644
--- a/inc/classes/ACF.php
+++ b/inc/classes/ACF.php
@@ -25,7 +25,6 @@ public function __construct() {
if ( ! class_exists( 'acf_pro' ) ) {
$this->include_acf();
}
- add_action( 'after_setup_theme', [ $this, 'include_acf_fields' ] );
}
/**
@@ -41,7 +40,7 @@ public function include_acf() {
add_filter(
'acf/settings/path',
function() {
- return GRIDD_PLUS_PATH . '/inc/acf/plugin/';
+ return GRIDD_PLUS_PATH . '/inc/acf/';
}
);
@@ -49,22 +48,11 @@ function() {
add_filter(
'acf/settings/dir',
function() {
- return GRIDD_PLUS_URL . '/inc/acf/plugin/';
+ return GRIDD_PLUS_URL . '/inc/acf/';
}
);
// Include the plugin file.
- include_once GRIDD_PLUS_PATH . '/inc/acf/plugin/acf.php';
- }
-
- /**
- * Includes the ACD fields in after_setup_theme.
- *
- * @access public
- * @since 1.0.2
- * @return void
- */
- public function include_acf_fields() {
- require_once GRIDD_PLUS_PATH . '/inc/acf/fields.php';
+ include_once GRIDD_PLUS_PATH . '/inc/acf/acf.php';
}
}
diff --git a/inc/classes/Breadcrumbs.php b/inc/classes/Breadcrumbs.php
new file mode 100644
index 0000000..7074d0f
--- /dev/null
+++ b/inc/classes/Breadcrumbs.php
@@ -0,0 +1,63 @@
+customizer();
+ }
+
+ /**
+ * Add customizer options.
+ *
+ * @access protected
+ * @since 2.0.0
+ * @return void
+ */
+ protected function customizer() {
+
+ new \Kirki\Field\Slider(
+ [
+ 'settings' => 'breadcrumbs_font_size',
+ 'label' => esc_html__( 'Breadcrumbs Font Size', 'gridd-plus' ),
+ 'description' => esc_html__( 'Controls the font-size for your breadcrumbs, relative to the body font-size.', 'gridd-plus' ),
+ 'section' => 'breadcrumbs',
+ 'default' => 1,
+ 'transport' => 'postMessage',
+ 'priority' => 100,
+ 'output' => [
+ [
+ 'element' => '.gridd-tp-breadcrumbs',
+ 'property' => 'font-size',
+ 'value_pattern' => '$em',
+ ],
+ ],
+ 'choices' => [
+ 'min' => .5,
+ 'max' => 2,
+ 'step' => .01,
+ 'suffix' => 'em',
+ ],
+ 'active_callback' => function() {
+ return \Gridd\Customizer::is_section_active_part( 'breadcrumbs' ) && get_theme_mod( 'breadcrumbs_custom_options', false );
+ },
+ ]
+ );
+ }
+}
diff --git a/inc/classes/Customizer.php b/inc/classes/Customizer.php
index 9e6d28e..4476fa8 100644
--- a/inc/classes/Customizer.php
+++ b/inc/classes/Customizer.php
@@ -22,11 +22,7 @@ class Customizer {
public function __construct() {
add_action( 'after_setup_theme', [ $this, 'include_files' ] );
- // Add filters for the kirki premium controls we're using.
- add_filter( 'kirki_wcag_text_color_url', [ $this, 'wcag_text_color_url' ] );
- add_filter( 'kirki_wcag_link_color_url', [ $this, 'wcag_link_color_url' ] );
-
- add_filter( 'gridd_field_args', [ $this, 'field_args' ] );
+ add_action( 'customize_register', [ $this, 'customize_register' ], 999999999 );
add_action( 'customize_controls_print_styles', [ $this, 'customize_controls_print_styles' ] );
}
@@ -39,15 +35,7 @@ public function __construct() {
* @return void
*/
public function include_files() {
- require_once GRIDD_PLUS_PATH . '/inc/customizer/controls/kirki-wcag-tc/kirki-wcag-tc.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/controls/kirki-wcag-lc/kirki-wcag-lc.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/breadcrumbs.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/features.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/footer.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/grid.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/header.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/layer-slider.php';
- require_once GRIDD_PLUS_PATH . '/inc/customizer/nav-handheld.php';
+ require_once GRIDD_PLUS_PATH . '/inc/customizer/customizer.php';
require_once GRIDD_PLUS_PATH . '/inc/customizer/navigation.php';
require_once GRIDD_PLUS_PATH . '/inc/customizer/nested-grid.php';
require_once GRIDD_PLUS_PATH . '/inc/customizer/offcanvas-sidebar.php';
@@ -56,81 +44,19 @@ public function include_files() {
require_once GRIDD_PLUS_PATH . '/inc/customizer/typography.php';
}
- /**
- * Change the URL for the kirki-wcag-tc control.
- *
- * @access public
- * @since 1.0
- * @return string
- */
- public function wcag_text_color_url() {
- return GRIDD_PLUS_URL . '/inc/customizer/controls/kirki-wcag-tc';
- }
-
- /**
- * Change the URL for the kirki-wcag-lc control.
- *
- * @access public
- * @since 1.0
- * @return string
- */
- public function wcag_link_color_url() {
- return GRIDD_PLUS_URL . '/inc/customizer/controls/kirki-wcag-lc';
- }
-
/**
* Modify field arguments.
*
* @access public
* @since 1.0
- * @param array $args The field arguments.
- * @return array
+ * @param WP_Customize_Manager $wp_customize The customizer object.
+ * @return void
*/
- public function field_args( $args ) {
- switch ( $args['settings'] ) {
- case 'gridd_header_grid':
- $args['choices']['duplicate'] = 'gridd_grid_header_mobile';
- break;
-
- case 'gridd_footer_grid':
- $args['choices']['duplicate'] = 'gridd_grid_footer_mobile';
- break;
-
- case 'gridd_grid_nav-handheld_parts':
- $args['choices']['widget-area'] = esc_html__( 'Widget Area', 'gridd-plus' );
- // If WooCommerce is installed, add another item for the Cart.
- if ( class_exists( 'WooCommerce' ) ) {
- $args['choices']['woo-cart'] = esc_html__( 'Cart', 'gridd-plus' );
- }
- break;
+ public function customize_register( $wp_customize ) {
- case 'gridd_type_scale':
- $args['type'] = 'slider';
- $args['label'] = '';
- $args['description'] = '';
- $args['choices'] = [
- 'min' => 1,
- 'max' => 2.5,
- 'step' => 0.0001,
- ];
- break;
-
- case 'gridd_featured_image_mode_singular':
- $args['choices']['fixed'] = esc_html__( 'Fixed', 'gridd-plus' );
- break;
+ if ( class_exists( 'WooCommerce' ) ) {
+ $wp_customize->get_control( 'nav-handheld_parts' )->choices['woo-cart'] = esc_html__( 'Cart', 'gridd-plus' );
}
-
- switch ( $args['type'] ) {
- case 'gridd-wcag-lc':
- $args['type'] = 'kirki-wcag-lc';
- break;
-
- case 'gridd-wcag-tc':
- $args['type'] = 'kirki-wcag-tc';
- break;
- }
-
- return $args;
}
/**
@@ -141,6 +67,6 @@ public function field_args( $args ) {
* @return void
*/
public function customize_controls_print_styles() {
- wp_enqueue_style( 'gridd-plus-customizer', GRIDD_PLUS_URL . '/assets/css/customizer.css', array(), GRIDD_PLUS_VERSION );
+ wp_enqueue_style( 'gridd-plus-customizer', GRIDD_PLUS_URL . '/assets/css/customizer.css', [], GRIDD_PLUS_VERSION );
}
}
diff --git a/inc/classes/Grid.php b/inc/classes/Grid.php
deleted file mode 100644
index 17aa1db..0000000
--- a/inc/classes/Grid.php
+++ /dev/null
@@ -1,256 +0,0 @@
-get_parts();
-
- foreach ( $all_parts as $part ) {
-
- // Check if we've got a custom grid for mobile.
- if ( get_theme_mod( 'gridd_custom_mobile_grid', false ) ) {
-
- // Add mobile grid parts.
- if ( Grid_Parts::is_grid_part_active( $part['id'], 'gridd_grid_mobile' ) && ! in_array( $part['id'], $grid_parts, true ) ) {
- $grid_parts[] = $part['id'];
- }
- }
- }
- return $grid_parts;
- }
-
- /**
- * Add grid options for small viewports.
- *
- * @access public
- * @since 1.0
- * @param array $args The existing arguments.
- * @return array Modified arguments.
- */
- public function styles_responsive_args( $args ) {
- switch ( $args['context'] ) {
- case 'main':
- if ( get_theme_mod( 'gridd_custom_mobile_grid', false ) ) {
- $args['small'] = \Gridd\Grid::get_options( 'gridd_grid_mobile' );
- }
- break;
-
- case 'header':
- if ( get_theme_mod( 'gridd_grid_header_mobile_override', true ) ) {
- $args['small'] = \Gridd\Grid::get_options( 'gridd_grid_header_mobile' );
- }
- break;
-
- case 'footer':
- $args['small'] = \Gridd\Grid::get_options( 'gridd_grid_footer_mobile' );
- break;
-
- }
- return $args;
- }
-
- /**
- * Modify default values for controls.
- * We're using this in the theme for grid values.
- *
- * @access public
- * @since 1.0
- * @param mixed $defaults The default value.
- * @param string $theme_mod The theme-mod we're getting.
- * @return mixed
- */
- public function options_defaults( $defaults, $theme_mod ) {
- switch ( $theme_mod ) {
- case 'gridd_grid_mobile':
- return [
- 'rows' => 5,
- 'columns' => 1,
- 'areas' => [
- 'header' => [
- 'cells' => [ [ 1, 1 ] ],
- ],
- 'breadcrumbs' => [
- 'cells' => [ [ 2, 1 ] ],
- ],
- 'content' => [
- 'cells' => [ [ 3, 1 ] ],
- ],
- 'sidebar_1' => [
- 'cells' => [ [ 4, 1 ] ],
- ],
- 'footer' => [
- 'cells' => [ [ 5, 1 ] ],
- ],
- ],
- 'gridTemplate' => [
- 'rows' => [ 'auto', 'auto', 'auto', 'auto', 'auto' ],
- 'columns' => [ 'auto' ],
- ],
- ];
-
- case 'gridd_grid_header_mobile':
- return get_theme_mod(
- 'gridd_header_grid',
- [
- 'rows' => 1,
- 'columns' => 1,
- 'areas' => [
- 'header_branding' => [
- 'cells' => [ [ 1, 1 ] ],
- ],
- ],
- 'gridTemplate' => [
- 'rows' => [ 'auto' ],
- 'columns' => [ 'auto' ],
- ],
- ]
- );
-
- case 'gridd_grid_footer_mobile':
- return get_theme_mod(
- 'gridd_footer_grid',
- [
- 'rows' => 2,
- 'columns' => 2,
- 'areas' => [
- 'footer_sidebar_1' => [
- 'cells' => [ [ 1, 1 ] ],
- ],
- 'footer_sidebar_2' => [
- 'cells' => [ [ 1, 2 ] ],
- ],
- 'footer_copyright' => [
- 'cells' => [ [ 2, 1 ], [ 2, 2 ] ],
- ],
- ],
- 'gridTemplate' => [
- 'rows' => [ 'auto', 'auto' ],
- 'columns' => [ '1fr', '1fr', '1fr', '1fr' ],
- ],
- ]
- );
-
- default:
- return $defaults;
- }
- }
-
- /**
- * Applies custom Grids from post-meta.
- *
- * @access public
- * @since 1.0
- * @param mixed $value The theme-mod value.
- * @param string $theme_mod The theme-mod.
- * @return array Modified grid - or the original value if we don't want custom grid.
- */
- public function grid_from_post_meta( $value, $theme_mod ) {
- if ( 'gridd_grid' === $theme_mod ) {
- $custom_grid = get_field( 'gridd_plus_custom_grid' );
- $custom_grid_row_dimensions = get_field( 'gridd_plus_custom_grid_row_dimensions' );
- $custom_grid_col_dimensions = get_field( 'gridd_plus_custom_grid_column_dimensions' );
- $max_col = 1;
- $max_row = 1;
- if ( $custom_grid ) {
- $areas = [];
- foreach ( $custom_grid as $part ) {
- $areas[ $part['grid_part'] ] = [
- 'cells' => [],
- ];
-
- // Get properties.
- $start_col = (int) $part['start_column'];
- $span_col = (int) $part['column_span'];
- $start_row = (int) $part['start_row'];
- $span_row = (int) $part['row_span'];
-
- for ( $col = $start_col; $col < $start_col + $span_col; $col++ ) {
- if ( $col > $max_col ) {
- $max_col = $col;
- }
- for ( $row = $start_row; $row < $start_row + $span_row; $row++ ) {
- if ( $row > $max_row ) {
- $max_row = $row;
- }
- $areas[ $part['grid_part'] ]['cells'][] = [ $row, $col ];
- }
- }
- }
- $value['rows'] = $max_row;
- $value['columns'] = $max_col;
- $value['areas'] = $areas;
- }
-
- // Add custom column dimensions.
- $max_cols = max( $max_col, $value['columns'], count( $value['gridTemplate']['columns'] ) );
- if ( $custom_grid_col_dimensions ) {
- $custom_grid_col_dimensions = explode( ',', $custom_grid_col_dimensions );
- foreach ( $custom_grid_col_dimensions as $key => $dimension ) {
- $value['gridTemplate']['columns'][ $key ] = esc_attr( trim( $dimension ) );
- }
- }
-
- // Fill-in the blanks with "auto" values.
- if ( $value['columns'] < $max_cols ) {
- for ( $i = 0; $i < $max_cols - $value['columns']; $i++ ) {
- $value['gridTemplate']['columns'][] = 'auto';
- }
- }
-
- // Add custom row dimensions.
- $max_rows = max( $max_row, $value['rows'], count( $value['gridTemplate']['rows'] ) );
- if ( $custom_grid_row_dimensions ) {
- $custom_grid_row_dimensions = explode( ',', $custom_grid_row_dimensions );
- foreach ( $custom_grid_row_dimensions as $key => $dimension ) {
- $value['gridTemplate']['rows'][ $key ] = esc_attr( trim( $dimension ) );
- }
- }
-
- // Fill-in the blanks with "auto" values.
- if ( $value['rows'] < $max_rows ) {
- for ( $i = 0; $i < $max_rows - $value['rows']; $i++ ) {
- $value['gridTemplate']['rows'][] = 'auto';
- }
- }
- }
- return $value;
- }
-}
diff --git a/inc/classes/Grid_Part/Layer_Slider.php b/inc/classes/Grid_Part/Layer_Slider.php
index e7c4cbd..8298340 100644
--- a/inc/classes/Grid_Part/Layer_Slider.php
+++ b/inc/classes/Grid_Part/Layer_Slider.php
@@ -7,7 +7,6 @@
namespace Gridd_Plus\Grid_Part;
-use Gridd\Grid;
use Gridd\Grid_Part;
use Gridd\Theme;
diff --git a/inc/classes/Grid_Part/Nested_Grid.php b/inc/classes/Grid_Part/Nested_Grid.php
index 79e134c..9034b4a 100644
--- a/inc/classes/Grid_Part/Nested_Grid.php
+++ b/inc/classes/Grid_Part/Nested_Grid.php
@@ -7,9 +7,7 @@
namespace Gridd_Plus\Grid_Part;
-use Gridd\Grid;
use Gridd\Grid_Part;
-use Gridd\Style;
/**
* The Gridd\Grid_Part\Nested_Grid object.
@@ -81,11 +79,65 @@ public function add_template_part( $parts ) {
public function render( $part ) {
if ( 0 === strpos( $part, 'nested-grid-' ) && is_numeric( str_replace( 'nested-grid-', '', $part ) ) ) {
$id = (int) str_replace( 'nested-grid-', '', $part );
- /**
- * We use include( get_theme_file_path() ) here
- * because we need to pass the $sidebar_id var to the template.
- */
- include GRIDD_PLUS_PATH . '/inc/templates/nested-grid.php';
+
+ $settings = \Gridd\Grid::get_options( "gridd_nested_grid_$id" );
+ $classes = [
+ 'gridd-tp',
+ "gridd-tp-nested-grid-$id",
+ ];
+ if ( get_theme_mod( "gridd_nested_grid_{$id}_sticky", false ) ) {
+ $classes[] = 'gridd-sticky';
+ }
+
+ $style = \Gridd\Style::get_instance( "grid-part/nested-grid-$id" );
+ $style->add_string(
+ \Gridd\Grid::get_styles_responsive(
+ [
+ 'context' => "nested-grid-$id",
+ 'large' => $settings,
+ 'small' => false,
+ 'breakpoint' => get_theme_mod( 'gridd_mobile_breakpoint', '800px' ),
+ 'selector' => '.gridd-tp-nested-grid-1 > .inner',
+ 'prefix' => true,
+ ]
+ )
+ );
+ $style->add_file( GRIDD_PLUS_PATH . '/assets/css/nested-grid-default.min.css' );
+
+ // Add styles for large screens.
+ $style->add_string( '@media only screen and (min-width:' . get_theme_mod( 'gridd_mobile_breakpoint', '800px' ) . '){' );
+ $style->add_file( GRIDD_PLUS_PATH . '/assets/css/nested-grid-large.min.css' );
+ $style->add_string( '}' );
+
+ // Generate grid styles for parts.
+ $style->add_string( \Gridd\Grid::get_styles( $settings, "gridd-tp-nested-grid-$id > .inner", true ) );
+ $style->replace( 'ID', $id );
+ $style->add_vars(
+ [
+ "gridd-nested-grid-$id-background" => get_theme_mod( "gridd_nested_grid_{$id}_background_color", '#ffffff' ),
+ "gridd-nested-grid-$id-padding" => get_theme_mod( "gridd_nested_grid_{$id}_padding", 0 ),
+ "gridd-nested-grid-$id-box-shadow" => get_theme_mod( "gridd_nested_grid_{$id}_box_shadow", 'none' ),
+ "gridd-nested-grid-$id-max-width" => get_theme_mod( "gridd_nested_grid_{$id}_max_width", '' ),
+ "gridd-nested-grid-$id-grid-gap" => get_theme_mod( "gridd_nested_grid_{$id}_gap", 0 ),
+ ]
+ );
+ ?>
+
+ the_css( 'gridd-inline-css-nested-grid-' . $id );
+ ?>
+
+
+
+
+
+
+
+
' + value + '' );
- }
-
- this.container.find( '.indicator .current-rating' ).html( rating );
- },
-
- /**
- * Destroy listeners for radios and add them anew.
- *
- * @since 1.0
- * @returns void
- */
- radioInputListeners: function() {
- var control = this;
-
- this.container.find( 'input[type="radio"]' ).off().on( 'click change keyup', function() {
- var value = jQuery( this ).val();
- control.setting.set( value );
- control.container.find( '.hidden-value-hex' ).attr( 'value', value ).trigger( 'change' );
- control.isAuto = true;
- control.updateSelectedColorIndicators();
- });
- },
-
- /**
- * Embed the control.
- *
- * Overrides the embed() method to do nothing,
- * so that the control isn't embedded on load,
- * unless the containing section is already expanded.
- *
- * @since 1.1.0
- * @returns {void}
- */
- embed: function() {
- var control = this,
- sectionId = control.section();
-
- if ( ! sectionId ) {
- return;
- }
- wp.customize.section( sectionId, function( section ) {
- section.expanded.bind( function( expanded ) {
- if ( expanded ) {
- control.actuallyEmbed();
- }
- } );
- } );
- },
-
- /**
- * Deferred embedding of control.
- *
- * This function is called in Section.onChangeExpanded() so the control
- * will only get embedded when the Section is first expanded.
- *
- * @since 1.1.0
- * @return {void}
- */
- actuallyEmbed: function() {
- if ( 'resolved' === this.deferred.embedded.state() ) {
- return;
- }
- this.renderContent();
- this.deferred.embedded.resolve();
- }
-});
diff --git a/inc/customizer/controls/kirki-wcag-lc/styles.css b/inc/customizer/controls/kirki-wcag-lc/styles.css
deleted file mode 100644
index 5d6070b..0000000
--- a/inc/customizer/controls/kirki-wcag-lc/styles.css
+++ /dev/null
@@ -1,81 +0,0 @@
-.customize-control-kirki-wcag-lc .rating-container {
- clear: both;
- display: block; }
-.customize-control-kirki-wcag-lc .colors-container {
- overflow-y: scroll;
- padding: 12px;
- margin-left: -12px;
- margin-right: -12px; }
-.customize-control-kirki-wcag-lc .kirki-input-container {
- background: #fff; }
-.customize-control-kirki-wcag-lc .color-hue-container,
-.customize-control-kirki-wcag-lc .color-hex-container {
- padding: 12px; }
-.customize-control-kirki-wcag-lc .expand-selectors {
- padding: 12px;
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-pack: justify;
- -ms-flex-pack: justify;
- justify-content: space-between; }
-.customize-control-kirki-wcag-lc .iris-picker.iris-only-strip {
- width: 100% !important; }
-.customize-control-kirki-wcag-lc .rating-containers-wrapper.hidden {
- display: none; }
-.customize-control-kirki-wcag-lc .rating-container {
- padding: 12px; }
- .customize-control-kirki-wcag-lc .rating-container label {
- padding: 0;
- float: left;
- margin: 0;
- line-height: 0;
- position: relative; }
- .customize-control-kirki-wcag-lc .rating-container label .a11y-text-selector-label {
- border: 1px solid rgba(255, 255, 255, .1);
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- width: 100%;
- height: 100%;
- display: block; }
- .customize-control-kirki-wcag-lc .rating-container input[type="radio"] {
- display: none; }
- .customize-control-kirki-wcag-lc .rating-container input[type="radio"]:checked {
- display: block; }
- .customize-control-kirki-wcag-lc .rating-container input[type="radio"]:checked + .a11y-text-selector-label {
- overflow: visible;
- width: 150%;
- height: 150%;
- position: absolute;
- z-index: 2;
- left: -25%;
- top: -25%;
- -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, .16), 0 3px 6px rgba(0, 0, 0, .23);
- box-shadow: 0 3px 6px rgba(0, 0, 0, .16), 0 3px 6px rgba(0, 0, 0, .23);
- outline: 1px solid #fff; }
- .customize-control-kirki-wcag-lc .rating-container-AAA label {
- width: 10%;
- height: 30px; }
- .customize-control-kirki-wcag-lc .rating-container-AA .colors-container {
- max-height: 120px; }
- .customize-control-kirki-wcag-lc .rating-container-AA label {
- width: 7%;
- height: 20px; }
- .customize-control-kirki-wcag-lc .rating-container-A .colors-container {
- max-height: 90px; }
- .customize-control-kirki-wcag-lc .rating-container-A label {
- width: 5%;
- height: 16px; }
- .customize-control-kirki-wcag-lc .rating-container.hidden {
- display: none; }
-.customize-control-kirki-wcag-lc .tab-headers .button {
- background: #fff;
- border-radius: 0;
- -webkit-box-shadow: none;
- box-shadow: none;
- border: 1px solid #ccc;
- margin-bottom: -1px; }
- .customize-control-kirki-wcag-lc .tab-headers .button.active {
- border-bottom: none; }
-.customize-control-kirki-wcag-lc .tabs {
- border: 1px solid #ccc; }
diff --git a/inc/customizer/controls/kirki-wcag-lc/styles.scss b/inc/customizer/controls/kirki-wcag-lc/styles.scss
deleted file mode 100644
index c32316e..0000000
--- a/inc/customizer/controls/kirki-wcag-lc/styles.scss
+++ /dev/null
@@ -1,129 +0,0 @@
-.customize-control-kirki-wcag-lc {
- .rating-container {
- clear: both;
- display: block;
- }
-
- .colors-container {
- overflow-y: scroll;
- padding: 12px;
- margin-left: -12px;
- margin-right: -12px;
- }
-
- .kirki-input-container {
- background: #fff;
- }
-
- .color-hue-container,
- .color-hex-container {
- padding: 12px;
- }
-
- .expand-selectors {
- padding: 12px;
- display: flex;
- justify-content: space-between;
- }
-
- .iris-picker.iris-only-strip {
- width: 100% !important;
- }
-
- .rating-containers-wrapper {
- &.hidden {
- display: none;
- }
- }
-
- .rating-container {
- padding: 12px;
-
- label {
- padding: 0;
- float: left;
- margin: 0;
- line-height: 0;
- position: relative;
-
- .a11y-text-selector-label {
- border: 1px solid rgba(255, 255, 255, .1);
- box-sizing: border-box;
- width: 100%;
- height: 100%;
- display: block;
- }
- }
-
- input[type="radio"] {
- display: none;
-
- &:checked {
- display: block;
-
- +.a11y-text-selector-label {
- overflow: visible;
- width: 150%;
- height: 150%;
- position: absolute;
- z-index: 2;
- left: -25%;
- top: -25%;
- box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
- outline: 1px solid #fff;
- }
- }
- }
-
- &-AAA {
- label {
- width: 10%;
- height: 30px;
- }
- }
-
- &-AA {
- .colors-container {
- max-height: 120px;
- }
-
- label {
- width: 7%;
- height: 20px;
- }
- }
-
- &-A {
- .colors-container {
- max-height: 90px;
- }
-
- label {
- width: 5%;
- height: 16px;
- }
- }
-
- &.hidden {
- display: none;
- }
- }
-
- .tab-headers {
- .button {
- background: #fff;
- border-radius: 0;
- box-shadow: none;
- border: 1px solid #ccc;
- margin-bottom: -1px;
-
- &.active {
- border-bottom: none;
- }
- }
- }
-
- .tabs {
- border: 1px solid #ccc;
- }
-}
diff --git a/inc/customizer/controls/kirki-wcag-lc/wcagColors.js b/inc/customizer/controls/kirki-wcag-lc/wcagColors.js
deleted file mode 100644
index 9f0e33b..0000000
--- a/inc/customizer/controls/kirki-wcag-lc/wcagColors.js
+++ /dev/null
@@ -1,466 +0,0 @@
-/**
- * This script can get a list of colors that match some given criteria.
- * It was created to handle getting readable colors.
- *
- * For more information read the docs on https://aristath.github.io/wcagColors/
- *
- * @author Ari Stathopoulos
- * @author wplemon
- */
-/* jshint -W104 */
-var wcagColors = wcagColors || {};
-wcagColors = {
- colors: [],
-
- /**
- * Get all relative colors.
- *
- * @param {Object} params - The parameters for the colors.
- * @param {string} params.color - A color formatted as RGB, HSL or HEX.
- * @param {int} params.hue - If a color is not provided, we can alternatively provide a hue.
- * @param {float} params.minSaturation - The minimum saturation the returned colors can have (0-1).
- * @param {float} params.maxSaturation - The maximum saturation the returned colors can have (0-1).
- * @param {float} params.stepSaturation - The increments in saturation while searching for colors (0-1).
- * @param {float} params.stepLightness - Each lightness step. Smaller numbers are more detailed but slower.
- * @param {int} params.minHueDiff - The minimum hue difference (0-359).
- * @param {int} params.maxHueDiff - The maximum hue difference (0-359).
- * @param {int} params.stepHue - How many degrees to turn the colorwheel on each iteration.
- * @returns {Object} - this
- */
- getAll: function( params ) {
- var allColors = [],
- hueOffset,
- hueUp,
- hueDown,
- newColors,
- i;
-
- // If we got a string color and not a hue make sure we get the hue.
- if ( ! params.hue && params.color ) {
- params.hue = this.getColorProperties( params.color ).h;
- }
-
- params.minSaturation = params.minSaturation || 0;
- params.maxSaturation = params.maxSaturation || 1;
- params.stepSaturation = params.stepSaturation || 0.1;
- params.stepLightness = params.stepLightness || 0.1;
- params.minHueDiff = params.minHueDiff || 0;
- params.maxHueDiff = params.maxHueDiff || 360;
- params.stepHue = params.stepHue || 15;
- params.minLightness = params.minLightness || 0;
- params.maxLightness = params.maxLightness || 1.001;
-
- if ( 0 === params.maxHueDiff ) {
- return this.getAllColorsForHue( params.hue, params );
- }
-
- for ( hueOffset = params.minHueDiff; hueOffset <= params.maxHueDiff; hueOffset += params.stepHue ) {
-
- // Calculate Hue Up.
- hueUp = ( 359 < params.hue + hueOffset ) ? params.hue + hueOffset - 359 : params.hue + hueOffset;
-
- // Calculate Hue Down.
- hueDown = ( 0 > params.hue + hueOffset ) ? params.hue + hueOffset + 360 : params.hue + hueOffset;
-
- // Add colors from the UP hue.
- newColors = this.getAllColorsForHue( hueUp, params );
- for ( i = 0; i < newColors.length; i++ ) {
- if ( -1 === allColors.indexOf( newColors[ i ] ) ) {
- allColors.push( newColors[ i ] );
- }
- }
-
- // Add colors from the DOWN hue.
- newColors = this.getAllColorsForHue( hueDown, params );
- for ( i = 0; i < newColors.length; i++ ) {
- if ( -1 === allColors.indexOf( newColors[ i ] ) ) {
- allColors.push( newColors[ i ] );
- }
- }
- }
-
- return Object.assign({}, this, {
- colors: this.removeDuplicateColors( allColors )
- });
- },
-
- /**
- * Get an array of colors that fulfil the provided criteria.
- *
- * @param {Object} criteria- The provided criteria.
- * @param {string|Object} criteria.color - The color we want to check against.
- * @param {int} criteria.minHueDiff - Minimum hue difference required.
- * @param {int} criteria.maxHueDiff - Maximum hue difference required.
- * @param {int} criteria.minContrast - The minimum contrast required to pass.
- * @returns {Object} - this
- */
- pluck: function( criteria ) {
- var validColors = [],
- pass,
- i;
-
- if ( 'string' === typeof criteria.color ) {
- criteria.color = this.getColorProperties( criteria.color );
- } else if ( criteria.color.r && criteria.color.g && criteria.color.b ) {
- criteria.color = this.getColorProperties( 'rgb(' + criteria.color.r + ',' + criteria.color.g + ',' + criteria.color.b + ')' );
- } else if ( criteria.color.h && criteria.color.s && criteria.color.l ) {
- criteria.color = this.getColorProperties( 'hsl(' + criteria.color.h + ',' + criteria.color.s + ',' + criteria.color.l + ')' );
- }
-
- for ( i = 0; i < this.colors.length; i++ ) {
- pass = true;
-
- // Minimum hue-diff check.
- if ( 'undefined' !== typeof criteria.minHueDiff && criteria.minHueDiff > Math.abs( this.colors[ i ].hue - criteria.color.hue ) ) {
- pass = false;
- }
-
- // Maximum hue-diff check.
- if ( 'undefined' !== typeof criteria.maxHueDiff && criteria.maxHueDiff < Math.abs( this.colors[ i ].hue - criteria.color.hue ) ) {
- pass = false;
- }
-
- // Minimum contrast check.
- if ( 'undefined' !== typeof criteria.minContrast ) {
- this.colors[ i ].contrast = this.getContrast( criteria.color.lum, this.colors[ i ].lum );
- if ( criteria.minContrast > this.colors[ i ].contrast ) {
- pass = false;
- }
- }
-
- // If we passed the tests add to array.
- if ( pass ) {
- validColors.push( this.colors[ i ] );
- }
- }
-
- return Object.assign({}, this, {
- colors: validColors
- });
- },
-
- /**
- * Query a string color and get its properties.
- *
- * @param {string} color - The color we want to query. Can be formatted as hex, rgb, rgba, hsl, hsla.
- * @returns {Object} - {r,g,b,h,s,l,hex,lum}.
- */
- getColorProperties: function( color ) {
- var hex, rgb, hsl, col;
-
- if ( -1 !== color.indexOf( 'hsl' ) ) {
- col = color.replace( 'hsla', '' ).replace( '.hsl', '' ).replace( '(', '' ).replace( ')', '' ).split( ',' );
- hsl = {
- h: parseInt( col[0], 10 ),
- s: parseInt( col[1], 10 ) / 100,
- l: parseInt( col[2], 10 ) / 100
- };
- rgb = this.hslToRgb( hsl.h, hsl.s, hsl.l );
- hex = this.rgbToHex( rgb.r, rgb.g, rgb.b );
- } else if ( -1 !== color.indexOf( 'rgb' ) ) {
- col = color.replace( 'rgba', '' ).replace( '.rgb', '' ).replace( '(', '' ).replace( ')', '' ).split( ',' );
- rgb = {
- r: col[0],
- g: col[1],
- b: col[2]
- };
- hsl = this.rgbToHsl( rgb.r, rgb.g, rgb.b );
- hex = this.rgbToHex( rgb.r, rgb.g, rgb.b );
- } else {
- hex = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test( color ) ? color : '#ffffff';
- rgb = this.hexToRgb( hex );
- hsl = this.rgbToHsl( rgb.r, rgb.g, rgb.b );
- }
- return {
- r: rgb.r,
- g: rgb.g,
- b: rgb.b,
- h: hsl.h,
- s: hsl.s,
- l: hsl.l,
- hex: hex,
- lum: this.getRelativeLuminance( rgb )
- };
- },
-
- /**
- * Get all colors for a given hue.
- *
- * @param {int} hue - The hue of the color.
- * @param {Object} args - Additional arguments.
- * @param {float} args.minSaturation - The minimum saturation the returned colors can have (0-1).
- * @param {float} args.maxSaturation - The maximum saturation the returned colors can have (0-1).
- * @param {float} args.stepSaturation - The increments in saturation while searching for colors (0-1).
- * @param {float} args.stepLightness - Each lightness step.
- * smaller numbers are more detailed,
- * larger numbers have bigger "steps" between colors.
- * @returns {Array}
- */
- getAllColorsForHue: function( hue, args ) {
- var colors = [],
- saturation,
- lightness,
- color;
-
- for ( saturation = args.minSaturation; args.maxSaturation >= saturation; saturation += args.stepSaturation ) {
- for ( lightness = args.minLightness; args.maxLightness >= lightness; lightness += args.stepLightness ) {
- if ( 0 <= hue && 359 >= hue ) {
- color = this.hslToRgb( hue, saturation, lightness );
- colors.push({
- r: color.r,
- g: color.g,
- b: color.b,
- h: hue,
- s: saturation,
- l: lightness,
- hex: this.rgbToHex( color.r, color.g, color.b ),
- lum: this.getRelativeLuminance( color )
- });
- }
- }
- }
- return colors;
- },
-
- /**
- * Converts an RGB object to a HEX string.\
- *
- * @param {int} r - Red.
- * @param {int} g - Green.
- * @param {int} b - Blue.
- * @returns {string}
- */
- rgbToHex: function( r, g, b ) {
- return '#' + ( ( 1 << 24 ) + ( r << 16 ) + ( g << 8 ) + b ).toString( 16 ).slice( 1 );
- },
-
- /**
- * Convert hex color to RGB.
- * See https://stackoverflow.com/a/5624139
- *
- * @since 1.0
- * @param {string} hex - The hex color.
- * @returns {Object}
- */
- hexToRgb: function( hex ) {
- var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i,
- result;
-
- // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF").
- hex = hex.replace( shorthandRegex, function( m, r, g, b ) {
- return r + r + g + g + b + b;
- });
-
- result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec( hex );
- return result ? {
- r: parseInt( result[1], 16 ),
- g: parseInt( result[2], 16 ),
- b: parseInt( result[3], 16 )
- } : null;
- },
-
- /**
- * Converts an HSL color value to RGB. Conversion formula
- * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
- * Assumes h, s, and l are contained in the set [0, 1] and
- * returns r, g, and b in the set [0, 255].
- *
- * @param {int} h - Hue
- * @param {float} s - Saturation
- * @param {float} l - Lightness
- * @return {Array} - RGB representation
- */
- hslToRgb: function( h, s, l ) {
- var c, h_, x, r1, g1, b1, m;
-
- // Calculate chroma.
- c = ( 1 - Math.abs( ( 2 * l ) - 1 ) ) * s;
-
- // Find a point (r1, g1, b1) along the bottom three faces of the RGB cube,
- // with the same hue and chroma as our color
- // using the intermediate value X for the second largest component of this color.
- h_ = h / 60;
- x = c * ( 1 - Math.abs( ( h_ % 2 ) - 1 ) );
-
- if ( 'undefined' === typeof h || isNaN( h ) || null === h ) {
- r1 = g1 = b1 = 0;
- } else {
- if ( 0 <= h_ && 1 > h_ ) {
- r1 = c;
- g1 = x;
- b1 = 0;
- } else if ( 1 <= h_ && 2 > h_ ) {
- r1 = x;
- g1 = c;
- b1 = 0;
- } else if ( 2 <= h_ && 3 > h_ ) {
- r1 = 0;
- g1 = c;
- b1 = x;
- } else if ( 3 <= h_ && 4 > h_ ) {
- r1 = 0;
- g1 = x;
- b1 = c;
- } else if ( 4 <= h_ && 5 > h_ ) {
- r1 = x;
- g1 = 0;
- b1 = c;
- } else if ( 5 <= h_ && 6 > h_ ) {
- r1 = c;
- g1 = 0;
- b1 = x;
- }
- }
-
- // Find r, g, and b by adding the same amount to each component to match lightness.
- m = l - ( c / 2 );
-
- // Normalise to range [0,255] by multiplying with 255.
- return {
- r: Math.round( ( r1 + m ) * 255 ),
- g: Math.round( ( g1 + m ) * 255 ),
- b: Math.round( ( b1 + m ) * 255 )
- };
- },
-
- /**
- * Converts an RGB color value to HSL. Conversion formula
- * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
- * Assumes r, g, and b are contained in the set [0, 255] and
- * returns h (0-359), s (0-1), and l (0-1)
- *
- * @param {int} r - The red color value
- * @param {int} g - The green color value
- * @param {int} b - The blue color value
- * @return {Array} - The HSL representation
- */
- rgbToHsl: function( r, g, b ) {
- var max, min, h, s, l, d;
-
- r /= 255;
- g /= 255;
- b /= 255;
- max = Math.max( r, g, b );
- min = Math.min( r, g, b );
- l = ( max + min ) / 2;
-
- if ( max === min ) { // Achromatic.
- return {
- h: 0,
- s: 0,
- l: l
- };
- }
- d = max - min;
- s = 0.5 < l ? d / ( 2 - max - min ) : d / ( max + min );
- switch ( max ) {
- case r: h = ( g - b ) / d + ( g < b ? 6 : 0 ); break;
- case g: h = ( b - r ) / d + 2; break;
- case b: h = ( r - g ) / d + 4; break;
- }
- h /= 6;
-
- return {
- h: h * 360,
- s: s,
- l: l
- };
- },
-
- /**
- * Get contrast between 2 luminosities.
- *
- * @since 1.0
- * @param {float} lum1 - 1st Luminosity.
- * @param {float} lum2 - 2nd Luminosity.
- * @returns {float}
- */
- getContrast: function( lum1, lum2 ) {
- return this.roundFloat( Math.max( ( lum1 + 0.05 ) / ( lum2 + 0.05 ), ( lum2 + 0.05 ) / ( lum1 + 0.05 ) ) );
- },
-
- /**
- * Gets the relative luminance from RGB.
- * Formula: http://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
- *
- * @since 1.0
- * @param {Object} color - an RGB color {r,g,b}.
- * @returns {float}
- */
- getRelativeLuminance: function( color ) {
- return this.roundFloat( 0.2126 * this.getLumPart( color.r ) + 0.7152 * this.getLumPart( color.g ) + 0.0722 * this.getLumPart( color.b ) );
- },
-
- /**
- * Get luminocity for a part.
- *
- * @since 1.0
- * @param {int|float} val - The value.
- * @returns {float}
- */
- getLumPart: function( val ) {
- val = val / 255;
- if ( 0.03928 >= val ) {
- return val / 12.92;
- }
- return Math.pow( ( ( val + 0.055 ) / 1.055 ), 2.4 );
- },
-
- /**
- * Round a float.
- * See https://stackoverflow.com/a/5624139
- *
- * @since 1.0
- * @param {float} number - The number we want to round.
- * @returns {float}
- */
- roundFloat: function( number ) {
- return Math.round( number * 100 ) / 100;
- },
-
- /**
- * Returns {this} with the colors array sorted.
- *
- * @param {string} sortBy - What do we want to sort by?
- * Acceptable values: r,g,b,h,s,l,lum,hex,contrast
- * @returns {Object}
- */
- sortBy: function( sortBy ) {
- return Object.assign({}, this, {
- colors: this.colors.sort( function( a, b ) {
- return b[ sortBy ] - a[ sortBy ];
- })
- });
- },
-
- /**
- * Removes duplicate entries from colors.
- *
- * @param {Array} colors - An array of colors.
- * @return {Object}
- */
- removeDuplicateColors: function( colors ) {
- var uniques = {},
- i;
- for ( i = 0; i < colors.length; i++ ) {
- uniques[ colors[ i ].hex ] = colors[ i ];
- }
- return Object.keys( uniques ).map( function( v ) {
- return uniques[ v ];
- });
- },
-
- /**
- * Returns an array of Hex colors.
- *
- * @returns {Array}
- */
- getHexArray: function() {
- var hexes = [],
- i;
- for ( i = 0; i < this.colors.length; i++ ) {
- hexes.push( this.colors[ i ].hex );
- }
- return hexes;
- }
-};
diff --git a/inc/customizer/controls/kirki-wcag-tc/class-kirki-wcag-text-color.php b/inc/customizer/controls/kirki-wcag-tc/class-kirki-wcag-text-color.php
deleted file mode 100644
index c917fcf..0000000
--- a/inc/customizer/controls/kirki-wcag-tc/class-kirki-wcag-text-color.php
+++ /dev/null
@@ -1,243 +0,0 @@
-json['default'] = $this->setting->default;
- if ( isset( $this->default ) ) {
- $this->json['default'] = $this->default;
- }
-
- // Required.
- $this->json['required'] = $this->required;
-
- // Output.
- $this->json['output'] = $this->output;
-
- // Value.
- $this->json['value'] = $this->value();
-
- // Choices.
- $this->json['choices'] = (array) $this->choices;
-
- if ( ! isset( $this->json['choices']['show'] ) ) {
- $this->json['choices']['show'] = [
- 'auto' => true,
- 'recommended' => true,
- 'custom' => true,
- ];
- }
-
- // The link.
- $this->json['link'] = $this->get_link();
-
- // The ID.
- $this->json['id'] = $this->id;
-
- // The kirki-config.
- $this->json['kirkiConfig'] = $this->kirki_config;
-
- // The option-type.
- $this->json['kirkiOptionType'] = $this->option_type;
-
- // The option-name.
- $this->json['kirkiOptionName'] = $this->option_name;
-
- // The CSS-Variables.
- $this->json['css-var'] = $this->css_vars;
- }
-
- /**
- * An Underscore (JS) template for this control's content (but not its container).
- *
- * Class variables for this control class are available in the `data` JS object;
- * export custom variables by overriding {@see WP_Customize_Control::to_json()}.
- *
- * @see WP_Customize_Control::print_template()
- *
- * @access protected
- */
- protected function content_template() {
- ?>
- <# if ( data.label ) { #>
-
- <# } #>
- <# if ( data.description ) { #>
- {{{ data.description }}}
- <# } #>
-
- <# var modes = ( data.choices && data.choices.modes ) ? data.choices.modes : [ 'auto', 'recommended', 'custom' ]; #>
-
- <# if ( 2 <= modes.length ) { #>
-
- <# _.each( modes, function( mode ) { #>
- <# if ( 'auto' === mode ) { #>
-
- <# } else if ( 'recommended' === mode ) { #>
-
- <# } else { #>
-
- <# } #>
- <# } ); #>
-
- <# } #>
-
- <# if ( -1 !== _.indexOf( modes, 'auto' ) ) { #>
-
- '
- );
- ?>
-
- <# } #>
- <# if ( -1 !== _.indexOf( modes, 'recommended' ) ) { #>
-
- {{ data.value }}'
- );
- ?>
-
-
- <# } #>
- <# if ( -1 !== _.indexOf( modes, 'custom' ) ) { #>
-
-
-
- <# } #>
-
- the_css( 'gridd-inline-css-nested-grid-' . $id );
- ?>
-
-
-
-
-
-
-
-
'gridd-tp gridd-tp-sidebar gridd-tp-offcanvas-sidebar position-' . get_theme_mod( 'gridd_pluss_offcanvas_sidebar_position', 'left' ) ], 'wrapper-offcanvas-sidebar' ); ?>>
- add_file( GRIDD_PLUS_PATH . '/assets/css/grid-part-offcanvas-sidebar.min.css' );
- $style->the_css( 'gridd-inline-css-offcanvas-sidebar' );
- ?>
-
-
diff --git a/inc/updater/updater.php b/inc/updater/updater.php
index 31babc0..2895f93 100755
--- a/inc/updater/updater.php
+++ b/inc/updater/updater.php
@@ -40,13 +40,13 @@ function() {
$edd_updater = new EDD_SL_Plugin_Updater(
WPLEMON_STORE_URL,
GRIDD_PLUS_PLUGIN_FILE,
- array(
+ [
'version' => GRIDD_PLUS_VERSION,
'license' => trim( get_option( GRIDD_PLUS_PLUGIN_DB_PREFIX . '_key' ) ),
'item_id' => 3438,
'author' => 'Ari Stathopoulos',
'beta' => false,
- )
+ ]
);
},
0
@@ -183,21 +183,21 @@ function() {
$license = trim( get_option( GRIDD_PLUS_PLUGIN_DB_PREFIX . '_key' ) );
// Data to send in our API request.
- $api_params = array(
+ $api_params = [
'edd_action' => 'activate_license',
'license' => $license,
'item_name' => urlencode( GRIDD_PLUS_ITEM_NAME ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions
'url' => home_url(),
- );
+ ];
// Call the custom API.
$response = wp_remote_post(
WPLEMON_STORE_URL,
- array(
+ [
'timeout' => 15,
'sslverify' => false,
'body' => $api_params,
- )
+ ]
);
// Make sure the response came back okay.
@@ -257,10 +257,10 @@ function() {
if ( ! empty( $message ) ) {
$base_url = admin_url( 'plugins.php?page=' . GRIDD_PLUS_PLUGIN_LICENSE_PAGE );
$redirect = add_query_arg(
- array(
+ [
'sl_activation' => 'false',
'message' => urlencode( $message ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions
- ),
+ ],
$base_url
);
@@ -291,21 +291,21 @@ function() {
$license = trim( get_option( GRIDD_PLUS_PLUGIN_DB_PREFIX . '_key' ) );
// Data to send in our API request.
- $api_params = array(
+ $api_params = [
'edd_action' => 'deactivate_license',
'license' => $license,
'item_name' => urlencode( GRIDD_PLUS_ITEM_NAME ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions
'url' => home_url(),
- );
+ ];
// Call the custom API.
$response = wp_remote_post(
WPLEMON_STORE_URL,
- array(
+ [
'timeout' => 15,
'sslverify' => false,
'body' => $api_params,
- )
+ ]
);
// Make sure the response came back okay.
@@ -318,10 +318,10 @@ function() {
$base_url = admin_url( 'plugins.php?page=' . GRIDD_PLUS_PLUGIN_LICENSE_PAGE );
$redirect = add_query_arg(
- array(
+ [
'sl_activation' => 'false',
'message' => urlencode( $message ), // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions
- ),
+ ],
$base_url
);
diff --git a/package.json b/package.json
index a10ce0b..de162d7 100644
--- a/package.json
+++ b/package.json
@@ -34,5 +34,9 @@
"grunt-wp-i18n": "*",
"postcss-clean": "*",
"postcss-cssnext": "*"
+ },
+ "scripts": {
+ "cloneACF": "rm -rf inc/acf && git clone git@github.com:wplemon/acf-pro.git inc/acf",
+ "build": "composer install --no-dev && npm run cloneACF && grunt"
}
}
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 61708a3..15bde4d 100755
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -27,7 +27,10 @@
.
-
+
+
+
+