updated theme `GeneratePress` version 3.1.0

This commit is contained in:
KawaiiPunk 2021-12-20 13:42:43 +00:00 committed by Gitium
parent d5dbb2bde7
commit bdeb131b25
94 changed files with 24875 additions and 20553 deletions

View File

@ -11,8 +11,8 @@ if ( ! defined( 'ABSPATH' ) ) {
get_header(); ?>
<div id="primary" <?php generate_do_element_classes( 'content' ); ?>>
<main id="main" <?php generate_do_element_classes( 'main' ); ?>>
<div <?php generate_do_attr( 'content' ); ?>>
<main <?php generate_do_attr( 'main' ); ?>>
<?php
/**
* generate_before_main_content hook.

View File

@ -11,8 +11,8 @@ if ( ! defined( 'ABSPATH' ) ) {
get_header(); ?>
<div id="primary" <?php generate_do_element_classes( 'content' ); ?>>
<main id="main" <?php generate_do_element_classes( 'main' ); ?>>
<div <?php generate_do_attr( 'content' ); ?>>
<main <?php generate_do_attr( 'main' ); ?>>
<?php
/**
* generate_before_main_content hook.
@ -33,6 +33,13 @@ get_header(); ?>
*/
do_action( 'generate_archive_title' );
/**
* generate_before_loop hook.
*
* @since 3.1.0
*/
do_action( 'generate_before_loop', 'archive' );
while ( have_posts() ) :
the_post();

View File

@ -1,7 +1,4 @@
.block-editor-block-list__block a,
.block-editor-block-list__block a:visited,
.block-editor-block-list__block a:hover,
.block-editor-block-list__block a:focus {
.wp-block a {
text-decoration: none;
}
@ -98,7 +95,8 @@ body .block-editor-default-block-appender textarea.editor-default-block-appender
# Button
--------------------------------------------------------------*/
.block-editor-block-list__layout .wp-block-button .wp-block-button__link {
.block-editor-block-list__layout .wp-block-button .wp-block-button__link,
.block-editor-block-list__layout .button {
font-size: inherit;
padding: 10px 15px;
line-height: normal;

View File

@ -0,0 +1,67 @@
.editor-styles-wrapper {
font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-weight: normal;
text-transform: none;
font-size: 17px;
line-height: 1.5;
}
.editor-styles-wrapper p {
line-height: 1.5;
margin-top: 0;
margin-bottom: 1.5em;
}
.editor-styles-wrapper h1, .editor-styles-wrapper h2, .editor-styles-wrapper h3, .editor-styles-wrapper h4, .editor-styles-wrapper h5, .editor-styles-wrapper h6 {
font-family: inherit;
font-size: 100%;
font-style: inherit;
font-weight: inherit;
}
.editor-styles-wrapper h1,
.editor-styles-wrapper .editor-post-title__input {
font-family: inherit;
font-size: 42px;
margin-bottom: 20px;
margin-top: 0;
line-height: 1.2em;
font-weight: normal;
text-transform: none;
}
.editor-styles-wrapper h2 {
font-family: inherit;
font-size: 35px;
margin-bottom: 20px;
margin-top: 0;
line-height: 1.2em;
font-weight: normal;
text-transform: none;
}
.editor-styles-wrapper h3 {
font-family: inherit;
font-size: 29px;
margin-bottom: 20px;
margin-top: 0;
line-height: 1.2em;
font-weight: normal;
text-transform: none;
}
.editor-styles-wrapper h4 {
font-size: 24px;
}
.editor-styles-wrapper h5 {
font-size: 20px;
}
.editor-styles-wrapper h4,
.editor-styles-wrapper h5,
.editor-styles-wrapper h6 {
font-family: inherit;
margin-bottom: 20px;
margin-top: 0;
}

View File

@ -957,10 +957,7 @@ input {
transition: color 0.1s ease-in-out, background-color 0.1s ease-in-out;
}
a,
a:visited,
a:hover,
a:focus {
a {
text-decoration: none;
}
@ -1210,6 +1207,10 @@ a:focus {
position: relative;
}
.main-navigation.sub-menu-left ul ul {
box-shadow: -1px 1px 0 rgba(0, 0, 0, 0.1);
}
.main-navigation.sub-menu-left .sub-menu {
right: 0;
}
@ -1645,6 +1646,13 @@ object {
max-width: 100%;
}
/*--------------------------------------------------------------
## Post Loop Block
--------------------------------------------------------------*/
.wp-block-post-template {
margin-left: 0;
}
/*--------------------------------------------------------------
# Comments
--------------------------------------------------------------*/
@ -1700,6 +1708,10 @@ object {
margin-bottom: 10px;
}
.comment-form-comment textarea {
resize: vertical;
}
.comment-form #author,
.comment-form #email,
.comment-form #url {

File diff suppressed because one or more lines are too long

View File

@ -50,6 +50,10 @@
margin-bottom: 10px;
}
.comment-form-comment textarea {
resize: vertical;
}
.comment-form #author,
.comment-form #email,
.comment-form #url {

View File

@ -1 +1 @@
.comment-content a{word-wrap:break-word}.bypostauthor{display:block}.comment,.comment-list{list-style-type:none;padding:0;margin:0}.comment-author-info{display:inline-block;vertical-align:middle}.comment-meta .avatar{float:left;margin-right:10px;border-radius:50%}.comment-author cite{font-style:normal;font-weight:700}.entry-meta.comment-metadata{margin-top:0}.comment-content{margin-top:1.5em}.comment-respond{margin-top:0}.comment-form>.form-submit{margin-bottom:0}.comment-form input,.comment-form-comment{margin-bottom:10px}.comment-form #author,.comment-form #email,.comment-form #url{display:block}.comment-metadata .edit-link:before{display:none}.comment-body{padding:30px 0}.comment-content{padding:30px;border:1px solid rgba(0,0,0,.05)}.depth-1.parent>.children{border-bottom:1px solid rgba(0,0,0,.05)}.comment .children{padding-left:30px;margin-top:-30px;border-left:1px solid rgba(0,0,0,.05)}.pingback .comment-body,.trackback .comment-body{border-bottom:1px solid rgba(0,0,0,.05)}.pingback .edit-link{font-size:13px}.comment-content p:last-child{margin-bottom:0}.comment-list>.comment:first-child{padding-top:0;margin-top:0;border-top:0}ol.comment-list{margin-bottom:1.5em}.comment-form-cookies-consent{display:flex;align-items:center}.comment-form-cookies-consent input{margin-right:.5em;margin-bottom:0}.one-container .comments-area{margin-top:1.5em}.comment-content .reply{font-size:85%}#cancel-comment-reply-link{padding-left:10px}
.comment-content a{word-wrap:break-word}.bypostauthor{display:block}.comment,.comment-list{list-style-type:none;padding:0;margin:0}.comment-author-info{display:inline-block;vertical-align:middle}.comment-meta .avatar{float:left;margin-right:10px;border-radius:50%}.comment-author cite{font-style:normal;font-weight:700}.entry-meta.comment-metadata{margin-top:0}.comment-content{margin-top:1.5em}.comment-respond{margin-top:0}.comment-form>.form-submit{margin-bottom:0}.comment-form input,.comment-form-comment{margin-bottom:10px}.comment-form-comment textarea{resize:vertical}.comment-form #author,.comment-form #email,.comment-form #url{display:block}.comment-metadata .edit-link:before{display:none}.comment-body{padding:30px 0}.comment-content{padding:30px;border:1px solid rgba(0,0,0,.05)}.depth-1.parent>.children{border-bottom:1px solid rgba(0,0,0,.05)}.comment .children{padding-left:30px;margin-top:-30px;border-left:1px solid rgba(0,0,0,.05)}.pingback .comment-body,.trackback .comment-body{border-bottom:1px solid rgba(0,0,0,.05)}.pingback .edit-link{font-size:13px}.comment-content p:last-child{margin-bottom:0}.comment-list>.comment:first-child{padding-top:0;margin-top:0;border-top:0}ol.comment-list{margin-bottom:1.5em}.comment-form-cookies-consent{display:flex;align-items:center}.comment-form-cookies-consent input{margin-right:.5em;margin-bottom:0}.one-container .comments-area{margin-top:1.5em}.comment-content .reply{font-size:85%}#cancel-comment-reply-link{padding-left:10px}

View File

@ -14,7 +14,8 @@
.comments-link:before,
.nav-previous .prev:before,
.nav-next .next:before,
.generate-back-to-top:before {
.generate-back-to-top:before,
.search-form .search-submit:before {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-style: normal;
@ -160,3 +161,14 @@ nav:not(.toggled) ul ul .dropdown-menu-toggle:before {
content: "\f106";
font-family: GeneratePress;
}
/*--------------------------------------------------------------
# Search button
--------------------------------------------------------------*/
.search-form .search-submit:before {
content: "\f002";
font-family: GeneratePress;
width: 1.28571429em;
text-align: center;
display: inline-block;
}

View File

@ -1 +1 @@
@font-face{font-family:GeneratePress;src:url(../../fonts/generatepress.eot);src:url(../../fonts/generatepress.eot#iefix) format("embedded-opentype"),url(../../fonts/generatepress.woff2) format("woff2"),url(../../fonts/generatepress.woff) format("woff"),url(../../fonts/generatepress.ttf) format("truetype"),url(../../fonts/generatepress.svg#GeneratePress) format("svg");font-weight:400;font-style:normal}.cat-links:before,.comments-link:before,.dropdown-menu-toggle:before,.generate-back-to-top:before,.menu-toggle:before,.nav-next .next:before,.nav-previous .prev:before,.search-item a:before,.tags-links:before{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.cat-links:before,.comments-link:before,.nav-next .next:before,.nav-previous .prev:before,.tags-links:before{opacity:.7}.menu-toggle:before{content:"\f0c9";font-family:GeneratePress;width:1.28571429em;text-align:center;display:inline-block}.toggled .menu-toggle:before{content:"\f00d"}.main-navigation.toggled .sfHover>a .dropdown-menu-toggle:before{content:"\f106"}.search-item a:before{content:"\f002";font-family:GeneratePress;width:1.28571429em;text-align:center;display:inline-block}.search-item.close-search a:before{content:"\f00d"}.widget .search-form button:before{content:"\f002";font-family:GeneratePress}.dropdown-menu-toggle:before{content:"\f107";font-family:GeneratePress;display:inline-block;width:.8em;text-align:left}nav:not(.toggled) ul ul .dropdown-menu-toggle:before{text-align:right}.dropdown-hover .sub-menu-left:not(.toggled) ul ul .dropdown-menu-toggle:before{transform:rotate(180deg)}.dropdown-click .menu-item-has-children.sfHover>a .dropdown-menu-toggle:before{content:"\f106"}.dropdown-hover nav:not(.toggled) ul ul .dropdown-menu-toggle:before{content:"\f105"}.entry-header .cat-links:before,.entry-header .comments-link:before,.entry-header .tags-links:before{display:none}.cat-links:before,.comments-link:before,.nav-next .next:before,.nav-previous .prev:before,.tags-links:before{font-family:GeneratePress;text-decoration:inherit;position:relative;margin-right:.6em;width:13px;text-align:center;display:inline-block}.cat-links:before{content:"\f07b"}.tags-links:before{content:"\f02c"}.comments-link:before{content:"\f086"}.nav-previous .prev:before{content:"\f104"}.nav-next .next:before{content:"\f105"}.dropdown-hover .inside-right-sidebar .dropdown-menu-toggle:before,.dropdown-hover.both-right .inside-left-sidebar .dropdown-menu-toggle:before{content:"\f104"}.dropdown-hover .inside-left-sidebar .dropdown-menu-toggle:before,.dropdown-hover.both-left .inside-right-sidebar .dropdown-menu-toggle:before{content:"\f105"}.generate-back-to-top:before{content:"\f106";font-family:GeneratePress}
@font-face{font-family:GeneratePress;src:url("../../fonts/generatepress.eot");src:url("../../fonts/generatepress.eot#iefix") format("embedded-opentype"),url("../../fonts/generatepress.woff2") format("woff2"),url("../../fonts/generatepress.woff") format("woff"),url("../../fonts/generatepress.ttf") format("truetype"),url("../../fonts/generatepress.svg#GeneratePress") format("svg");font-weight:400;font-style:normal}.cat-links:before,.comments-link:before,.dropdown-menu-toggle:before,.generate-back-to-top:before,.menu-toggle:before,.nav-next .next:before,.nav-previous .prev:before,.search-form .search-submit:before,.search-item a:before,.tags-links:before{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.cat-links:before,.comments-link:before,.nav-next .next:before,.nav-previous .prev:before,.tags-links:before{opacity:.7}.menu-toggle:before{content:"\f0c9";font-family:GeneratePress;width:1.28571429em;text-align:center;display:inline-block}.toggled .menu-toggle:before{content:"\f00d"}.main-navigation.toggled .sfHover>a .dropdown-menu-toggle:before{content:"\f106"}.search-item a:before{content:"\f002";font-family:GeneratePress;width:1.28571429em;text-align:center;display:inline-block}.search-item.close-search a:before{content:"\f00d"}.widget .search-form button:before{content:"\f002";font-family:GeneratePress}.dropdown-menu-toggle:before{content:"\f107";font-family:GeneratePress;display:inline-block;width:.8em;text-align:left}nav:not(.toggled) ul ul .dropdown-menu-toggle:before{text-align:right}.dropdown-hover .sub-menu-left:not(.toggled) ul ul .dropdown-menu-toggle:before{transform:rotate(180deg)}.dropdown-click .menu-item-has-children.sfHover>a .dropdown-menu-toggle:before{content:"\f106"}.dropdown-hover nav:not(.toggled) ul ul .dropdown-menu-toggle:before{content:"\f105"}.entry-header .cat-links:before,.entry-header .comments-link:before,.entry-header .tags-links:before{display:none}.cat-links:before,.comments-link:before,.nav-next .next:before,.nav-previous .prev:before,.tags-links:before{font-family:GeneratePress;text-decoration:inherit;position:relative;margin-right:.6em;width:13px;text-align:center;display:inline-block}.cat-links:before{content:"\f07b"}.tags-links:before{content:"\f02c"}.comments-link:before{content:"\f086"}.nav-previous .prev:before{content:"\f104"}.nav-next .next:before{content:"\f105"}.dropdown-hover .inside-right-sidebar .dropdown-menu-toggle:before,.dropdown-hover.both-right .inside-left-sidebar .dropdown-menu-toggle:before{content:"\f104"}.dropdown-hover .inside-left-sidebar .dropdown-menu-toggle:before,.dropdown-hover.both-left .inside-right-sidebar .dropdown-menu-toggle:before{content:"\f105"}.generate-back-to-top:before{content:"\f106";font-family:GeneratePress}.search-form .search-submit:before{content:"\f002";font-family:GeneratePress;width:1.28571429em;text-align:center;display:inline-block}

View File

@ -421,10 +421,7 @@ input {
transition: color 0.1s ease-in-out, background-color 0.1s ease-in-out;
}
a,
a:visited,
a:hover,
a:focus {
a {
text-decoration: none;
}
@ -668,6 +665,10 @@ a:focus {
position: relative;
}
.main-navigation.sub-menu-left ul ul {
box-shadow: -1px 1px 0 rgba(0, 0, 0, 0.1);
}
.main-navigation.sub-menu-left .sub-menu {
right: 0;
}
@ -1099,6 +1100,13 @@ object {
max-width: 100%;
}
/*--------------------------------------------------------------
## Post Loop Block
--------------------------------------------------------------*/
.wp-block-post-template {
margin-left: 0;
}
/*--------------------------------------------------------------
# Widgets
--------------------------------------------------------------*/
@ -1500,6 +1508,12 @@ nav.toggled ul ul.sub-menu {
.main-navigation.toggled .main-nav ul ul {
transition: 0s;
visibility: hidden;
box-shadow: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
}
.main-navigation.toggled .main-nav ul ul li:last-child > ul {
border-bottom: 0;
}
.main-navigation.toggled .main-nav ul ul.toggled-on {

File diff suppressed because one or more lines are too long

View File

@ -503,10 +503,7 @@ input {
transition: color 0.1s ease-in-out, background-color 0.1s ease-in-out;
}
a,
a:visited,
a:hover,
a:focus {
a {
text-decoration: none;
}
@ -756,6 +753,10 @@ a:focus {
position: relative;
}
.main-navigation.sub-menu-left ul ul {
box-shadow: -1px 1px 0 rgba(0, 0, 0, 0.1);
}
.main-navigation.sub-menu-left .sub-menu {
right: 0;
}
@ -1191,6 +1192,13 @@ object {
max-width: 100%;
}
/*--------------------------------------------------------------
## Post Loop Block
--------------------------------------------------------------*/
.wp-block-post-template {
margin-left: 0;
}
/*--------------------------------------------------------------
# Comments
--------------------------------------------------------------*/
@ -1246,6 +1254,10 @@ object {
margin-bottom: 10px;
}
.comment-form-comment textarea {
resize: vertical;
}
.comment-form #author,
.comment-form #email,
.comment-form #url {

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
<?php return array('dependencies' => array('wp-data', 'wp-plugins', 'wp-polyfill'), 'version' => '11ef0750a5fe7ac2ec7219a41656ae84');

View File

@ -0,0 +1 @@
!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=57)}({11:function(e,t){e.exports=window.wp.data},27:function(e,t){e.exports=window.wp.plugins},57:function(e,t,r){"use strict";r.r(t);var n=r(27),o=r(11);Object(o.select)("core/edit-post")&&Object(o.select)("core/edit-post").__experimentalGetPreviewDeviceType&&Object(n.registerPlugin)("generatepress-responsive-classes",{render:function(){var e=Object(o.useSelect)((function(){var e=Object(o.select)("core/edit-post").__experimentalGetPreviewDeviceType;return e?{deviceType:e()}:{deviceType:null}}),[]).deviceType;return document.querySelector("body").classList.remove("gp-is-device-desktop","gp-is-device-tablet","gp-is-device-mobile"),document.querySelector("body").classList.add("gp-is-device-"+e.toLowerCase()),null}})}});

View File

@ -0,0 +1 @@
<?php return array('dependencies' => array('react', 'react-dom', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => 'cce88a99e1e77f1e8791fa8ad107481c');

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
<?php return array('dependencies' => array('wp-api-fetch', 'wp-components', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '1544fd10034784b46bf2292e69917371');

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,10 @@
.components-base-control__help{margin-top:2px;margin-bottom:0}.components-base-control__label{display:block;margin-bottom:10px}.generate-customize-control-wrapper{display:flex}.generate-customize-control-wrapper[data-wrapper-type=color]>div:first-child{flex-grow:1}.generate-customize-control-wrapper[data-wrapper-type=color]>div:not(:first-child):not(:empty){margin-left:5px}.generate-customize-control-wrapper[data-wrapper-type=two-col]>div{flex-basis:calc(50% - 5px)}.generate-customize-control-wrapper[data-wrapper-type=two-col]>div:nth-child(odd){margin-right:5px}.generate-customize-control-wrapper[data-wrapper-type=two-col]>div:nth-child(even){margin-left:5px}.generate-customize-control--popover>.components-popover__content{padding:15px;width:280px;box-sizing:border-box}.generate-customize-control--popover .components-base-control:not(:last-child){margin-bottom:15px}.customize-control[data-toggleid]{display:none}#customize-control-generate_settings-google_font_display{margin-top:10px;display:flex;flex-direction:column}#customize-control-generate_settings-google_font_display .description{order:10;margin-bottom:0;margin-top:5px}
.generate-component-color-picker .components-color-picker{box-sizing:border-box}.generate-component-color-picker .components-color-picker__inputs-wrapper{display:none}.generate-component-color-picker .generate-color-input-wrapper{display:flex;padding:0}.generate-component-color-picker .generate-color-input-wrapper .generate-color-input{flex-grow:1}.generate-component-color-picker .generate-color-input-wrapper .components-color-clear-color{margin-left:5px}.generate-component-color-picker .generate-color-input-wrapper input{margin-right:5px}.generate-component-color-picker .generate-color-input-wrapper .components-base-control__field{margin-bottom:0}.generate-component-color-picker>.components-base-control:first-child{margin-bottom:0}.generate-component-color-picker .components-color-picker__inputs-wrapper{min-width:auto}.generate-component-color-picker .generate-component-color-picker-palette{padding:16px 0 0}.generate-component-color-picker .generate-component-color-picker-palette .components-circular-option-picker{display:flex;flex-wrap:wrap}.generate-component-color-picker .generate-component-color-picker-palette .components-circular-option-picker .components-circular-option-picker__option-wrapper{margin:0 8px 8px 0}.generate-component-color-picker .components-color-palette{margin:0}.generate-component-color-picker .components-color-picker{padding:5px}.generate-component-color-picker .components-color-picker__body{padding-bottom:0}.generate-component-color-picker .components-popover__content{padding:10px;width:295px;box-sizing:border-box}.generate-component-color-picker .components-color-clear-color{height:auto}.generate-component-color-picker .components-circular-option-picker__option.is-pressed+svg{fill:#fff;background:#000;transform:scale(0.6)}.generate-component-color-picker[data-x-axis=left] .components-popover__content{margin-right:-35px !important}.generate-customize-control-wrapper{display:flex}.generate-customize-control-wrapper.generate-customize-color-control-wrapper>div:first-child{flex-grow:1}.generate-customize-control-wrapper.generate-customize-color-control-wrapper>div:not(:last-child){margin-right:5px}.generate-component-color-picker-wrapper>.components-base-control__field{position:relative;display:flex;align-items:center;justify-content:space-between}.generate-component-color-picker-wrapper>.components-base-control__field .components-color-palette__item-wrapper{margin:0}.generate-component-color-picker-palette button,.generate-color-picker-area button{width:28px;height:28px;position:relative}.generate-component-color-picker-palette button:hover,.generate-color-picker-area button:hover{background-color:inherit}.generate-component-color-picker-palette button:focus:after,.generate-color-picker-area button:focus:after{width:28px;height:28px}.generate-customize-control--popover .components-color-picker{box-sizing:border-box}.generate-customize-control--popover .components-color-picker__inputs-wrapper{display:none}.generate-customize-control--popover>.components-base-control:first-child{margin-bottom:0}.generate-customize-control--popover .components-color-picker__inputs-wrapper{min-width:auto}.generate-customize-control--popover .components-color-picker{padding:5px}.generate-customize-control--popover .components-color-picker__body{padding-bottom:0}.generate-customize-control--popover .components-color-clear-color{height:auto}.generate-component-color-picker[data-x-axis=left] .components-popover__content{margin-right:-35px !important}.generate-color-input--icon{align-items:center;justify-content:center;display:flex;padding:5px;border:1px solid currentColor;border-right:0;border-top-left-radius:3px;border-bottom-left-radius:3px}.generate-color-input--icon svg{height:1em;width:1em;transform:scale(1.3)}.generate-color-option-area{padding:16px 16px 0}.generate-color-input--css-var-name-wrapper{position:relative}.generate-color-input--css-var-name-wrapper button{position:absolute;bottom:0;right:0;padding:0 8px;min-height:30px;height:auto}.generate-color-input--css-var-name-wrapper button svg{width:1em;height:1em;fill:none}
.generate-font-manager--item{margin-bottom:10px}.generate-font-manager--item .generate-font-manager--header{display:flex;align-items:center}.generate-font-manager--item .generate-font-manager--header .generate-font-manager--label{flex-grow:1;padding-left:0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.generate-font-manager--item .generate-font-manager--header .components-button:not(.generate-font-manager--label){background:#fff;border:1px solid #777;padding:0;display:flex;justify-content:center;align-items:center;width:30px;height:30px;min-width:30px;margin-left:5px;border-radius:100%;flex-shrink:0}.generate-font-manager--item .generate-font-manager--header .components-button:not(.generate-font-manager--label) svg{margin-right:0;width:1em;height:1em}.generate-font-manager--item .generate-font-manager--header .components-button:not(.generate-font-manager--label).generate-font-manager--open svg{fill:none}.generate-font-manager--item .generate-font-manager--options{margin-top:15px}.generate-font-manager--item .generate-font-manager--footer{margin-top:15px;padding-top:15px;border-top:1px solid #ddd}.generate-font-manager--item .generate-font-manager-google-font--field{margin-top:10px}.generate-font-manager--item .generate-font-manager--google-font-options{display:flex;flex-wrap:wrap;margin-top:15px}.generate-font-manager--item .generate-font-manager--google-font-options>div{flex-basis:calc(50% - 10px);margin-bottom:0}.generate-font-manager--item .generate-font-manager--google-font-options>div:nth-child(even){margin-left:5px}.generate-font-manager--item .generate-font-manager--google-font-options>div:nth-child(odd){margin-right:5px}.generate-font-manager--item .generate-font-manager--google-font-options .components-base-control__field{margin-bottom:0 !important}.generate-font-manager--item .generate-font-manager--select-options{display:flex;flex-wrap:wrap}.generate-font-manager--item .generate-font-manager--select-options>div{flex-basis:calc(50% - 5px)}.generate-font-manager--item .generate-font-manager--select-options>div:nth-child(even){margin-left:5px}.generate-font-manager--item .generate-font-manager--select-options>div:nth-child(odd){margin-right:5px}.generate-font-manager--item .components-select-control__input--generate-fontfamily{margin-bottom:3px}.generate-font-manager--item .generate-advanced-select__menu{position:relative !important}.generate-font-manager-group{margin-top:10px;margin-bottom:20px}.generate-font-manager-group__label{margin-top:0;color:#000;text-transform:uppercase;font-size:11px;margin-bottom:10px}.generate-font-manager-group .generate-font-manager--item:last-child{margin-bottom:0}.generate-customize-control--font-dropdown{background:#fff;padding:15px;margin-top:10px;position:relative}.generate-customize-control--font-dropdown:before{content:"";position:absolute;left:11px;top:-10px;width:0;height:0;border-style:solid;border-width:0 10px 10px 10px;border-color:transparent transparent #fff transparent;z-index:10}.generate-customize-control--font-dropdown>.components-base-control:not(:last-child){margin-bottom:15px}.generate-customize-control--font-dropdown>.components-base-control:last-child .components-base-control__field{margin-bottom:0}
.generate-advanced-select__control{margin-bottom:12px}.generate-advanced-select__value-container{padding:0 6px !important}.generate-advanced-select__value-container>div{padding:0;margin:0}.generate-advanced-select__input input[type=text]:focus{box-shadow:none}.generate-advanced-select__option--is-selected{color:rgba(255,255,255,.5) !important}
.components-generate-units-control-header__units{display:flex;justify-content:space-between;margin-bottom:5px;align-items:center}.components-generate-control__units .components-generate-control-buttons__units button.components-button{background:#fff;box-shadow:none !important;color:#929da7;font-size:10px;padding:0 5px;position:relative;text-align:center;text-shadow:none;border:0;border-radius:0 !important;line-height:20px;padding:0 5px;height:auto}.components-generate-control__units .components-generate-control-buttons__units button.components-button.is-primary{background:#fff !important;color:#000 !important;cursor:default;z-index:1;font-weight:bold}.generate-component-device-field[data-device=desktop],.generate-component-device-field[data-device=tablet],.generate-component-device-field[data-device=mobile]{display:none}.preview-desktop .generate-component-device-field[data-device=desktop]{display:block}.preview-desktop .components-generate-control__units button.components-generate-control-button__units--desktop{color:#000}.preview-tablet .generate-component-device-field[data-device=tablet]{display:block}.preview-tablet .components-generate-control__units button.components-generate-control-button__units--tablet{color:#000}.preview-mobile .generate-component-device-field[data-device=mobile]{display:block}.preview-mobile .components-generate-control__units button.components-generate-control-button__units--mobile{color:#000}
.components-generate-range-control .components-generate-range-control--wrapper{display:flex;justify-content:space-between}.components-generate-range-control .components-generate-range-control--wrapper .components-generate-range-control--range{width:calc(100% - 80px)}.components-generate-range-control .components-generate-range-control--wrapper .components-generate-range-control-input{width:65px}.components-generate-range-control .components-base-control__help{margin-top:-8px;font-size:12px;font-style:normal;color:#757575}
.components-generate--control__units{display:flex}.generate-component-input-with-unit{display:flex;align-items:center}.generate-component-input-with-unit>div:not(.components-generate--control__units){flex-grow:1}.generate-component-input-with-unit div{margin-bottom:0}.generate-component-input-with-unit .components-generate-range-control--range{max-height:30px}.generate-component-input-with-unit .components-generate-range-control-input input{max-height:30px}.generate-component-control--unit-picker button{height:auto;min-height:30px;margin-left:2px;border:1px solid #444;font-weight:500;font-size:11px;text-transform:uppercase;width:40px;justify-content:center}.components-generate--control-buttons__units{display:flex}.components-generate--control-buttons__units button.components-button{text-transform:uppercase;padding:10px;height:auto;line-height:normal;font-weight:500}
.generate-color-manager-wrapper{display:flex;flex-wrap:wrap}.generate-color-manager-wrapper .generate-color-manager--item{position:relative;margin-right:5px;margin-bottom:5px}.generate-color-manager-wrapper .generate-color-manager--item:last-child{margin-right:0}.generate-color-manager-wrapper .generate-color-manager--item .components-button.generate-color-manager--delete-color{position:absolute;top:-10px;right:-10px;height:auto;min-width:0;padding:2px;background:rgba(0,0,0,.7);color:#fff;border-radius:100%;opacity:0;pointer-events:none;transition:opacity 500ms ease}.generate-color-manager-wrapper .generate-color-manager--item .components-button.generate-color-manager--delete-color svg{width:15px;height:15px;margin-right:0 !important}.generate-color-manager-wrapper .generate-color-manager--item:hover .components-button.generate-color-manager--delete-color{opacity:1;pointer-events:auto}.generate-color-manager-wrapper .generate-color-manager--item .components-button.generate-color-manager--delete-color:focus{opacity:1;pointer-events:auto}.generate-color-manager-wrapper .generate-color-manager--item .components-circular-option-picker__option-wrapper{margin:0}.generate-color-manager-wrapper .generate-color-manager--item .components-button.generate-color-manager--add-color{padding:0;width:28px;height:28px;display:flex;align-items:center;justify-content:center;border-radius:100%;background:#fff;border:1px solid #777}.generate-color-manager-wrapper .generate-color-manager--item .components-button.generate-color-manager--add-color svg{width:20px}
.generate-customize-control-title{display:flex;justify-content:space-between}.generate-customize-control-title button.generate-customize-control-title--label{font-size:14px;font-weight:500;padding:0;height:auto}.generate-customize-control-title button.generate-customize-control-title--toggle{background:#fff;border-radius:100%;border:1px solid #777;padding:0;width:28px;height:28px;display:flex;justify-content:center;align-items:center}.generate-customize-control-title button.generate-customize-control-title--toggle svg{width:1em;height:1em;fill:none}.generate-customize-control-title h3{font-size:14px !important;font-weight:500;margin-bottom:0}

View File

@ -0,0 +1,4 @@
.generate-dashboard-page .wrap{margin-right:0}.generate-dashboard-page #wpcontent{padding-left:0}.generate-dashboard-page .update-nag{margin-bottom:20px;margin-left:22px}.generate-dashboard-page.edit-php #wpbody-content .wrap{padding:0 20px;margin:0}.generatepress-dashboard-header{background:#fff;border-bottom:1px solid #e2e4e7;padding:0 20px;text-align:center;display:flex;justify-content:space-between;align-items:center}.generatepress-dashboard-header h1{font-size:17px;font-weight:600;padding-bottom:0;display:flex;align-items:center}.generatepress-dashboard-header h1 svg{width:1em;height:1em;padding-right:10px;fill:#006eb7}.generatepress-dashboard-header__navigation{background:#fff;display:flex}.generatepress-dashboard-header__navigation a{padding:1rem;display:flex;align-items:center;color:inherit;text-decoration:none}.generatepress-dashboard-header__navigation a.active{font-weight:600;box-shadow:inset 0 -3px #007cba}.generatepress-dashboard{max-width:1000px;margin:40px auto;font-size:15px}.generatepress-dashboard h2{font-size:25px;margin:0;line-height:1.2em}.generatepress-dashboard__placeholder.components-placeholder{outline:none;background:none;margin-bottom:50px;box-shadow:none;padding:0}.generatepress-dashboard__section-title{display:flex;align-items:center;margin-bottom:15px}.generatepress-dashboard__section-title>h2:first-child:not(:last-child){margin-right:10px}.generatepress-dashboard__section-description{margin-top:-10px;margin-bottom:20px}.generatepress-dashboard__section-description p{font-size:15px;margin:0}.generatepress-dashboard__section{color:#555;margin-bottom:50px}.generatepress-dashboard__section-item{padding:20px;background:#fff;display:flex;justify-content:space-between;align-items:center}.generatepress-dashboard__section-item:not(:last-child){border-bottom:1px solid #ddd}.generatepress-dashboard__section-item-title{font-weight:600}.generatepress-dashboard__section-item-action{padding-left:20px;display:flex;align-items:center}.generatepress-dashboard__section-item-action>*:not(:last-child){margin-right:10px}.generatepress-dashboard__section-item-action .is-primary .components-spinner{margin-top:0;background:#000}.generatepress-dashboard__section-item-description{font-size:13px;color:#80879a;margin-top:3px}.generatepress-dashboard__section-item-message{display:none;font-size:12px;color:#555;background:#fafafa;padding:5px 10px;border-radius:3px;box-shadow:1px 1px 1px rgba(0,0,0,.05)}.generatepress-dashboard__section-item-message__show{display:inline;color:green}.generatepress-dashboard__section-item-message__error{color:red}.generatepress-dashboard__reset-button.is-primary{background-color:#e02a2a}.generatepress-dashboard__reset-button.is-primary:hover:not(:disabled){background-color:darkred}@media(max-width: 768px){.generatepress-dashboard-header{flex-direction:column}.generatepress-dashboard{padding-left:20px;padding-right:20px}}
.generatepress-start-customizing{display:flex;flex-wrap:wrap;margin-left:-30px;color:#555}.generatepress-start-customizing__item{padding:30px;background:#fff;margin-left:30px;margin-bottom:30px;width:calc(50% - 30px);box-sizing:border-box;box-shadow:0 0 2px rgba(0,0,0,.1)}.generatepress-start-customizing__icon{color:#fff;background:#1e72bd;height:50px;width:50px;display:flex;align-items:center;justify-content:center;border-radius:100%;margin-bottom:25px}.generatepress-start-customizing__title{font-weight:500;margin-bottom:1em}.generatepress-start-customizing__description{margin-bottom:1em;font-weight:300;line-height:1.5em}.generatepress-start-customizing__action{margin-top:auto}.generatepress-start-customizing__pro{font-size:11px;background:#f0544f;padding:0 5px;display:inline-block;margin-left:5px;color:#fff;border-radius:2px}
.generatepress-dashboard__premium{display:flex;flex-wrap:wrap;margin-left:-30px;color:#555}.generatepress-dashboard__premium-item{padding:30px;background:#fff;margin-left:30px;margin-bottom:30px;width:calc(50% - 30px);box-sizing:border-box;box-shadow:0 0 2px rgba(0,0,0,.1);flex-grow:1}.generatepress-dashboard__premium-item-icon{color:#fff;background:#1e72bd;height:50px;width:50px;display:flex;align-items:center;justify-content:center;border-radius:100%;margin-bottom:25px}.generatepress-dashboard__premium-item-icon svg{width:25px;height:25px}.generatepress-dashboard__premium-item-title{font-weight:500;margin-bottom:10px;display:flex;align-items:center;font-size:17px}.generatepress-dashboard__premium-item-description{margin-bottom:1em;font-weight:300;line-height:1.5em}.generatepress-dashboard__premium-item-action{margin-top:auto}.generatepress-dashboard__premium-item-pro{font-size:11px;background:#f0544f;padding:0 5px;display:inline-block;margin-left:5px;color:#fff;border-radius:2px}
.generatepress-dashboard__section-item-modules{margin-top:20px}

View File

@ -1,127 +0,0 @@
( function() {
'use strict';
if ( 'querySelector' in document && 'addEventListener' in window ) {
var body = document.body;
body.addEventListener( 'mousedown', function() {
body.classList.add( 'using-mouse' );
} );
body.addEventListener( 'keydown', function() {
body.classList.remove( 'using-mouse' );
} );
if ( body.classList.contains( 'dropdown-hover' ) ) {
var navLinks = document.querySelectorAll( 'nav .main-nav ul a' ),
menuBarItems = document.querySelectorAll( '.menu-bar-items .menu-bar-item > a' );
/**
* Make menu items tab accessible when using the hover dropdown type
*/
var toggleFocus = function() {
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) || this.closest( 'nav' ).classList.contains( 'slideout-navigation' ) ) {
return;
}
var self = this;
while ( -1 === self.className.indexOf( 'main-nav' ) ) {
if ( 'li' === self.tagName.toLowerCase() ) {
self.classList.toggle( 'sfHover' );
}
self = self.parentElement;
}
}
/**
* Make our menu bar items tab accessible.
*/
var toggleMenuBarItemFocus = function() {
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) || this.closest( 'nav' ).classList.contains( 'slideout-navigation' ) ) {
return;
}
var self = this;
while ( -1 === self.className.indexOf( 'menu-bar-items' ) ) {
if ( self.classList.contains( 'menu-bar-item' ) ) {
self.classList.toggle( 'sfHover' );
}
self = self.parentElement;
}
}
for ( var i = 0; i < navLinks.length; i++ ) {
navLinks[i].addEventListener( 'focus', toggleFocus );
navLinks[i].addEventListener( 'blur', toggleFocus );
}
for ( var i = 0; i < menuBarItems.length; i++ ) {
menuBarItems[i].addEventListener( 'focus', toggleMenuBarItemFocus );
menuBarItems[i].addEventListener( 'blur', toggleMenuBarItemFocus );
}
}
}
/**
* Make hover dropdown touch-friendly.
*/
if ( 'ontouchend' in document.documentElement && document.body.classList.contains( 'dropdown-hover' ) ) {
var parentElements = document.querySelectorAll( '.sf-menu .menu-item-has-children' );
for ( var i = 0; i < parentElements.length; i++ ) {
parentElements[i].addEventListener( 'touchend', function( e ) {
// Bail on mobile
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) ) {
return;
}
if ( e.touches.length === 1 || e.touches.length === 0 ) {
// Prevent touch events within dropdown bubbling down to document
e.stopPropagation();
// Toggle hover
if ( ! this.classList.contains( 'sfHover' ) ) {
// Prevent link on first touch
if ( e.target === this || e.target.parentNode === this || e.target.parentNode.parentNode ) {
e.preventDefault();
}
var getSiblings = function( elem ) {
return Array.prototype.filter.call( elem.parentNode.children, function( sibling ) {
return sibling !== elem;
} );
};
// Close other sub-menus.
var closestLi = this.closest( 'li' ),
siblings = getSiblings( closestLi );
for ( var i = 0; i < siblings.length; i++ ) {
if ( siblings[i].classList.contains( 'sfHover' ) ) {
siblings[i].classList.remove( 'sfHover' );
}
}
this.classList.add( 'sfHover' );
// Hide dropdown on touch outside
var closeDropdown,
thisItem = this;
document.addEventListener( 'touchend', closeDropdown = function(e) {
e.stopPropagation();
thisItem.classList.remove( 'sfHover' );
document.removeEventListener( 'touchend', closeDropdown );
} );
}
}
} );
}
}
} )();

View File

@ -1 +0,0 @@
!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var e=document.body;if(e.addEventListener("mousedown",function(){e.classList.add("using-mouse")}),e.addEventListener("keydown",function(){e.classList.remove("using-mouse")}),e.classList.contains("dropdown-hover")){for(var t=document.querySelectorAll("nav .main-nav ul a"),s=document.querySelectorAll(".menu-bar-items .menu-bar-item > a"),n=function(){if(!this.closest("nav").classList.contains("toggled")&&!this.closest("nav").classList.contains("slideout-navigation"))for(var e=this;-1===e.className.indexOf("main-nav");)"li"===e.tagName.toLowerCase()&&e.classList.toggle("sfHover"),e=e.parentElement},o=function(){if(!this.closest("nav").classList.contains("toggled")&&!this.closest("nav").classList.contains("slideout-navigation"))for(var e=this;-1===e.className.indexOf("menu-bar-items");)e.classList.contains("menu-bar-item")&&e.classList.toggle("sfHover"),e=e.parentElement},i=0;i<t.length;i++)t[i].addEventListener("focus",n),t[i].addEventListener("blur",n);for(i=0;i<s.length;i++)s[i].addEventListener("focus",o),s[i].addEventListener("blur",o)}}if("ontouchend"in document.documentElement&&document.body.classList.contains("dropdown-hover"))for(var a=document.querySelectorAll(".sf-menu .menu-item-has-children"),i=0;i<a.length;i++)a[i].addEventListener("touchend",function(e){var t;if(!this.closest("nav").classList.contains("toggled")&&((1===e.touches.length||0===e.touches.length)&&(e.stopPropagation(),!this.classList.contains("sfHover")))){e.target!==this&&e.target.parentNode!==this&&!e.target.parentNode.parentNode||e.preventDefault();for(var s=this.closest("li"),n=(t=s,Array.prototype.filter.call(t.parentNode.children,function(e){return e!==t})),o=0;o<n.length;o++)n[o].classList.contains("sfHover")&&n[o].classList.remove("sfHover");this.classList.add("sfHover");var i,a=this;document.addEventListener("touchend",i=function(e){e.stopPropagation(),a.classList.remove("sfHover"),document.removeEventListener("touchend",i)})}})}();

View File

@ -3,50 +3,49 @@
// Feature Test
if ( 'querySelector' in document && 'addEventListener' in window ) {
var goTopBtn = document.querySelector( '.generate-back-to-top' );
var trackScroll = function() {
var scrolled = window.pageYOffset;
var coords = goTopBtn.getAttribute( 'data-start-scroll' ) ;
var coords = goTopBtn.getAttribute( 'data-start-scroll' );
if ( scrolled > coords ) {
goTopBtn.style.opacity = '1';
goTopBtn.style.visibility = 'visible';
}
if (scrolled < coords) {
if ( scrolled < coords ) {
goTopBtn.style.opacity = '0';
goTopBtn.style.visibility = 'hidden';
}
};
// Function to animate the scroll
var smoothScroll = function (anchor, duration) {
var smoothScroll = function( anchor, duration ) {
// Calculate how far and how fast to scroll
var startLocation = window.pageYOffset;
var endLocation = document.body.offsetTop;
var distance = endLocation - startLocation;
var increments = distance/(duration/16);
var increments = distance / ( duration / 16 );
var stopAnimation;
// Scroll the page by an increment, and check if it's time to stop
var animateScroll = function () {
window.scrollBy(0, increments);
var animateScroll = function() {
window.scrollBy( 0, increments );
stopAnimation();
};
// Stop animation when you reach the anchor OR the top of the page
stopAnimation = function () {
stopAnimation = function() {
var travelled = window.pageYOffset;
if ( travelled <= (endLocation || 0) ) {
clearInterval(runAnimation);
if ( travelled <= ( endLocation || 0 ) ) {
clearInterval( runAnimation );
document.activeElement.blur();
}
};
// Loop the animation function
var runAnimation = setInterval(animateScroll, 16);
var runAnimation = setInterval( animateScroll, 16 );
};
if ( goTopBtn ) {
@ -56,10 +55,13 @@
// Scroll back to top when clicked.
goTopBtn.addEventListener( 'click', function( e ) {
e.preventDefault();
if ( generatepressBackToTop.smooth ) {
smoothScroll( document.body, goTopBtn.getAttribute( 'data-scroll-speed' ) || 400 );
} else {
window.scrollTo( 0, 0 );
}
}, false );
}
}
} )();
}() );

View File

@ -1 +1 @@
!function(){"use strict";var l;"querySelector"in document&&"addEventListener"in window&&(l=document.querySelector(".generate-back-to-top"),l&&(window.addEventListener("scroll",function(){var t=window.pageYOffset,e=l.getAttribute("data-start-scroll");e<t&&(l.style.opacity="1",l.style.visibility="visible"),t<e&&(l.style.opacity="0",l.style.visibility="hidden")}),l.addEventListener("click",function(t){var e,n,i,o,c,d;t.preventDefault(),document.body,e=l.getAttribute("data-scroll-speed")||400,n=window.pageYOffset,i=document.body.offsetTop,o=(i-n)/(e/16),c=function(){window.pageYOffset<=(i||0)&&(clearInterval(d),document.activeElement.blur())},d=setInterval(function(){window.scrollBy(0,o),c()},16)},!1)))}();
!function(){"use strict";var s;"querySelector"in document&&"addEventListener"in window&&(s=document.querySelector(".generate-back-to-top"),s&&(window.addEventListener("scroll",function(){var e=window.pageYOffset,t=s.getAttribute("data-start-scroll");t<e&&(s.style.opacity="1",s.style.visibility="visible"),e<t&&(s.style.opacity="0",s.style.visibility="hidden")}),s.addEventListener("click",function(e){var t,n,o,i,r;e.preventDefault(),generatepressBackToTop.smooth?(document.body,t=s.getAttribute("data-scroll-speed")||400,e=window.pageYOffset,n=document.body.offsetTop,o=(n-e)/(t/16),i=function(){window.pageYOffset<=(n||0)&&(clearInterval(r),document.activeElement.blur())},r=setInterval(function(){window.scrollBy(0,o),i()},16)):window.scrollTo(0,0)},!1)))}();

View File

@ -2,19 +2,20 @@
'use strict';
if ( 'querySelector' in document && 'addEventListener' in window ) {
var body = document.body;
var body = document.body,
i;
/**
* Dropdown click
*
* @param e The event.
* @param _this The clicked item.
* @param {Object} e The event.
* @param {Object} _this The clicked item.
*/
var dropdownClick = function( e, _this ) {
e.preventDefault();
e.stopPropagation();
if ( ! _this ) {
var _this = this;
_this = this;
}
var closestLi = _this.closest( 'li' );
@ -23,8 +24,8 @@
var openedSubMenus = _this.closest( 'nav' ).querySelectorAll( 'ul.toggled-on' );
if ( openedSubMenus && ! _this.closest( 'ul' ).classList.contains( 'toggled-on' ) && ! _this.closest( 'li' ).classList.contains( 'sfHover' ) ) {
for ( var o = 0; o < openedSubMenus.length; o++ ) {
openedSubMenus[o].classList.remove( 'toggled-on' );
openedSubMenus[o].closest( 'li' ).classList.remove( 'sfHover' );
openedSubMenus[ o ].classList.remove( 'toggled-on' );
openedSubMenus[ o ].closest( 'li' ).classList.remove( 'sfHover' );
}
}
@ -42,7 +43,7 @@
if ( closestLi.querySelector( '.sub-menu' ) ) {
var subMenuSelector = '.sub-menu';
} else {
var subMenuSelector = '.children';
subMenuSelector = '.children';
}
// Open the sub-menu
@ -51,42 +52,42 @@
} else if ( body.classList.contains( 'dropdown-click-arrow' ) ) {
closestLi.querySelector( subMenuSelector ).classList.toggle( 'toggled-on' );
}
}
};
// Do stuff if click dropdown if enabled
var parentElementLinks = document.querySelectorAll( '.main-nav .menu-item-has-children > a' );
// Open the sub-menu by clicking on the entire link element
if ( body.classList.contains( 'dropdown-click-menu-item' ) ) {
for ( var i = 0; i < parentElementLinks.length; i++ ) {
parentElementLinks[i].addEventListener( 'click', dropdownClick, true );
for ( i = 0; i < parentElementLinks.length; i++ ) {
parentElementLinks[ i ].addEventListener( 'click', dropdownClick, true );
}
}
// Open the sub-menu by clicking on a dropdown arrow
if ( body.classList.contains( 'dropdown-click-arrow' ) ) {
// Add a class to sub-menu items that are set to #
for ( var i = 0; i < document.querySelectorAll( '.main-nav .menu-item-has-children > a' ).length; i++ ) {
if ( '#' == document.querySelectorAll( '.main-nav .menu-item-has-children > a' )[i].getAttribute( 'href' ) ) {
document.querySelectorAll( '.main-nav .menu-item-has-children > a' )[i].classList.add( 'menu-item-dropdown-click' );
for ( i = 0; i < document.querySelectorAll( '.main-nav .menu-item-has-children > a' ).length; i++ ) {
if ( '#' === document.querySelectorAll( '.main-nav .menu-item-has-children > a' )[ i ].getAttribute( 'href' ) ) {
document.querySelectorAll( '.main-nav .menu-item-has-children > a' )[ i ].classList.add( 'menu-item-dropdown-click' );
}
}
var dropdownToggleLinks = document.querySelectorAll( '.main-nav .menu-item-has-children > a .dropdown-menu-toggle' );
for ( var i = 0; i < dropdownToggleLinks.length; i++ ) {
dropdownToggleLinks[i].addEventListener( 'click', dropdownClick, false );
for ( i = 0; i < dropdownToggleLinks.length; i++ ) {
dropdownToggleLinks[ i ].addEventListener( 'click', dropdownClick, false );
dropdownToggleLinks[i].addEventListener( 'keydown', function( e ) {
dropdownToggleLinks[ i ].addEventListener( 'keydown', function( e ) {
var _this = this;
var key = e.which || e.keyCode;
if ( key === 13 ) { // 13 is enter
if ( 'Enter' === e.key ) {
dropdownClick( e, _this );
}
}, false );
}
for ( var i = 0; i < document.querySelectorAll( '.main-nav .menu-item-has-children > a.menu-item-dropdown-click' ).length; i++ ) {
document.querySelectorAll( '.main-nav .menu-item-has-children > a.menu-item-dropdown-click' )[i].addEventListener( 'click', dropdownClick, false );
for ( i = 0; i < document.querySelectorAll( '.main-nav .menu-item-has-children > a.menu-item-dropdown-click' ).length; i++ ) {
document.querySelectorAll( '.main-nav .menu-item-has-children > a.menu-item-dropdown-click' )[ i ].addEventListener( 'click', dropdownClick, false );
}
}
@ -94,31 +95,29 @@
if ( document.querySelector( 'nav ul .toggled-on' ) ) {
var activeSubMenus = document.querySelectorAll( 'nav ul .toggled-on' );
var activeDropdownToggles = document.querySelectorAll( 'nav .dropdown-menu-toggle' );
for ( var i = 0; i < activeSubMenus.length; i++ ) {
activeSubMenus[i].classList.remove( 'toggled-on' );
activeSubMenus[i].closest( '.sfHover' ).classList.remove( 'sfHover' );
for ( i = 0; i < activeSubMenus.length; i++ ) {
activeSubMenus[ i ].classList.remove( 'toggled-on' );
activeSubMenus[ i ].closest( '.sfHover' ).classList.remove( 'sfHover' );
}
for ( var i = 0; i < activeDropdownToggles.length; i++ ) {
activeDropdownToggles[i].setAttribute( 'aria-expanded', 'false' );
}
for ( i = 0; i < activeDropdownToggles.length; i++ ) {
activeDropdownToggles[ i ].setAttribute( 'aria-expanded', 'false' );
}
}
};
// Close sub-menus when clicking elsewhere
document.addEventListener( 'click', function ( event ) {
document.addEventListener( 'click', function( event ) {
if ( ! event.target.closest( '.sfHover' ) ) {
closeSubMenus();
}
}, false);
}, false );
// Close sub-menus on escape key
document.addEventListener( 'keydown', function( e ) {
var key = e.which || e.keyCode;
if ( key === 27 ) { // 27 is esc
if ( 'Escape' === e.key ) { // 27 is esc
closeSubMenus();
}
}, false );
}
})();
}() );

View File

@ -1 +1 @@
!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var c=document.body,t=function(e,t){e.preventDefault(),e.stopPropagation();var n=(t=t||this).closest("li"),o=t.closest("nav").querySelectorAll("ul.toggled-on");if(o&&!t.closest("ul").classList.contains("toggled-on")&&!t.closest("li").classList.contains("sfHover"))for(var l=0;l<o.length;l++)o[l].classList.remove("toggled-on"),o[l].closest("li").classList.remove("sfHover");n.classList.toggle("sfHover");var r,i=n.querySelector(".dropdown-menu-toggle");"false"!==i.getAttribute("aria-expanded")&&i.getAttribute("aria-expanded")?i.setAttribute("aria-expanded","false"):i.setAttribute("aria-expanded","true"),r=n.querySelector(".sub-menu")?".sub-menu":".children",c.classList.contains("dropdown-click-menu-item")?t.parentNode.querySelector(r).classList.toggle("toggled-on"):c.classList.contains("dropdown-click-arrow")&&n.querySelector(r).classList.toggle("toggled-on")},e=document.querySelectorAll(".main-nav .menu-item-has-children > a");if(c.classList.contains("dropdown-click-menu-item"))for(var n=0;n<e.length;n++)e[n].addEventListener("click",t,!0);if(c.classList.contains("dropdown-click-arrow")){for(n=0;n<document.querySelectorAll(".main-nav .menu-item-has-children > a").length;n++)"#"==document.querySelectorAll(".main-nav .menu-item-has-children > a")[n].getAttribute("href")&&document.querySelectorAll(".main-nav .menu-item-has-children > a")[n].classList.add("menu-item-dropdown-click");for(var o=document.querySelectorAll(".main-nav .menu-item-has-children > a .dropdown-menu-toggle"),n=0;n<o.length;n++)o[n].addEventListener("click",t,!1),o[n].addEventListener("keydown",function(e){13===(e.which||e.keyCode)&&t(e,this)},!1);for(n=0;n<document.querySelectorAll(".main-nav .menu-item-has-children > a.menu-item-dropdown-click").length;n++)document.querySelectorAll(".main-nav .menu-item-has-children > a.menu-item-dropdown-click")[n].addEventListener("click",t,!1)}var l=function(){if(document.querySelector("nav ul .toggled-on")){for(var e=document.querySelectorAll("nav ul .toggled-on"),t=document.querySelectorAll("nav .dropdown-menu-toggle"),n=0;n<e.length;n++)e[n].classList.remove("toggled-on"),e[n].closest(".sfHover").classList.remove("sfHover");for(n=0;n<t.length;n++)t[n].setAttribute("aria-expanded","false")}};document.addEventListener("click",function(e){e.target.closest(".sfHover")||l()},!1),document.addEventListener("keydown",function(e){27===(e.which||e.keyCode)&&l()},!1)}}();
!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var r=document.body,t=function(e,t){e.preventDefault(),e.stopPropagation();var n=(t=t||this).closest("li"),o=t.closest("nav").querySelectorAll("ul.toggled-on");if(o&&!t.closest("ul").classList.contains("toggled-on")&&!t.closest("li").classList.contains("sfHover"))for(var l=0;l<o.length;l++)o[l].classList.remove("toggled-on"),o[l].closest("li").classList.remove("sfHover");n.classList.toggle("sfHover");e=n.querySelector(".dropdown-menu-toggle");"false"!==e.getAttribute("aria-expanded")&&e.getAttribute("aria-expanded")?e.setAttribute("aria-expanded","false"):e.setAttribute("aria-expanded","true"),e=n.querySelector(".sub-menu")?".sub-menu":".children",r.classList.contains("dropdown-click-menu-item")?t.parentNode.querySelector(e).classList.toggle("toggled-on"):r.classList.contains("dropdown-click-arrow")&&n.querySelector(e).classList.toggle("toggled-on")},e=document.querySelectorAll(".main-nav .menu-item-has-children > a");if(r.classList.contains("dropdown-click-menu-item"))for(o=0;o<e.length;o++)e[o].addEventListener("click",t,!0);if(r.classList.contains("dropdown-click-arrow")){for(o=0;o<document.querySelectorAll(".main-nav .menu-item-has-children > a").length;o++)"#"===document.querySelectorAll(".main-nav .menu-item-has-children > a")[o].getAttribute("href")&&document.querySelectorAll(".main-nav .menu-item-has-children > a")[o].classList.add("menu-item-dropdown-click");for(var n=document.querySelectorAll(".main-nav .menu-item-has-children > a .dropdown-menu-toggle"),o=0;o<n.length;o++)n[o].addEventListener("click",t,!1),n[o].addEventListener("keydown",function(e){"Enter"===e.key&&t(e,this)},!1);for(o=0;o<document.querySelectorAll(".main-nav .menu-item-has-children > a.menu-item-dropdown-click").length;o++)document.querySelectorAll(".main-nav .menu-item-has-children > a.menu-item-dropdown-click")[o].addEventListener("click",t,!1)}var l=function(){if(document.querySelector("nav ul .toggled-on")){var e=document.querySelectorAll("nav ul .toggled-on"),t=document.querySelectorAll("nav .dropdown-menu-toggle");for(o=0;o<e.length;o++)e[o].classList.remove("toggled-on"),e[o].closest(".sfHover").classList.remove("sfHover");for(o=0;o<t.length;o++)t[o].setAttribute("aria-expanded","false")}};document.addEventListener("click",function(e){e.target.closest(".sfHover")||l()},!1),document.addEventListener("keydown",function(e){"Escape"===e.key&&l()},!1)}}();

View File

@ -1,430 +0,0 @@
( function() {
'use strict';
if ( 'querySelector' in document && 'addEventListener' in window ) {
/**
* matches() pollyfil
* @see https://developer.mozilla.org/en-US/docs/Web/API/Element/closest#Browser_compatibility
*/
if ( ! Element.prototype.matches ) {
Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;
}
/**
* closest() pollyfil
* @see https://developer.mozilla.org/en-US/docs/Web/API/Element/closest#Browser_compatibility
*/
if ( ! Element.prototype.closest ) {
Element.prototype.closest = function( s ) {
var el = this;
var ancestor = this;
if ( ! document.documentElement.contains( el ) ) {
return null;
}
do {
if ( ancestor.matches( s ) ) {
return ancestor;
}
ancestor = ancestor.parentElement;
} while ( ancestor !== null );
return null;
};
}
var getSiblings = function( elem ) {
return Array.prototype.filter.call( elem.parentNode.children, function( sibling ) {
return sibling !== elem;
} );
};
var allNavToggles = document.querySelectorAll( '.menu-toggle' ),
dropdownToggle = document.querySelectorAll( 'nav .dropdown-menu-toggle' ),
navLinks = document.querySelectorAll( 'nav ul a' ),
mobileMenuControls = document.querySelector( '.mobile-menu-control-wrapper' ),
body = document.body,
htmlEl = document.documentElement;
var enableDropdownArrows = function( nav ) {
if ( body.classList.contains( 'dropdown-hover' ) ) {
var dropdownItems = nav.querySelectorAll( 'li.menu-item-has-children' );
for ( var i = 0; i < dropdownItems.length; i++ ) {
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'tabindex', '0' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'role', 'button' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'aria-expanded', 'false' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'aria-label', generatepressMenu.openSubMenuLabel );
}
}
};
var disableDropdownArrows = function( nav ) {
if ( body.classList.contains( 'dropdown-hover' ) ) {
var dropdownItems = nav.querySelectorAll( 'li.menu-item-has-children' );
for ( var i = 0; i < dropdownItems.length; i++ ) {
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'tabindex' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'role', 'presentation' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'aria-expanded' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'aria-label' );
}
}
};
var setDropdownArrowAttributes = function( arrow ) {
if ( 'false' === arrow.getAttribute( 'aria-expanded' ) || ! arrow.getAttribute( 'aria-expanded' ) ) {
arrow.setAttribute( 'aria-expanded', 'true' );
arrow.setAttribute( 'aria-label', generatepressMenu.closeSubMenuLabel );
} else {
arrow.setAttribute( 'aria-expanded', 'false' );
arrow.setAttribute( 'aria-label', generatepressMenu.openSubMenuLabel );
}
};
/**
* Start mobile menu toggle.
*
* @param e The event.
* @param _this The clicked item.
*/
var toggleNav = function( e, _this ) {
if ( ! _this ) {
var _this = this;
}
var parentContainer = '';
if ( _this.getAttribute( 'data-nav' ) ) {
parentContainer = document.getElementById( _this.getAttribute( 'data-nav' ) );
} else {
parentContainer = document.getElementById( _this.closest( 'nav' ).getAttribute( 'id' ) );
}
if ( ! parentContainer ) {
return;
}
var isExternalToggle = false;
if ( _this.closest( '.mobile-menu-control-wrapper' ) ) {
isExternalToggle = true;
}
var nav = parentContainer.getElementsByTagName( 'ul' )[0];
if ( parentContainer.classList.contains( 'toggled' ) ) {
parentContainer.classList.remove( 'toggled' );
htmlEl.classList.remove( 'mobile-menu-open' );
nav.setAttribute( 'aria-hidden', 'true' );
_this.setAttribute( 'aria-expanded', 'false' );
if ( isExternalToggle ) {
mobileMenuControls.classList.remove( 'toggled' );
} else if ( mobileMenuControls && parentContainer.classList.contains( 'main-navigation' ) ) {
mobileMenuControls.classList.remove( 'toggled' );
}
disableDropdownArrows( nav );
} else {
parentContainer.classList.add( 'toggled' );
htmlEl.classList.add( 'mobile-menu-open' );
nav.setAttribute( 'aria-hidden', 'false' );
_this.setAttribute( 'aria-expanded', 'true' );
if ( isExternalToggle ) {
mobileMenuControls.classList.add( 'toggled' );
if ( mobileMenuControls.querySelector( '.search-item' ) ) {
if ( mobileMenuControls.querySelector( '.search-item' ).classList.contains( 'active' ) ) {
mobileMenuControls.querySelector( '.search-item' ).click();
}
}
} else if ( mobileMenuControls && parentContainer.classList.contains( 'main-navigation' ) ) {
mobileMenuControls.classList.add( 'toggled' );
}
enableDropdownArrows( nav );
}
}
for ( var i = 0; i < allNavToggles.length; i++ ) {
allNavToggles[i].addEventListener( 'click', toggleNav, false );
}
/**
* Open sub-menus
*
* @param e The event.
* @param _this The clicked item.
*/
var toggleSubNav = function( e, _this ) {
if ( ! _this ) {
var _this = this;
}
if ( ( _this.closest( 'nav' ).classList.contains( 'toggled' ) || htmlEl.classList.contains( 'slide-opened' ) ) && ! body.classList.contains( 'dropdown-click' ) ) {
e.preventDefault();
var closestLi = _this.closest( 'li' );
setDropdownArrowAttributes( closestLi.querySelector( '.dropdown-menu-toggle' ) );
if ( closestLi.querySelector( '.sub-menu' ) ) {
var subMenu = closestLi.querySelector( '.sub-menu' );
} else {
var subMenu = closestLi.querySelector( '.children' );
}
if ( generatepressMenu.toggleOpenedSubMenus ) {
var siblings = getSiblings( closestLi );
for ( var i = 0; i < siblings.length; i++ ) {
if ( siblings[i].classList.contains( 'sfHover' ) ) {
siblings[i].classList.remove( 'sfHover' );
siblings[i].querySelector( '.toggled-on' ).classList.remove( 'toggled-on' );
setDropdownArrowAttributes( siblings[i].querySelector( '.dropdown-menu-toggle' ) );
}
}
}
closestLi.classList.toggle( 'sfHover' );
subMenu.classList.toggle( 'toggled-on' );
}
e.stopPropagation();
}
for ( var i = 0; i < dropdownToggle.length; i++ ) {
dropdownToggle[i].addEventListener( 'click', toggleSubNav, false );
dropdownToggle[i].addEventListener( 'keypress', function( e ) {
var key = e.which || e.keyCode;
if (key === 13) { // 13 is enter
toggleSubNav( e, this );
}
}, false );
}
/**
* Disable the mobile menu if our toggle isn't visible.
* Makes it possible to style mobile item with .toggled class.
*/
var checkMobile = function() {
var openedMobileMenus = document.querySelectorAll( '.toggled, .has-active-search' );
for ( var i = 0; i < openedMobileMenus.length; i++ ) {
var menuToggle = openedMobileMenus[i].querySelector( '.menu-toggle' );
if ( mobileMenuControls && ! menuToggle.closest( 'nav' ).classList.contains( 'mobile-menu-control-wrapper' ) ) {
menuToggle = mobileMenuControls.querySelector( '.menu-toggle' );
}
if ( menuToggle && menuToggle.offsetParent === null ) {
if ( openedMobileMenus[i].classList.contains( 'toggled' ) ) {
var remoteNav = false;
if ( openedMobileMenus[i].classList.contains( 'mobile-menu-control-wrapper' ) ) {
remoteNav = true;
}
if ( ! remoteNav ) {
// Navigation is toggled, but .menu-toggle isn't visible on the page (display: none).
var closestNav = openedMobileMenus[i].getElementsByTagName( 'ul' )[ 0 ],
closestNavItems = closestNav.getElementsByTagName( 'li' ),
closestSubMenus = closestNav.getElementsByTagName( 'ul' );
}
document.activeElement.blur();
openedMobileMenus[i].classList.remove( 'toggled' );
htmlEl.classList.remove( 'mobile-menu-open' );
menuToggle.setAttribute( 'aria-expanded', 'false' );
if ( ! remoteNav ) {
for ( var li = 0; li < closestNavItems.length; li++ ) {
closestNavItems[li].classList.remove( 'sfHover' );
}
for ( var sm = 0; sm < closestSubMenus.length; sm++ ) {
closestSubMenus[sm].classList.remove( 'toggled-on' );
}
if ( closestNav ) {
closestNav.removeAttribute( 'aria-hidden' );
}
}
disableDropdownArrows( openedMobileMenus[i] );
}
if ( mobileMenuControls.querySelector( '.search-item' ) ) {
if ( mobileMenuControls.querySelector( '.search-item' ).classList.contains( 'active' ) ) {
mobileMenuControls.querySelector( '.search-item' ).click();
}
}
}
}
}
window.addEventListener( 'resize', checkMobile, false );
window.addEventListener( 'orientationchange', checkMobile, false );
if ( body.classList.contains( 'dropdown-hover' ) ) {
/**
* Do some essential things when menu items are clicked.
*/
for ( var i = 0; i < navLinks.length; i++ ) {
navLinks[i].addEventListener( 'click', function( e ) {
// Remove sfHover class if we're going to another site.
if ( this.hostname !== window.location.hostname ) {
document.activeElement.blur();
}
var closest_nav = this.closest( 'nav' );
if ( closest_nav.classList.contains( 'toggled' ) || htmlEl.classList.contains( 'slide-opened' ) ) {
var url = this.getAttribute( 'href' );
// Open the sub-menu if the link has no destination
if ( '#' == url || '' == url ) {
e.preventDefault();
var closestLi = this.closest( 'li' );
closestLi.classList.toggle( 'sfHover' );
var subMenu = closestLi.querySelector( '.sub-menu' );
if ( subMenu ) {
subMenu.classList.toggle( 'toggled-on' );
}
}
}
}, false );
}
}
}
})();
( function() {
'use strict';
if ( 'querySelector' in document && 'addEventListener' in window ) {
var body = document.body;
body.addEventListener( 'mousedown', function() {
body.classList.add( 'using-mouse' );
} );
body.addEventListener( 'keydown', function() {
body.classList.remove( 'using-mouse' );
} );
if ( body.classList.contains( 'dropdown-hover' ) ) {
var navLinks = document.querySelectorAll( 'nav .main-nav ul a' ),
menuBarItems = document.querySelectorAll( '.menu-bar-items .menu-bar-item > a' );
/**
* Make menu items tab accessible when using the hover dropdown type
*/
var toggleFocus = function() {
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) || this.closest( 'nav' ).classList.contains( 'slideout-navigation' ) ) {
return;
}
var self = this;
while ( -1 === self.className.indexOf( 'main-nav' ) ) {
if ( 'li' === self.tagName.toLowerCase() ) {
self.classList.toggle( 'sfHover' );
}
self = self.parentElement;
}
}
/**
* Make our menu bar items tab accessible.
*/
var toggleMenuBarItemFocus = function() {
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) || this.closest( 'nav' ).classList.contains( 'slideout-navigation' ) ) {
return;
}
var self = this;
while ( -1 === self.className.indexOf( 'menu-bar-items' ) ) {
if ( self.classList.contains( 'menu-bar-item' ) ) {
self.classList.toggle( 'sfHover' );
}
self = self.parentElement;
}
}
for ( var i = 0; i < navLinks.length; i++ ) {
navLinks[i].addEventListener( 'focus', toggleFocus );
navLinks[i].addEventListener( 'blur', toggleFocus );
}
for ( var i = 0; i < menuBarItems.length; i++ ) {
menuBarItems[i].addEventListener( 'focus', toggleMenuBarItemFocus );
menuBarItems[i].addEventListener( 'blur', toggleMenuBarItemFocus );
}
}
}
/**
* Make hover dropdown touch-friendly.
*/
if ( 'ontouchend' in document.documentElement && document.body.classList.contains( 'dropdown-hover' ) ) {
var parentElements = document.querySelectorAll( '.sf-menu .menu-item-has-children' );
for ( var i = 0; i < parentElements.length; i++ ) {
parentElements[i].addEventListener( 'touchend', function( e ) {
// Bail on mobile
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) ) {
return;
}
if ( e.touches.length === 1 || e.touches.length === 0 ) {
// Prevent touch events within dropdown bubbling down to document
e.stopPropagation();
// Toggle hover
if ( ! this.classList.contains( 'sfHover' ) ) {
// Prevent link on first touch
if ( e.target === this || e.target.parentNode === this || e.target.parentNode.parentNode ) {
e.preventDefault();
}
var getSiblings = function( elem ) {
return Array.prototype.filter.call( elem.parentNode.children, function( sibling ) {
return sibling !== elem;
} );
};
// Close other sub-menus.
var closestLi = this.closest( 'li' ),
siblings = getSiblings( closestLi );
for ( var i = 0; i < siblings.length; i++ ) {
if ( siblings[i].classList.contains( 'sfHover' ) ) {
siblings[i].classList.remove( 'sfHover' );
}
}
this.classList.add( 'sfHover' );
// Hide dropdown on touch outside
var closeDropdown,
thisItem = this;
document.addEventListener( 'touchend', closeDropdown = function(e) {
e.stopPropagation();
thisItem.classList.remove( 'sfHover' );
document.removeEventListener( 'touchend', closeDropdown );
} );
}
}
} );
}
}
} )();

File diff suppressed because one or more lines are too long

View File

@ -4,6 +4,7 @@
if ( 'querySelector' in document && 'addEventListener' in window ) {
/**
* matches() pollyfil
*
* @see https://developer.mozilla.org/en-US/docs/Web/API/Element/closest#Browser_compatibility
*/
if ( ! Element.prototype.matches ) {
@ -12,7 +13,10 @@
/**
* closest() pollyfil
*
* @see https://developer.mozilla.org/en-US/docs/Web/API/Element/closest#Browser_compatibility
* @param {Object} s The element to check.
* @return {Object} The closest object.
*/
if ( ! Element.prototype.closest ) {
Element.prototype.closest = function( s ) {
@ -38,21 +42,22 @@
};
var allNavToggles = document.querySelectorAll( '.menu-toggle' ),
dropdownToggle = document.querySelectorAll( 'nav .dropdown-menu-toggle' ),
navLinks = document.querySelectorAll( 'nav ul a' ),
dropdownToggles = document.querySelectorAll( 'nav .dropdown-menu-toggle' ),
navLinks = document.querySelectorAll( 'nav .main-nav ul a' ),
mobileMenuControls = document.querySelector( '.mobile-menu-control-wrapper' ),
body = document.body,
htmlEl = document.documentElement;
htmlEl = document.documentElement,
i;
var enableDropdownArrows = function( nav ) {
if ( body.classList.contains( 'dropdown-hover' ) ) {
var dropdownItems = nav.querySelectorAll( 'li.menu-item-has-children' );
for ( var i = 0; i < dropdownItems.length; i++ ) {
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'tabindex', '0' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'role', 'button' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'aria-expanded', 'false' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'aria-label', generatepressMenu.openSubMenuLabel );
for ( i = 0; i < dropdownItems.length; i++ ) {
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'tabindex', '0' );
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'role', 'button' );
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'aria-expanded', 'false' );
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'aria-label', generatepressMenu.openSubMenuLabel );
}
}
};
@ -61,11 +66,11 @@
if ( body.classList.contains( 'dropdown-hover' ) ) {
var dropdownItems = nav.querySelectorAll( 'li.menu-item-has-children' );
for ( var i = 0; i < dropdownItems.length; i++ ) {
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'tabindex' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'role', 'presentation' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'aria-expanded' );
dropdownItems[i].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'aria-label' );
for ( i = 0; i < dropdownItems.length; i++ ) {
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'tabindex' );
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).setAttribute( 'role', 'presentation' );
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'aria-expanded' );
dropdownItems[ i ].querySelector( '.dropdown-menu-toggle' ).removeAttribute( 'aria-label' );
}
}
};
@ -83,12 +88,12 @@
/**
* Start mobile menu toggle.
*
* @param e The event.
* @param _this The clicked item.
* @param {Object} e The event.
* @param {Object} _this The clicked item.
*/
var toggleNav = function( e, _this ) {
if ( ! _this ) {
var _this = this;
_this = this;
}
var parentContainer = '';
@ -109,7 +114,7 @@
isExternalToggle = true;
}
var nav = parentContainer.getElementsByTagName( 'ul' )[0];
var nav = parentContainer.getElementsByTagName( 'ul' )[ 0 ];
if ( parentContainer.classList.contains( 'toggled' ) ) {
parentContainer.classList.remove( 'toggled' );
@ -144,22 +149,21 @@
enableDropdownArrows( nav );
}
}
};
for ( var i = 0; i < allNavToggles.length; i++ ) {
allNavToggles[i].addEventListener( 'click', toggleNav, false );
for ( i = 0; i < allNavToggles.length; i++ ) {
allNavToggles[ i ].addEventListener( 'click', toggleNav, false );
}
/**
* Open sub-menus
*
* @param e The event.
* @param _this The clicked item.
* @param {Object} e The event.
* @param {Object} _this The clicked item.
*/
var toggleSubNav = function( e, _this ) {
if ( ! _this ) {
var _this = this;
_this = this;
}
if ( ( _this.closest( 'nav' ).classList.contains( 'toggled' ) || htmlEl.classList.contains( 'slide-opened' ) ) && ! body.classList.contains( 'dropdown-click' ) ) {
@ -171,17 +175,17 @@
if ( closestLi.querySelector( '.sub-menu' ) ) {
var subMenu = closestLi.querySelector( '.sub-menu' );
} else {
var subMenu = closestLi.querySelector( '.children' );
subMenu = closestLi.querySelector( '.children' );
}
if ( generatepressMenu.toggleOpenedSubMenus ) {
var siblings = getSiblings( closestLi );
for ( var i = 0; i < siblings.length; i++ ) {
if ( siblings[i].classList.contains( 'sfHover' ) ) {
siblings[i].classList.remove( 'sfHover' );
siblings[i].querySelector( '.toggled-on' ).classList.remove( 'toggled-on' );
setDropdownArrowAttributes( siblings[i].querySelector( '.dropdown-menu-toggle' ) );
for ( i = 0; i < siblings.length; i++ ) {
if ( siblings[ i ].classList.contains( 'sfHover' ) ) {
siblings[ i ].classList.remove( 'sfHover' );
siblings[ i ].querySelector( '.toggled-on' ).classList.remove( 'toggled-on' );
setDropdownArrowAttributes( siblings[ i ].querySelector( '.dropdown-menu-toggle' ) );
}
}
}
@ -191,13 +195,12 @@
}
e.stopPropagation();
}
};
for ( var i = 0; i < dropdownToggle.length; i++ ) {
dropdownToggle[i].addEventListener( 'click', toggleSubNav, false );
dropdownToggle[i].addEventListener( 'keypress', function( e ) {
var key = e.which || e.keyCode;
if (key === 13) { // 13 is enter
for ( i = 0; i < dropdownToggles.length; i++ ) {
dropdownToggles[ i ].addEventListener( 'click', toggleSubNav, false );
dropdownToggles[ i ].addEventListener( 'keypress', function( e ) {
if ( 'Enter' === e.key ) { // 13 is enter
toggleSubNav( e, this );
}
}, false );
@ -210,41 +213,41 @@
var checkMobile = function() {
var openedMobileMenus = document.querySelectorAll( '.toggled, .has-active-search' );
for ( var i = 0; i < openedMobileMenus.length; i++ ) {
var menuToggle = openedMobileMenus[i].querySelector( '.menu-toggle' );
for ( i = 0; i < openedMobileMenus.length; i++ ) {
var menuToggle = openedMobileMenus[ i ].querySelector( '.menu-toggle' );
if ( mobileMenuControls && ! menuToggle.closest( 'nav' ).classList.contains( 'mobile-menu-control-wrapper' ) ) {
menuToggle = mobileMenuControls.querySelector( '.menu-toggle' );
}
if ( menuToggle && menuToggle.offsetParent === null ) {
if ( openedMobileMenus[i].classList.contains( 'toggled' ) ) {
if ( openedMobileMenus[ i ].classList.contains( 'toggled' ) ) {
var remoteNav = false;
if ( openedMobileMenus[i].classList.contains( 'mobile-menu-control-wrapper' ) ) {
if ( openedMobileMenus[ i ].classList.contains( 'mobile-menu-control-wrapper' ) ) {
remoteNav = true;
}
if ( ! remoteNav ) {
// Navigation is toggled, but .menu-toggle isn't visible on the page (display: none).
var closestNav = openedMobileMenus[i].getElementsByTagName( 'ul' )[ 0 ],
var closestNav = openedMobileMenus[ i ].getElementsByTagName( 'ul' )[ 0 ],
closestNavItems = closestNav.getElementsByTagName( 'li' ),
closestSubMenus = closestNav.getElementsByTagName( 'ul' );
}
document.activeElement.blur();
openedMobileMenus[i].classList.remove( 'toggled' );
openedMobileMenus[ i ].classList.remove( 'toggled' );
htmlEl.classList.remove( 'mobile-menu-open' );
menuToggle.setAttribute( 'aria-expanded', 'false' );
if ( ! remoteNav ) {
for ( var li = 0; li < closestNavItems.length; li++ ) {
closestNavItems[li].classList.remove( 'sfHover' );
closestNavItems[ li ].classList.remove( 'sfHover' );
}
for ( var sm = 0; sm < closestSubMenus.length; sm++ ) {
closestSubMenus[sm].classList.remove( 'toggled-on' );
closestSubMenus[ sm ].classList.remove( 'toggled-on' );
}
if ( closestNav ) {
@ -252,7 +255,7 @@
}
}
disableDropdownArrows( openedMobileMenus[i] );
disableDropdownArrows( openedMobileMenus[ i ] );
}
if ( mobileMenuControls.querySelector( '.search-item' ) ) {
@ -262,7 +265,7 @@
}
}
}
}
};
window.addEventListener( 'resize', checkMobile, false );
window.addEventListener( 'orientationchange', checkMobile, false );
@ -270,19 +273,19 @@
/**
* Do some essential things when menu items are clicked.
*/
for ( var i = 0; i < navLinks.length; i++ ) {
navLinks[i].addEventListener( 'click', function( e ) {
for ( i = 0; i < navLinks.length; i++ ) {
navLinks[ i ].addEventListener( 'click', function( e ) {
// Remove sfHover class if we're going to another site.
if ( this.hostname !== window.location.hostname ) {
document.activeElement.blur();
}
var closest_nav = this.closest( 'nav' );
if ( closest_nav.classList.contains( 'toggled' ) || htmlEl.classList.contains( 'slide-opened' ) ) {
var closestNav = this.closest( 'nav' );
if ( closestNav.classList.contains( 'toggled' ) || htmlEl.classList.contains( 'slide-opened' ) ) {
var url = this.getAttribute( 'href' );
// Open the sub-menu if the link has no destination
if ( '#' == url || '' == url ) {
if ( '#' === url || '' === url ) {
e.preventDefault();
var closestLi = this.closest( 'li' );
closestLi.classList.toggle( 'sfHover' );
@ -297,6 +300,108 @@
}
}
if ( body.classList.contains( 'dropdown-hover' ) ) {
var menuBarItems = document.querySelectorAll( '.menu-bar-items .menu-bar-item > a' );
/**
* Make menu items tab accessible when using the hover dropdown type
*/
var toggleFocus = function() {
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) || this.closest( 'nav' ).classList.contains( 'slideout-navigation' ) ) {
return;
}
})();
var self = this;
while ( -1 === self.className.indexOf( 'main-nav' ) ) {
if ( 'li' === self.tagName.toLowerCase() ) {
self.classList.toggle( 'sfHover' );
}
self = self.parentElement;
}
};
/**
* Make our menu bar items tab accessible.
*/
var toggleMenuBarItemFocus = function() {
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) || this.closest( 'nav' ).classList.contains( 'slideout-navigation' ) ) {
return;
}
var self = this;
while ( -1 === self.className.indexOf( 'menu-bar-items' ) ) {
if ( self.classList.contains( 'menu-bar-item' ) ) {
self.classList.toggle( 'sfHover' );
}
self = self.parentElement;
}
};
for ( i = 0; i < navLinks.length; i++ ) {
navLinks[ i ].addEventListener( 'focus', toggleFocus );
navLinks[ i ].addEventListener( 'blur', toggleFocus );
}
for ( i = 0; i < menuBarItems.length; i++ ) {
menuBarItems[ i ].addEventListener( 'focus', toggleMenuBarItemFocus );
menuBarItems[ i ].addEventListener( 'blur', toggleMenuBarItemFocus );
}
}
/**
* Make hover dropdown touch-friendly.
*/
if ( 'ontouchend' in document.documentElement && document.body.classList.contains( 'dropdown-hover' ) ) {
var parentElements = document.querySelectorAll( '.sf-menu .menu-item-has-children' );
for ( i = 0; i < parentElements.length; i++ ) {
parentElements[ i ].addEventListener( 'touchend', function( e ) {
// Bail on mobile
if ( this.closest( 'nav' ).classList.contains( 'toggled' ) ) {
return;
}
if ( e.touches.length === 1 || e.touches.length === 0 ) {
// Prevent touch events within dropdown bubbling down to document
e.stopPropagation();
// Toggle hover
if ( ! this.classList.contains( 'sfHover' ) ) {
// Prevent link on first touch
if ( e.target === this || e.target.parentNode === this || e.target.parentNode.parentNode ) {
e.preventDefault();
}
// Close other sub-menus.
var closestLi = this.closest( 'li' ),
siblings = getSiblings( closestLi );
for ( i = 0; i < siblings.length; i++ ) {
if ( siblings[ i ].classList.contains( 'sfHover' ) ) {
siblings[ i ].classList.remove( 'sfHover' );
}
}
this.classList.add( 'sfHover' );
// Hide dropdown on touch outside
var closeDropdown,
thisItem = this;
document.addEventListener( 'touchend', closeDropdown = function( event ) {
event.stopPropagation();
thisItem.classList.remove( 'sfHover' );
document.removeEventListener( 'touchend', closeDropdown );
} );
}
}
} );
}
}
}
}() );

File diff suppressed because one or more lines are too long

View File

@ -5,19 +5,19 @@
/**
* Navigation search.
*
* @param e The event.
* @param _this The clicked item.
* @param {Object} e The event.
* @param {Object} item The clicked item.
*/
var toggleSearch = function( e, item ) {
e.preventDefault();
if ( ! item ) {
var item = this;
item = this;
}
var forms = document.querySelectorAll( '.navigation-search' ),
toggles = document.querySelectorAll( '.search-item' ),
focusableEls = document.querySelectorAll('a[href], area[href], input:not([disabled]):not(.navigation-search), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [tabindex="0"]'),
focusableEls = document.querySelectorAll( 'a[href], area[href], input:not([disabled]):not(.navigation-search), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [tabindex="0"]' ),
nav = '';
if ( item.closest( '.mobile-menu-control-wrapper' ) ) {
@ -25,39 +25,39 @@
}
for ( var i = 0; i < forms.length; i++ ) {
if ( forms[i].classList.contains( 'nav-search-active' ) ) {
if ( forms[i].closest( '#sticky-placeholder' ) ) {
if ( forms[ i ].classList.contains( 'nav-search-active' ) ) {
if ( forms[ i ].closest( '#sticky-placeholder' ) ) {
continue;
}
forms[i].classList.remove( 'nav-search-active' );
forms[ i ].classList.remove( 'nav-search-active' );
var activeSearch = document.querySelector( '.has-active-search' );;
var activeSearch = document.querySelector( '.has-active-search' );
if ( activeSearch ) {
activeSearch.classList.remove( 'has-active-search' );
}
for ( var t = 0; t < toggles.length; t++ ) {
toggles[t].classList.remove( 'close-search' );
toggles[t].classList.remove( 'active' );
toggles[t].querySelector( 'a' ).setAttribute( 'aria-label', generatepressNavSearch.open );
toggles[ t ].classList.remove( 'close-search' );
toggles[ t ].classList.remove( 'active' );
toggles[ t ].querySelector( 'a' ).setAttribute( 'aria-label', generatepressNavSearch.open );
// Allow tabindex on items again.
for ( var f = 0; f < focusableEls.length; f++ ) {
if ( ! focusableEls[f].closest( '.navigation-search' ) && ! focusableEls[f].closest( '.search-item' ) ) {
focusableEls[f].removeAttribute( 'tabindex' );
if ( ! focusableEls[ f ].closest( '.navigation-search' ) && ! focusableEls[ f ].closest( '.search-item' ) ) {
focusableEls[ f ].removeAttribute( 'tabindex' );
}
}
};
}
document.activeElement.blur();
} else {
if ( forms[i].closest( '#sticky-placeholder' ) ) {
if ( forms[ i ].closest( '#sticky-placeholder' ) ) {
continue;
}
var openedMobileMenu = forms[i].closest( '.toggled' );
var openedMobileMenu = forms[ i ].closest( '.toggled' );
if ( openedMobileMenu ) {
// Close the mobile menu.
@ -68,7 +68,7 @@
nav.classList.add( 'has-active-search' );
}
forms[i].classList.add( 'nav-search-active' );
forms[ i ].classList.add( 'nav-search-active' );
var container = this.closest( 'nav' );
@ -84,40 +84,38 @@
}
}
for ( var t = 0; t < toggles.length; t++ ) {
toggles[t].classList.add( 'active' );
toggles[t].querySelector( 'a' ).setAttribute( 'aria-label', generatepressNavSearch.close );
for ( t = 0; t < toggles.length; t++ ) {
toggles[ t ].classList.add( 'active' );
toggles[ t ].querySelector( 'a' ).setAttribute( 'aria-label', generatepressNavSearch.close );
// Trap tabindex within the search element
for ( var f = 0; f < focusableEls.length; f++ ) {
if ( ! focusableEls[f].closest( '.navigation-search' ) && ! focusableEls[f].closest( '.search-item' ) ) {
focusableEls[f].setAttribute( 'tabindex', '-1' );
for ( f = 0; f < focusableEls.length; f++ ) {
if ( ! focusableEls[ f ].closest( '.navigation-search' ) && ! focusableEls[ f ].closest( '.search-item' ) ) {
focusableEls[ f ].setAttribute( 'tabindex', '-1' );
}
}
toggles[ t ].classList.add( 'close-search' );
}
}
}
};
toggles[t].classList.add( 'close-search' );
}
}
}
}
if ( document.body.classList.contains( 'nav-search-enabled' ) ) {
var searchItems = document.querySelectorAll( '.search-item' );
for ( var i = 0; i < searchItems.length; i++ ) {
searchItems[i].addEventListener( 'click', toggleSearch, false );
searchItems[ i ].addEventListener( 'click', toggleSearch, false );
}
// Close navigation search on escape key
document.addEventListener( 'keydown', function( e ) {
if ( document.querySelector( '.navigation-search.nav-search-active' ) ) {
var key = e.which || e.keyCode;
if ( key === 27 ) { // 27 is esc
if ( 'Escape' === e.key ) {
var activeSearchItems = document.querySelectorAll( '.search-item.active' );
for ( var i = 0; i < activeSearchItems.length; i++ ) {
toggleSearch( e, activeSearchItems[i] );
for ( var activeSearchItem = 0; activeSearchItem < activeSearchItems.length; activeSearchItem++ ) {
toggleSearch( e, activeSearchItems[ activeSearchItem ] );
break;
}
}
@ -125,4 +123,4 @@
}, false );
}
}
})();
}() );

View File

@ -1 +1 @@
!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var s=function(e,t){e.preventDefault(),t=t||this;var a=document.querySelectorAll(".navigation-search"),s=document.querySelectorAll(".search-item"),c=document.querySelectorAll('a[href], area[href], input:not([disabled]):not(.navigation-search), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [tabindex="0"]'),r="";t.closest(".mobile-menu-control-wrapper")&&(r=document.getElementById("site-navigation"));for(var n=0;n<a.length;n++)if(a[n].classList.contains("nav-search-active")){if(a[n].closest("#sticky-placeholder"))continue;a[n].classList.remove("nav-search-active");var i=document.querySelector(".has-active-search");i&&i.classList.remove("has-active-search");for(var o=0;o<s.length;o++){s[o].classList.remove("close-search"),s[o].classList.remove("active"),s[o].querySelector("a").setAttribute("aria-label",generatepressNavSearch.open);for(var l=0;l<c.length;l++)c[l].closest(".navigation-search")||c[l].closest(".search-item")||c[l].removeAttribute("tabindex")}document.activeElement.blur()}else{if(a[n].closest("#sticky-placeholder"))continue;var d=a[n].closest(".toggled");d&&d.querySelector("button.menu-toggle").click(),r&&r.classList.add("has-active-search"),a[n].classList.add("nav-search-active");var v,u=this.closest("nav");u&&(u.classList.contains("mobile-menu-control-wrapper")&&(u=r),(v=u.querySelector(".search-field"))&&v.focus());for(o=0;o<s.length;o++){s[o].classList.add("active"),s[o].querySelector("a").setAttribute("aria-label",generatepressNavSearch.close);for(l=0;l<c.length;l++)c[l].closest(".navigation-search")||c[l].closest(".search-item")||c[l].setAttribute("tabindex","-1");s[o].classList.add("close-search")}}};if(document.body.classList.contains("nav-search-enabled")){for(var e=document.querySelectorAll(".search-item"),t=0;t<e.length;t++)e[t].addEventListener("click",s,!1);document.addEventListener("keydown",function(e){if(document.querySelector(".navigation-search.nav-search-active")&&27===(e.which||e.keyCode))for(var t=document.querySelectorAll(".search-item.active"),a=0;a<t.length;a++){s(e,t[a]);break}},!1)}}}();
!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var s=function(e,t){e.preventDefault(),t=t||this;var a=document.querySelectorAll(".navigation-search"),s=document.querySelectorAll(".search-item"),c=document.querySelectorAll('a[href], area[href], input:not([disabled]):not(.navigation-search), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [tabindex="0"]'),r="";t.closest(".mobile-menu-control-wrapper")&&(r=document.getElementById("site-navigation"));for(var i=0;i<a.length;i++)if(a[i].classList.contains("nav-search-active")){if(!a[i].closest("#sticky-placeholder")){a[i].classList.remove("nav-search-active");var n=document.querySelector(".has-active-search");n&&n.classList.remove("has-active-search");for(var o=0;o<s.length;o++){s[o].classList.remove("close-search"),s[o].classList.remove("active"),s[o].querySelector("a").setAttribute("aria-label",generatepressNavSearch.open);for(var l=0;l<c.length;l++)c[l].closest(".navigation-search")||c[l].closest(".search-item")||c[l].removeAttribute("tabindex")}document.activeElement.blur()}}else if(!a[i].closest("#sticky-placeholder")){n=a[i].closest(".toggled");n&&n.querySelector("button.menu-toggle").click(),r&&r.classList.add("has-active-search"),a[i].classList.add("nav-search-active");n=this.closest("nav");for(!n||(n=(n=n.classList.contains("mobile-menu-control-wrapper")?r:n).querySelector(".search-field"))&&n.focus(),o=0;o<s.length;o++){for(s[o].classList.add("active"),s[o].querySelector("a").setAttribute("aria-label",generatepressNavSearch.close),l=0;l<c.length;l++)c[l].closest(".navigation-search")||c[l].closest(".search-item")||c[l].setAttribute("tabindex","-1");s[o].classList.add("close-search")}}};if(document.body.classList.contains("nav-search-enabled")){for(var e=document.querySelectorAll(".search-item"),t=0;t<e.length;t++)e[t].addEventListener("click",s,!1);document.addEventListener("keydown",function(e){if(document.querySelector(".navigation-search.nav-search-active")&&"Escape"===e.key)for(var t=document.querySelectorAll(".search-item.active"),a=0;a<t.length;a++){s(e,t[a]);break}},!1)}}}();

View File

@ -22,7 +22,7 @@ if ( ! defined( 'ABSPATH' ) ) {
do_action( 'generate_before_content' );
?>
<header class="entry-header">
<header <?php generate_do_attr( 'entry-header' ); ?>>
<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- HTML is allowed in filter here. ?>
<h1 class="entry-title" itemprop="headline"><?php echo apply_filters( 'generate_404_title', __( 'Oops! That page can&rsquo;t be found.', 'generatepress' ) ); ?></h1>
</header>

View File

@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
if ( generate_show_entry_header() ) :
?>
<header class="entry-header">
<header <?php generate_do_attr( 'entry-header' ); ?>>
<?php
/**
* generate_before_entry_title hook.

View File

@ -25,7 +25,7 @@ if ( ! defined( 'ABSPATH' ) ) {
if ( generate_show_entry_header() ) :
?>
<header class="entry-header">
<header <?php generate_do_attr( 'entry-header' ); ?>>
<?php
/**
* generate_before_page_title hook.

View File

@ -24,7 +24,7 @@ if ( ! defined( 'ABSPATH' ) ) {
if ( generate_show_entry_header() ) :
?>
<header class="entry-header">
<header <?php generate_do_attr( 'entry-header' ); ?>>
<?php
/**
* generate_before_entry_title hook.

View File

@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
if ( generate_show_entry_header() ) :
?>
<header class="entry-header">
<header <?php generate_do_attr( 'entry-header' ); ?>>
<?php
/**
* generate_before_entry_title hook.

View File

@ -22,7 +22,7 @@ if ( ! defined( 'ABSPATH' ) ) {
do_action( 'generate_before_footer' );
?>
<div <?php generate_do_element_classes( 'footer' ); ?>>
<div <?php generate_do_attr( 'footer' ); ?>>
<?php
/**
* generate_before_footer_content hook.

View File

@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
}
// Set our theme version.
define( 'GENERATE_VERSION', '3.0.4' );
define( 'GENERATE_VERSION', '3.1.0' );
if ( ! function_exists( 'generate_setup' ) ) {
add_action( 'after_setup_theme', 'generate_setup' );
@ -36,6 +36,12 @@ if ( ! function_exists( 'generate_setup' ) ) {
add_theme_support( 'align-wide' );
add_theme_support( 'responsive-embeds' );
$color_palette = generate_get_editor_color_palette();
if ( ! empty( $color_palette ) ) {
add_theme_support( 'editor-color-palette', $color_palette );
}
add_theme_support(
'custom-logo',
array(
@ -82,12 +88,16 @@ require $theme_dir . '/inc/markup.php';
require $theme_dir . '/inc/typography.php';
require $theme_dir . '/inc/plugin-compat.php';
require $theme_dir . '/inc/block-editor.php';
require $theme_dir . '/inc/class-typography.php';
require $theme_dir . '/inc/class-typography-migration.php';
require $theme_dir . '/inc/class-html-attributes.php';
require $theme_dir . '/inc/class-theme-update.php';
require $theme_dir . '/inc/class-rest.php';
require $theme_dir . '/inc/deprecated.php';
if ( is_admin() ) {
require $theme_dir . '/inc/meta-box.php';
require $theme_dir . '/inc/dashboard.php';
require $theme_dir . '/inc/class-dashboard.php';
}
/**

View File

@ -56,7 +56,7 @@ if ( ! defined( 'ABSPATH' ) ) {
do_action( 'generate_after_header' );
?>
<div id="page" <?php generate_do_element_classes( 'page' ); ?>>
<div <?php generate_do_attr( 'page' ); ?>>
<?php
/**
* generate_inside_site_container hook.
@ -65,7 +65,7 @@ if ( ! defined( 'ABSPATH' ) ) {
*/
do_action( 'generate_inside_site_container' );
?>
<div id="content" class="site-content">
<div <?php generate_do_attr( 'site-content' ); ?>>
<?php
/**
* generate_inside_container hook.

View File

@ -108,7 +108,20 @@ function generate_enqueue_backend_block_editor_assets() {
if ( $show_editor_styles ) {
wp_add_inline_style( 'generate-block-editor-styles', wp_strip_all_tags( generate_do_inline_block_editor_css() ) );
if ( generate_is_using_dynamic_typography() ) {
wp_enqueue_style( 'generate-editor-typography', get_template_directory_uri() . '/assets/css/admin/editor-typography.css', false, GENERATE_VERSION, 'all' );
wp_add_inline_style( 'generate-editor-typography', wp_strip_all_tags( GeneratePress_Typography::get_css( 'core', 'editor' ) ) );
}
}
wp_enqueue_script(
'generate-block-editor',
trailingslashit( get_template_directory_uri() ) . 'assets/dist/block-editor.js',
array( 'wp-i18n', 'wp-components', 'wp-element' ),
GENERATE_VERSION,
true
);
$color_settings = wp_parse_args(
get_option( 'generate_settings', array() ),
@ -177,6 +190,28 @@ function generate_do_inline_block_editor_css() {
absint( $spacing_settings['content_right'] ) . 'px'
);
$css->set_selector( ':root' );
$global_colors = generate_get_global_colors();
if ( ! empty( $global_colors ) ) {
foreach ( (array) $global_colors as $key => $data ) {
if ( ! empty( $data['slug'] ) && ! empty( $data['color'] ) ) {
$css->add_property( '--' . $data['slug'], $data['color'] );
}
}
foreach ( (array) $global_colors as $key => $data ) {
if ( ! empty( $data['slug'] ) && ! empty( $data['color'] ) ) {
$css->set_selector( '.has-' . $data['slug'] . '-color' );
$css->add_property( 'color', $data['color'] );
$css->set_selector( '.has-' . $data['slug'] . '-background-color' );
$css->add_property( 'background-color', $data['color'] );
}
}
}
$css->set_selector( 'body .wp-block, html body.gutenberg-editor-page .editor-post-title__block, html body.gutenberg-editor-page .editor-default-block-appender, html body.gutenberg-editor-page .editor-block-list__block' );
if ( 'true' === get_post_meta( get_the_ID(), '_generate-full-width-content', true ) ) {
@ -191,6 +226,31 @@ function generate_do_inline_block_editor_css() {
$css->set_selector( '.wp-block[data-align="wide"]' );
$css->add_property( 'max-width', absint( $content_width ), false, 'px' );
$underline_links = generate_get_option( 'underline_links' );
if ( 'never' !== $underline_links ) {
if ( 'always' === $underline_links ) {
$css->set_selector( '.wp-block a' );
$css->add_property( 'text-decoration', 'underline' );
}
if ( 'hover' === $underline_links ) {
$css->set_selector( '.wp-block a:hover, .wp-block a:focus' );
$css->add_property( 'text-decoration', 'underline' );
}
if ( 'not-hover' === $underline_links ) {
$css->set_selector( '.wp-block a' );
$css->add_property( 'text-decoration', 'underline' );
$css->set_selector( '.wp-block a:hover, .wp-block a:focus' );
$css->add_property( 'text-decoration', 'none' );
}
$css->set_selector( 'a.button, .wp-block-button__link' );
$css->add_property( 'text-decoration', 'none' );
}
if ( apply_filters( 'generate_do_group_inner_container_style', true ) ) {
$css->set_selector( '.wp-block-group__inner-container' );
$css->add_property( 'max-width', absint( $content_width ), false, 'px' );
@ -199,14 +259,18 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'padding', generate_padding_css( $spacing_settings['content_top'], $spacing_settings['content_right'], $spacing_settings['content_bottom'], $spacing_settings['content_left'] ) );
}
$css->set_selector( '.editor-styles-wrapper a.button, .wp-block-button__link:not(.has-background)' );
$css->set_selector( '.editor-styles-wrapper a.button, .editor-styles-wrapper a.button:visited, .wp-block-button__link:not(.has-background)' );
$css->add_property( 'color', $color_settings['form_button_text_color'] );
$css->add_property( 'background-color', $color_settings['form_button_background_color'] );
$css->add_property( 'padding', '10px 20px' );
$css->add_property( 'border', '0' );
$css->add_property( 'border-radius', '0' );
$css->set_selector( '.editor-styles-wrapper a.button:hover, .editor-styles-wrapper a.button:focus, .wp-block-button__link:not(.has-background):active, .wp-block-button__link:not(.has-background):focus, .wp-block-button__link:not(.has-background):hover' );
$css->set_selector( '.editor-styles-wrapper a.button:hover, .editor-styles-wrapper a.button:active, .editor-styles-wrapper a.button:focus, .wp-block-button__link:not(.has-background):active, .wp-block-button__link:not(.has-background):focus, .wp-block-button__link:not(.has-background):hover' );
$css->add_property( 'color', $color_settings['form_button_text_color_hover'] );
$css->add_property( 'background-color', $color_settings['form_button_background_color_hover'] );
if ( ! generate_is_using_dynamic_typography() ) {
$body_family = generate_get_font_family_css( 'font_body', 'generate_settings', generate_get_default_fonts() );
$h1_family = generate_get_font_family_css( 'font_heading_1', 'generate_settings', generate_get_default_fonts() );
$h2_family = generate_get_font_family_css( 'font_heading_2', 'generate_settings', generate_get_default_fonts() );
@ -215,10 +279,14 @@ function generate_do_inline_block_editor_css() {
$h5_family = generate_get_font_family_css( 'font_heading_5', 'generate_settings', generate_get_default_fonts() );
$h6_family = generate_get_font_family_css( 'font_heading_6', 'generate_settings', generate_get_default_fonts() );
$buttons_family = generate_get_font_family_css( 'font_buttons', 'generate_settings', generate_get_default_fonts() );
}
$css->set_selector( 'body.gutenberg-editor-page .block-editor-block-list__block, body .editor-styles-wrapper' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', $body_family );
$css->add_property( 'font-size', absint( $font_settings['body_font_size'] ), false, 'px' );
}
if ( $color_settings['content_text_color'] ) {
$css->add_property( 'color', $color_settings['content_text_color'] );
@ -234,14 +302,18 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'color', generate_get_option( 'text_color' ) );
}
if ( ! generate_is_using_dynamic_typography() ) {
$css->set_selector( 'body .editor-styles-wrapper, body .editor-styles-wrapper p, body .editor-styles-wrapper .mce-content-body' );
$css->add_property( 'line-height', floatval( $font_settings['body_line_height'] ) );
$css->set_selector( 'body .editor-styles-wrapper p' );
$css->add_property( 'margin-top', '0px' );
$css->add_property( 'margin-bottom', $font_settings['paragraph_margin'], false, 'em' );
}
$css->set_selector( 'body .editor-styles-wrapper h1, .wp-block-heading h1.editor-rich-text__tinymce, .editor-post-title__block .editor-post-title__input' );
$css->set_selector( 'body .editor-styles-wrapper h1, .wp-block-heading h1.editor-rich-text__tinymce, .editor-styles-wrapper .editor-post-title__input' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', 'inherit' === $h1_family || '' === $h1_family ? $body_family : $h1_family );
$css->add_property( 'font-weight', $font_settings['heading_1_weight'] );
$css->add_property( 'text-transform', $font_settings['heading_1_transform'] );
@ -249,6 +321,7 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'line-height', floatval( $font_settings['heading_1_line_height'] ), false, 'em' );
$css->add_property( 'margin-bottom', floatval( $font_settings['heading_1_margin_bottom'] ), false, 'px' );
$css->add_property( 'margin-top', '0' );
}
if ( $color_settings['h1_color'] ) {
$css->add_property( 'color', $color_settings['h1_color'] );
@ -259,11 +332,13 @@ function generate_do_inline_block_editor_css() {
}
if ( $color_settings['content_title_color'] ) {
$css->set_selector( '.editor-post-title__block .editor-post-title__input' );
$css->set_selector( '.editor-styles-wrapper .editor-post-title__input' );
$css->add_property( 'color', $color_settings['content_title_color'] );
}
$css->set_selector( 'body .editor-styles-wrapper h2, .wp-block-heading h2.editor-rich-text__tinymce' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', $h2_family );
$css->add_property( 'font-weight', $font_settings['heading_2_weight'] );
$css->add_property( 'text-transform', $font_settings['heading_2_transform'] );
@ -271,6 +346,7 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'line-height', floatval( $font_settings['heading_2_line_height'] ), false, 'em' );
$css->add_property( 'margin-bottom', floatval( $font_settings['heading_2_margin_bottom'] ), false, 'px' );
$css->add_property( 'margin-top', '0' );
}
if ( $color_settings['h2_color'] ) {
$css->add_property( 'color', $color_settings['h2_color'] );
@ -281,6 +357,8 @@ function generate_do_inline_block_editor_css() {
}
$css->set_selector( 'body .editor-styles-wrapper h3, .wp-block-heading h3.editor-rich-text__tinymce' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', $h3_family );
$css->add_property( 'font-weight', $font_settings['heading_3_weight'] );
$css->add_property( 'text-transform', $font_settings['heading_3_transform'] );
@ -288,6 +366,7 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'line-height', floatval( $font_settings['heading_3_line_height'] ), false, 'em' );
$css->add_property( 'margin-bottom', floatval( $font_settings['heading_3_margin_bottom'] ), false, 'px' );
$css->add_property( 'margin-top', '0' );
}
if ( $color_settings['h3_color'] ) {
$css->add_property( 'color', $color_settings['h3_color'] );
@ -298,6 +377,8 @@ function generate_do_inline_block_editor_css() {
}
$css->set_selector( 'body .editor-styles-wrapper h4, .wp-block-heading h4.editor-rich-text__tinymce' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', $h4_family );
$css->add_property( 'font-weight', $font_settings['heading_4_weight'] );
$css->add_property( 'text-transform', $font_settings['heading_4_transform'] );
@ -313,6 +394,7 @@ function generate_do_inline_block_editor_css() {
if ( '' !== $font_settings['heading_4_line_height'] ) {
$css->add_property( 'line-height', floatval( $font_settings['heading_4_line_height'] ), false, 'em' );
}
}
if ( $color_settings['h4_color'] ) {
$css->add_property( 'color', $color_settings['h4_color'] );
@ -323,6 +405,8 @@ function generate_do_inline_block_editor_css() {
}
$css->set_selector( 'body .editor-styles-wrapper h5, .wp-block-heading h5.editor-rich-text__tinymce' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', $h5_family );
$css->add_property( 'font-weight', $font_settings['heading_5_weight'] );
$css->add_property( 'text-transform', $font_settings['heading_5_transform'] );
@ -338,6 +422,7 @@ function generate_do_inline_block_editor_css() {
if ( '' !== $font_settings['heading_5_line_height'] ) {
$css->add_property( 'line-height', floatval( $font_settings['heading_5_line_height'] ), false, 'em' );
}
}
if ( $color_settings['h5_color'] ) {
$css->add_property( 'color', $color_settings['h5_color'] );
@ -348,6 +433,8 @@ function generate_do_inline_block_editor_css() {
}
$css->set_selector( 'body .editor-styles-wrapper h6, .wp-block-heading h6.editor-rich-text__tinymce' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', $h6_family );
$css->add_property( 'font-weight', $font_settings['heading_6_weight'] );
$css->add_property( 'text-transform', $font_settings['heading_6_transform'] );
@ -363,6 +450,7 @@ function generate_do_inline_block_editor_css() {
if ( '' !== $font_settings['heading_6_line_height'] ) {
$css->add_property( 'line-height', floatval( $font_settings['heading_6_line_height'] ), false, 'em' );
}
}
if ( $color_settings['h6_color'] ) {
$css->add_property( 'color', $color_settings['h6_color'] );
@ -373,12 +461,17 @@ function generate_do_inline_block_editor_css() {
}
$css->set_selector( '.editor-styles-wrapper a.button, .block-editor-block-list__layout .wp-block-button .wp-block-button__link' );
if ( ! generate_is_using_dynamic_typography() ) {
$css->add_property( 'font-family', $buttons_family );
$css->add_property( 'font-weight', $font_settings['buttons_font_weight'] );
$css->add_property( 'text-transform', $font_settings['buttons_font_transform'] );
if ( '' !== $font_settings['buttons_font_size'] ) {
$css->add_property( 'font-size', absint( $font_settings['buttons_font_size'] ), false, 'px' );
} else {
$css->add_property( 'font-size', 'inherit' );
}
}
if ( version_compare( $GLOBALS['wp_version'], '5.7-alpha.1', '>' ) ) {

View File

@ -0,0 +1,266 @@
<?php
/**
* Build our admin dashboard.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* This class adds HTML attributes to various theme elements.
*/
class GeneratePress_Dashboard {
/**
* Class instance.
*
* @access private
* @var $instance Class instance.
*/
private static $instance;
/**
* Initiator
*/
public static function get_instance() {
if ( ! isset( self::$instance ) ) {
self::$instance = new self();
}
return self::$instance;
}
/**
* Get started.
*/
public function __construct() {
// Load our old dashboard if we're using an old version of GP Premium.
if ( defined( 'GP_PREMIUM_VERSION' ) && version_compare( GP_PREMIUM_VERSION, '2.1.0-alpha.1', '<' ) ) {
require_once get_template_directory() . '/inc/dashboard.php';
return;
}
add_action( 'admin_menu', array( $this, 'add_menu_item' ) );
add_filter( 'admin_body_class', array( $this, 'set_admin_body_class' ) );
add_action( 'in_admin_header', array( $this, 'add_header' ) );
add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
add_action( 'generate_admin_dashboard', array( $this, 'start_customizing' ) );
add_action( 'generate_admin_dashboard', array( $this, 'go_pro' ), 15 );
add_action( 'generate_admin_dashboard', array( $this, 'reset' ), 100 );
}
/**
* Add our dashboard menu item.
*/
public function add_menu_item() {
add_theme_page(
esc_html__( 'GeneratePress', 'generatepress' ),
esc_html__( 'GeneratePress', 'generatepress' ),
apply_filters( 'generate_dashboard_page_capability', 'edit_theme_options' ),
'generate-options',
array( $this, 'page' )
);
}
/**
* Get our dashboard pages so we can style them.
*/
public static function get_pages() {
return apply_filters(
'generate_dashboard_screens',
array(
'appearance_page_generate-options',
)
);
}
/**
* Add a body class on GP dashboard pages.
*
* @param string $classes The existing classes.
*/
public function set_admin_body_class( $classes ) {
$dashboard_pages = self::get_pages();
$current_screen = get_current_screen();
if ( in_array( $current_screen->id, $dashboard_pages ) ) {
$classes .= ' generate-dashboard-page';
}
return $classes;
}
/**
* Build our Dashboard header.
*/
public static function header() {
?>
<div class="generatepress-dashboard-header">
<div class="generatepress-dashboard-header__title">
<h1>
<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600"><path d="M485.2 427.8l-99.1-46.2 15.8-34c5.6-11.9 8.8-24.3 10-36.7 3.3-33.7-9-67.3-33.2-91.1-8.9-8.7-19.3-16.1-31.3-21.7-11.9-5.6-24.3-8.8-36.7-10-33.7-3.3-67.4 9-91.1 33.2-8.7 8.9-16.1 19.3-21.7 31.3l-15.8 34-30.4 65.2c-.7 1.5-.1 3.3 1.5 4l65.2 30.4 34 15.8 34 15.8 68 31.7 74.7 34.8c-65 45.4-152.1 55.2-228.7 17.4C90.2 447.4 44.1 313.3 97.3 202.6c53.3-110.8 186-158.5 297.8-106.3 88.1 41.1 137.1 131.9 129.1 223.4-.1 1.3.6 2.4 1.7 3l65.6 30.6c1.8.8 3.9-.3 4.2-2.2 22.6-130.7-44-265.4-170.5-323.5-150.3-69-327-4.1-396.9 145.8-70 150.1-5.1 328.5 145.1 398.5 114.1 53.2 244.5 28.4 331.3-52.3 17.9-16.6 33.9-35.6 47.5-56.8 1-1.5.4-3.6-1.3-4.3l-65.7-30.7zm-235-109.6l15.8-34c8.8-18.8 31.1-26.9 49.8-18.1s26.9 31 18.1 49.8l-15.8 34-34-15.8-33.9-15.9z" fill="currentColor" /></svg>
<?php echo esc_html( get_admin_page_title() ); ?>
</h1>
</div>
<?php self::navigation(); ?>
</div>
<?php
}
/**
* Build our Dashboard menu.
*/
public static function navigation() {
$screen = get_current_screen();
$tabs = apply_filters(
'generate_dashboard_tabs',
array(
'dashboard' => array(
'name' => __( 'Dashboard', 'generatepress' ),
'url' => admin_url( 'themes.php?page=generate-options' ),
'class' => 'appearance_page_generate-options' === $screen->id ? 'active' : '',
),
)
);
if ( ! defined( 'GP_PREMIUM_VERSION' ) ) {
$tabs['premium'] = array(
'name' => __( 'Premium', 'generatepress' ),
'url' => 'https://generatepress.com/premium',
'class' => '',
'external' => true,
);
}
$tabs['support'] = array(
'name' => __( 'Support', 'generatepress' ),
'url' => 'https://generatepress.com/support',
'class' => '',
'external' => true,
);
$tabs['documentation'] = array(
'name' => __( 'Documentation', 'generatepress' ),
'url' => 'https://docs.generatepress.com',
'class' => '',
'external' => true,
);
?>
<div class="generatepress-dashboard-header__navigation">
<?php
foreach ( $tabs as $tab ) {
printf(
'<a href="%1$s" class="%2$s"%4$s>%3$s</a>',
esc_url( $tab['url'] ),
esc_attr( $tab['class'] ),
esc_html( $tab['name'] ),
! empty( $tab['external'] ) ? 'target="_blank" rel="noreferrer noopener"' : ''
);
}
?>
</div>
<?php
}
/**
* Add our Dashboard headers.
*/
public function add_header() {
$dashboard_pages = self::get_pages();
$current_screen = get_current_screen();
if ( in_array( $current_screen->id, $dashboard_pages ) ) {
self::header();
/**
* generate_dashboard_after_header hook.
*
* @since 2.0
*/
do_action( 'generate_dashboard_after_header' );
}
}
/**
* Add our scripts to the page.
*/
public function enqueue_scripts() {
$dashboard_pages = self::get_pages();
$current_screen = get_current_screen();
if ( in_array( $current_screen->id, $dashboard_pages ) ) {
wp_enqueue_style(
'generate-dashboard',
get_template_directory_uri() . '/assets/dist/style-dashboard.css',
array( 'wp-components' ),
GENERATE_VERSION
);
if ( 'appearance_page_generate-options' === $current_screen->id ) {
wp_enqueue_script(
'generate-dashboard',
get_template_directory_uri() . '/assets/dist/dashboard.js',
array( 'wp-api', 'wp-i18n', 'wp-components', 'wp-element', 'wp-api-fetch' ),
GENERATE_VERSION,
true
);
wp_set_script_translations( 'generate-dashboard', 'generatepress' );
wp_localize_script(
'generate-dashboard',
'generateDashboard',
array(
'hasPremium' => defined( 'GP_PREMIUM_VERSION' ),
'customizeSectionUrls' => array(
'siteIdentitySection' => admin_url( 'customize.php?autofocus[section]=title_tagline' ),
'colorsSection' => admin_url( 'customize.php?autofocus[section]=generate_colors_section' ),
'typographySection' => admin_url( 'customize.php?autofocus[section]=generate_typography_section' ),
'layoutSection' => admin_url( 'customize.php?autofocus[section]=generate_layout_panel' ),
),
)
);
}
}
}
/**
* Add the HTML for our page.
*/
public function page() {
?>
<div class="wrap">
<div class="generatepress-dashboard">
<?php do_action( 'generate_admin_dashboard' ); ?>
</div>
</div>
<?php
}
/**
* Add the container for our start customizing app.
*/
public function start_customizing() {
echo '<div id="generatepress-dashboard-app"></div>';
}
/**
* Add the container for our start customizing app.
*/
public function go_pro() {
echo '<div id="generatepress-dashboard-go-pro"></div>';
}
/**
* Add the container for our reset app.
*/
public function reset() {
echo '<div id="generatepress-reset"></div>';
}
}
GeneratePress_Dashboard::get_instance();

View File

@ -0,0 +1,465 @@
<?php
/**
* Add HTML attributes to our theme elements.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* This class adds HTML attributes to various theme elements.
*/
class GeneratePress_HTML_Attributes {
/**
* Class instance.
*
* @access private
* @var $instance Class instance.
*/
private static $instance;
/**
* Initiator
*/
public static function get_instance() {
if ( ! isset( self::$instance ) ) {
self::$instance = new self();
}
return self::$instance;
}
/**
* Constructor
*/
public function __construct() {
add_filter( 'generate_parse_attr', array( $this, 'parse_attributes' ), 10, 3 );
}
/**
* Parse the attributes.
*
* @since 3.1.0
* @param array $attributes The current attributes.
* @param string $context The context in which attributes are applied.
* @param array $settings Custom settings passed to the filter.
*/
public function parse_attributes( $attributes, $context, $settings ) {
switch ( $context ) {
case 'top-bar':
return $this->top_bar( $attributes );
case 'inside-top-bar':
return $this->inside_top_bar( $attributes );
case 'header':
return $this->site_header( $attributes );
case 'inside-header':
return $this->inside_site_header( $attributes );
case 'menu-toggle':
return $this->menu_toggle( $attributes );
case 'navigation':
return $this->primary_navigation( $attributes );
case 'inside-navigation':
return $this->primary_inner_navigation( $attributes );
case 'mobile-menu-control-wrapper':
return $this->mobile_menu_control_wrapper( $attributes );
case 'site-info':
return $this->site_info( $attributes );
case 'inside-site-info':
return $this->inside_site_info( $attributes );
case 'entry-header':
return $this->entry_header( $attributes );
case 'page-header':
return $this->page_header( $attributes );
case 'site-content':
return $this->site_content( $attributes );
case 'page':
return $this->page( $attributes );
case 'content':
return $this->content( $attributes );
case 'main':
return $this->main( $attributes );
case 'post-navigation':
return $this->post_navigation( $attributes );
case 'left-sidebar':
return $this->left_sidebar( $attributes );
case 'right-sidebar':
return $this->right_sidebar( $attributes );
case 'footer-widgets-container':
return $this->footer_widgets_container( $attributes );
case 'comment-body':
return $this->comment_body( $attributes, $settings );
case 'comment-meta':
return $this->comment_meta( $attributes );
case 'footer-entry-meta':
return $this->footer_entry_meta( $attributes );
}
return $attributes;
}
/**
* Add attributes to our top bar.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function top_bar( $attributes ) {
$classes = generate_get_element_classes( 'top_bar' );
if ( $classes ) {
$attributes['class'] .= ' ' . join( ' ', $classes );
}
return $attributes;
}
/**
* Add attributes to our inside top bar container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function inside_top_bar( $attributes ) {
$attributes['class'] .= ' inside-top-bar';
if ( 'contained' === generate_get_option( 'top_bar_inner_width' ) ) {
$attributes['class'] .= ' grid-container';
if ( ! generate_is_using_flexbox() ) {
$attributes['class'] .= ' grid-parent';
}
}
return $attributes;
}
/**
* Add attributes to our site header.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function site_header( $attributes ) {
$attributes['id'] = 'masthead';
$attributes['aria-label'] = esc_attr__( 'Site', 'generatepress' );
return $attributes;
}
/**
* Add attributes to our inside site header container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function inside_site_header( $attributes ) {
$classes = generate_get_element_classes( 'inside_header' );
if ( $classes ) {
$attributes['class'] .= ' ' . join( ' ', $classes );
}
return $attributes;
}
/**
* Add attributes to our menu toggle.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function menu_toggle( $attributes ) {
$attributes['class'] .= ' menu-toggle';
$attributes['aria-controls'] = 'primary-menu';
$attributes['aria-expanded'] = 'false';
return $attributes;
}
/**
* Add attributes to our main navigation.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function primary_navigation( $attributes ) {
$attributes['id'] = 'site-navigation';
$attributes['aria-label'] = esc_attr__( 'Primary', 'generatepress' );
return $attributes;
}
/**
* Add attributes to our main navigation.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function primary_inner_navigation( $attributes ) {
$classes = generate_get_element_classes( 'inside_navigation' );
if ( $classes ) {
$attributes['class'] .= ' ' . join( ' ', $classes );
}
return $attributes;
}
/**
* Add attributes to our main navigation.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function mobile_menu_control_wrapper( $attributes ) {
$attributes['id'] = 'mobile-menu-control-wrapper';
$attributes['class'] .= ' main-navigation mobile-menu-control-wrapper';
$attributes['aria-label'] = esc_attr__( 'Mobile Toggle', 'generatepress' );
return $attributes;
}
/**
* Add attributes to our footer element.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function site_info( $attributes ) {
$attributes['class'] .= ' site-info';
$attributes['aria-label'] = esc_attr__( 'Site', 'generatepress' );
return $attributes;
}
/**
* Add attributes to our inside site info container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function inside_site_info( $attributes ) {
$attributes['class'] .= ' inside-site-info';
if ( 'full-width' !== generate_get_option( 'footer_inner_width' ) ) {
$attributes['class'] .= ' grid-container';
if ( ! generate_is_using_flexbox() ) {
$attributes['class'] .= ' grid-parent';
}
}
return $attributes;
}
/**
* Add attributes to our entry headers.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function entry_header( $attributes ) {
$attributes['class'] .= ' entry-header';
$attributes['aria-label'] = esc_attr__( 'Content', 'generatepress' );
return $attributes;
}
/**
* Add attributes to our page headers.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function page_header( $attributes ) {
$attributes['class'] .= ' page-header';
$attributes['aria-label'] = esc_attr__( 'Page', 'generatepress' );
return $attributes;
}
/**
* Add attributes to our entry headers.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function post_navigation( $attributes ) {
if ( is_single() ) {
$attributes['class'] .= ' post-navigation';
$attributes['aria-label'] = esc_attr__( 'Single Post', 'generatepress' );
} else {
$attributes['class'] .= ' paging-navigation';
$attributes['aria-label'] = esc_attr__( 'Archive Page', 'generatepress' );
}
return $attributes;
}
/**
* Add attributes to our page container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function page( $attributes ) {
$attributes['id'] = 'page';
return $attributes;
}
/**
* Add attributes to our site content container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function site_content( $attributes ) {
$attributes['id'] = 'content';
$attributes['class'] .= ' site-content';
return $attributes;
}
/**
* Add attributes to our primary content container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function content( $attributes ) {
$attributes['id'] = 'primary';
return $attributes;
}
/**
* Add attributes to our primary content container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function main( $attributes ) {
$attributes['id'] = 'main';
return $attributes;
}
/**
* Add attributes to our left sidebar.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function left_sidebar( $attributes ) {
$classes = generate_get_element_classes( 'left_sidebar' );
if ( $classes ) {
$attributes['class'] .= ' ' . join( ' ', $classes );
}
$attributes['id'] = 'left-sidebar';
return $attributes;
}
/**
* Add attributes to our right sidebar.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function right_sidebar( $attributes ) {
$classes = generate_get_element_classes( 'right_sidebar' );
if ( $classes ) {
$attributes['class'] .= ' ' . join( ' ', $classes );
}
$attributes['id'] = 'right-sidebar';
return $attributes;
}
/**
* Add attributes to our footer widget inner container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function footer_widgets_container( $attributes ) {
$classes = generate_get_element_classes( 'inside_footer' );
if ( $classes ) {
$attributes['class'] .= ' ' . join( ' ', $classes );
}
return $attributes;
}
/**
* Add attributes to our footer widget inner container.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
* @param array $settings Settings passed through the function.
*/
public function comment_body( $attributes, $settings ) {
$attributes['class'] .= ' comment-body';
$attributes['id'] = 'div-comment-' . $settings['comment-id'];
return $attributes;
}
/**
* Add attributes to our comment meta.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function comment_meta( $attributes ) {
$attributes['class'] .= ' comment-meta';
$attributes['aria-label'] = esc_attr__( 'Comment meta', 'generatepress' );
return $attributes;
}
/**
* Add attributes to our footer entry meta.
*
* @since 3.1.0
* @param array $attributes The existing attributes.
*/
public function footer_entry_meta( $attributes ) {
$attributes['class'] .= ' entry-meta';
$attributes['aria-label'] = esc_attr__( 'Entry meta', 'generatepress' );
return $attributes;
}
}
GeneratePress_HTML_Attributes::get_instance();

View File

@ -0,0 +1,151 @@
<?php
/**
* Rest API functions
*
* @package GenerateBlocks
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
/**
* Class GenerateBlocks_Rest
*/
class GeneratePress_Rest extends WP_REST_Controller {
/**
* Instance.
*
* @access private
* @var object Instance
*/
private static $instance;
/**
* Namespace.
*
* @var string
*/
protected $namespace = 'generatepress/v';
/**
* Version.
*
* @var string
*/
protected $version = '1';
/**
* Initiator.
*
* @return object initialized object of class.
*/
public static function get_instance() {
if ( ! isset( self::$instance ) ) {
self::$instance = new self();
}
return self::$instance;
}
/**
* GeneratePress_Rest constructor.
*/
public function __construct() {
add_action( 'rest_api_init', array( $this, 'register_routes' ) );
}
/**
* Register rest routes.
*/
public function register_routes() {
$namespace = $this->namespace . $this->version;
register_rest_route(
$namespace,
'/reset/',
array(
'methods' => WP_REST_Server::EDITABLE,
'callback' => array( $this, 'reset' ),
'permission_callback' => array( $this, 'update_settings_permission' ),
)
);
}
/**
* Get edit options permissions.
*
* @return bool
*/
public function update_settings_permission() {
return current_user_can( 'manage_options' );
}
/**
* Reset settings.
*
* @param WP_REST_Request $request request object.
*
* @return mixed
*/
public function reset( WP_REST_Request $request ) {
delete_option( 'generate_settings' );
delete_option( 'generate_dynamic_css_output' );
delete_option( 'generate_dynamic_css_cached_version' );
return $this->success( __( 'Settings reset.', 'generatepress' ) );
}
/**
* Success rest.
*
* @param mixed $response response data.
* @return mixed
*/
public function success( $response ) {
return new WP_REST_Response(
array(
'success' => true,
'response' => $response,
),
200
);
}
/**
* Failed rest.
*
* @param mixed $response response data.
* @return mixed
*/
public function failed( $response ) {
return new WP_REST_Response(
array(
'success' => false,
'response' => $response,
),
200
);
}
/**
* Error rest.
*
* @param mixed $code error code.
* @param mixed $response response data.
* @return mixed
*/
public function error( $code, $response ) {
return new WP_REST_Response(
array(
'error' => true,
'success' => false,
'error_code' => $code,
'response' => $response,
),
401
);
}
}
GeneratePress_Rest::get_instance();

View File

@ -93,6 +93,25 @@ class GeneratePress_Theme_Update {
self::v_3_0_0();
}
if ( version_compare( $saved_version, '3.1.0-alpha.1', '<' ) ) {
self::v_3_1_0();
}
// Delete our CSS cache.
delete_option( 'generate_dynamic_css_output' );
delete_option( 'generate_dynamic_css_cached_version' );
// Reset our dynamic CSS file updated time so it regenerates.
$dynamic_css_data = get_option( 'generatepress_dynamic_css_data', array() );
if ( ! empty( $dynamic_css_data ) ) {
if ( isset( $dynamic_css_data['updated_time'] ) ) {
unset( $dynamic_css_data['updated_time'] );
}
update_option( 'generatepress_dynamic_css_data', $dynamic_css_data );
}
// Last thing to do is update our version.
update_option( 'generate_db_version', GENERATE_VERSION );
}
@ -322,6 +341,68 @@ class GeneratePress_Theme_Update {
}
}
}
/**
* Update sites using old defaults.
*
* @since 3.1.0
*/
public static function v_3_1_0() {
$settings = get_option( 'generate_settings', array() );
$update_options = false;
$old_defaults = array(
'underline_links' => 'never',
'use_dynamic_typography' => false,
'background_color' => '#f7f8f9',
'text_color' => '#222222',
'link_color' => '#1e73be',
'link_color_hover' => '#000000',
'header_background_color' => '#ffffff',
'site_title_color' => '#222222',
'site_tagline_color' => '#757575',
'navigation_background_color' => '#ffffff',
'navigation_background_hover_color' => '#ffffff',
'navigation_background_current_color' => '#ffffff',
'navigation_text_color' => '#515151',
'navigation_text_hover_color' => '#7a8896',
'navigation_text_current_color' => '#7a8896',
'subnavigation_background_color' => '#eaeaea',
'subnavigation_background_hover_color' => '#eaeaea',
'subnavigation_background_current_color' => '#eaeaea',
'subnavigation_text_color' => '#515151',
'subnavigation_text_hover_color' => '#7a8896',
'subnavigation_text_current_color' => '#7a8896',
'content_background_color' => '#ffffff',
'blog_post_title_color' => '#222222',
'blog_post_title_hover_color' => '#55555e',
'entry_meta_text_color' => '#595959',
'sidebar_widget_background_color' => '#ffffff',
'footer_widget_background_color' => '#ffffff',
'footer_widget_title_color' => '#000000',
'footer_background_color' => '#55555e',
'footer_text_color' => '#ffffff',
'footer_link_color' => '#ffffff',
'footer_link_hover_color' => '#d3d3d3',
'form_background_color' => '#fafafa',
'form_text_color' => '#666666',
'form_background_color_focus' => '#ffffff',
'form_text_color_focus' => '#666666',
'form_border_color' => '#cccccc',
'form_border_color_focus' => '#bfbfbf',
);
foreach ( $old_defaults as $key => $value ) {
if ( ! isset( $settings[ $key ] ) ) {
$settings[ $key ] = $value;
$update_options = true;
}
}
if ( $update_options ) {
update_option( 'generate_settings', $settings );
}
}
}
GeneratePress_Theme_Update::get_instance();

View File

@ -0,0 +1,306 @@
<?php
/**
* This file handles typography migration.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Handles all of our typography migration.
*/
class GeneratePress_Typography_Migration {
/**
* Class instance.
*
* @access private
* @var $instance Class instance.
*/
private static $instance;
/**
* Initiator
*/
public static function get_instance() {
if ( ! isset( self::$instance ) ) {
self::$instance = new self();
}
return self::$instance;
}
/**
* Map our new typography keys to the old prefixes.
*/
public static function get_option_prefixes() {
$data = array(
array(
'selector' => 'body',
'legacy_prefix' => 'body',
'group' => 'base',
'module' => 'core',
),
array(
'selector' => 'top-bar',
'legacy_prefix' => 'top_bar',
'group' => 'widgets',
'module' => 'core',
),
array(
'selector' => 'main-title',
'legacy_prefix' => 'site_title',
'group' => 'header',
'module' => 'core',
),
array(
'selector' => 'site-description',
'legacy_prefix' => 'site_tagline',
'group' => 'header',
'module' => 'core',
),
array(
'selector' => 'primary-menu-items',
'legacy_prefix' => 'navigation',
'group' => 'primaryNavigation',
'module' => 'core',
),
array(
'selector' => 'widget-titles',
'legacy_prefix' => 'widget_title',
'group' => 'widgets',
'module' => 'core',
),
array(
'selector' => 'buttons',
'legacy_prefix' => 'buttons',
'group' => 'content',
'module' => 'core',
),
array(
'selector' => 'single-content-title',
'legacy_prefix' => 'single_post_title',
'group' => 'content',
'module' => 'core',
),
array(
'selector' => 'archive-content-title',
'legacy_prefix' => 'archive_post_title',
'group' => 'content',
'module' => 'core',
),
array(
'selector' => 'footer',
'legacy_prefix' => 'footer',
'group' => 'footer',
'module' => 'core',
),
);
$headings = array(
'h1' => 'heading_1',
'h2' => 'heading_2',
'h3' => 'heading_3',
'h4' => 'heading_4',
'h5' => 'heading_5',
'h6' => 'heading_6',
);
foreach ( $headings as $selector => $legacy_prefix ) {
$data[] = array(
'selector' => $selector,
'legacy_prefix' => $legacy_prefix,
'group' => 'content',
'module' => 'core',
);
}
if ( function_exists( 'generate_secondary_nav_typography_selectors' ) ) {
$data[] = array(
'selector' => 'secondary-nav-menu-items',
'legacy_prefix' => 'secondary_navigation',
'group' => 'secondaryNavigation',
'module' => 'secondary-nav',
);
}
if ( function_exists( 'generate_menu_plus_typography_selectors' ) ) {
$data[] = array(
'selector' => 'off-canvas-panel-menu-items',
'legacy_prefix' => 'slideout',
'group' => 'offCanvasPanel',
'module' => 'off-canvas-panel',
);
}
if ( function_exists( 'generate_woocommerce_typography_selectors' ) ) {
$data[] = array(
'selector' => 'woocommerce-catalog-product-titles',
'legacy_prefix' => 'wc_product_title',
'group' => 'wooCommerce',
'module' => 'woocommerce',
);
$data[] = array(
'selector' => 'woocommerce-related-product-titles',
'legacy_prefix' => 'wc_related_product_title',
'group' => 'wooCommerce',
'module' => 'woocommerce',
);
}
return $data;
}
/**
* Check if we have a saved value.
*
* @param string $id The option ID.
* @param array $settings The saved settings.
* @param array $defaults The defaults.
*/
public static function has_saved_value( $id, $settings, $defaults ) {
return isset( $settings[ $id ] )
&& isset( $defaults[ $id ] )
&& $defaults[ $id ] !== $settings[ $id ] // Need this because the Customizer treats defaults as saved values.
&& (
! empty( $settings[ $id ] )
|| 0 === $settings[ $id ]
);
}
/**
* Get all of our mapped typography data.
*/
public static function get_mapped_typography_data() {
$settings = get_option( 'generate_settings', array() );
$defaults = generate_get_default_fonts();
$typography_mapping = array();
// These options don't have "font" in their IDs.
$no_font_in_ids = array(
'single_post_title',
'archive_post_title',
);
for ( $headings = 1; $headings < 7; $headings++ ) {
$no_font_in_ids[] = 'heading_' . $headings;
}
foreach ( self::get_option_prefixes() as $key => $data ) {
$legacy_setting_ids = array(
'fontFamily' => 'font_' . $data['legacy_prefix'],
'fontWeight' => $data['legacy_prefix'] . '_font_weight',
'textTransform' => $data['legacy_prefix'] . '_font_transform',
'fontSize' => $data['legacy_prefix'] . '_font_size',
'fontSizeMobile' => 'mobile_' . $data['legacy_prefix'] . 'font_size',
'lineHeight' => $data['legacy_prefix'] . '_line_height',
);
if ( 'slideout' === $data['legacy_prefix'] ) {
$legacy_setting_ids['fontSizeMobile'] = $data['legacy_prefix'] . '_mobile_font_size';
}
if ( in_array( $data['legacy_prefix'], $no_font_in_ids ) ) {
$legacy_setting_ids['fontWeight'] = $data['legacy_prefix'] . '_weight';
$legacy_setting_ids['textTransform'] = $data['legacy_prefix'] . '_transform';
}
foreach ( $legacy_setting_ids as $name => $id ) {
if ( self::has_saved_value( $id, $settings, $defaults ) ) {
$typography_mapping[ $key ][ $name ] = $settings[ $id ];
}
if ( 'secondary_navigation' === $data['legacy_prefix'] && function_exists( 'generate_secondary_nav_get_defaults' ) ) {
$secondary_nav_settings = get_option( 'generate_secondary_nav_settings', array() );
$secondary_nav_defaults = generate_secondary_nav_get_defaults();
if ( self::has_saved_value( $id, $secondary_nav_settings, $secondary_nav_defaults ) ) {
$typography_mapping[ $key ][ $name ] = $secondary_nav_settings[ $id ];
}
}
}
if ( 'body' === $key ) {
if ( self::has_saved_value( 'body_line_height', $settings, $defaults ) ) {
$typography_mapping[ $key ]['lineHeightUnit'] = '';
}
if ( self::has_saved_value( 'paragraph_margin', $settings, $defaults ) ) {
$typography_mapping[ $key ]['marginBottom'] = $settings['paragraph_margin'];
$typography_mapping[ $key ]['marginBottomUnit'] = 'em';
}
}
if ( 'widget-titles' === $key && self::has_saved_value( 'widget_title_separator', $settings, $defaults ) ) {
$typography_mapping[ $key ]['marginBottom'] = $settings['widget_title_separator'];
$typography_mapping[ $key ]['marginBottomUnit'] = 'px';
}
if ( 'h1' === $key || 'h2' === $key || 'h3' === $key ) {
if ( self::has_saved_value( $data['legacy_prefix'] . '_margin_bottom', $settings, $defaults ) ) {
$typography_mapping[ $key ]['marginBottom'] = $settings[ $data['legacy_prefix'] . '_margin_bottom' ];
$typography_mapping[ $key ]['marginBottomUnit'] = 'px';
}
}
if ( isset( $typography_mapping[ $key ]['fontSize'] ) ) {
$typography_mapping[ $key ]['fontSizeUnit'] = 'px';
}
if ( isset( $typography_mapping[ $key ] ) ) {
$typography_mapping[ $key ]['selector'] = $data['selector'];
$typography_mapping[ $key ]['module'] = $data['module'];
$typography_mapping[ $key ]['group'] = $data['group'];
}
}
// Reset array keys starting at 0.
$typography_mapping = array_values( $typography_mapping );
return $typography_mapping;
}
/**
* Get all of our mapped font data.
*/
public static function get_mapped_font_data() {
$font_mapping = array();
foreach ( self::get_option_prefixes() as $key => $data ) {
$settings = get_option( 'generate_settings', array() );
$defaults = generate_get_default_fonts();
if ( 'secondary_navigation' === $data['legacy_prefix'] && function_exists( 'generate_secondary_nav_get_defaults' ) ) {
$settings = get_option( 'generate_secondary_nav_settings', array() );
$defaults = generate_secondary_nav_get_defaults();
}
if ( self::has_saved_value( 'font_' . $data['legacy_prefix'], $settings, $defaults ) ) {
$has_font = array_search( $settings[ 'font_' . $data['legacy_prefix'] ], array_column( $font_mapping, 'fontFamily' ) );
if ( false !== $has_font ) {
continue;
}
$font_mapping[ $key ]['fontFamily'] = $settings[ 'font_' . $data['legacy_prefix'] ];
$local_fonts = generate_typography_default_fonts();
if ( ! in_array( $settings[ 'font_' . $data['legacy_prefix'] ], $local_fonts ) ) {
$font_mapping[ $key ]['googleFont'] = true;
$font_mapping[ $key ]['googleFontCategory'] = get_theme_mod( 'font_' . $data['legacy_prefix'] . '_category' );
$font_mapping[ $key ]['googleFontVariants'] = get_theme_mod( 'font_' . $data['legacy_prefix'] . '_variants' );
}
}
}
// Reset array keys starting at 0.
$font_mapping = array_values( $font_mapping );
return $font_mapping;
}
}
GeneratePress_Typography_Migration::get_instance();

View File

@ -0,0 +1,383 @@
<?php
/**
* This file handles typography on the front-end.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Handles all of our typography option output.
*/
class GeneratePress_Typography {
/**
* Class instance.
*
* @access private
* @var $instance Class instance.
*/
private static $instance;
/**
* Initiator
*/
public static function get_instance() {
if ( ! isset( self::$instance ) ) {
self::$instance = new self();
}
return self::$instance;
}
/**
* Constructor
*/
public function __construct() {
add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_google_fonts' ) );
add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_google_fonts' ) );
}
/**
* Enqueue Google Fonts if they're set.
*/
public function enqueue_google_fonts() {
if ( ! generate_is_using_dynamic_typography() ) {
return;
}
$fonts = generate_get_option( 'font_manager' );
if ( empty( $fonts ) ) {
return;
}
$data = array();
foreach ( $fonts as $font ) {
if ( empty( $font['googleFont'] ) ) {
continue;
}
$variants = array();
if ( ! empty( $font['googleFontVariants'] ) ) {
// Remove spaces from string.
$variants = str_replace( ' ', '', $font['googleFontVariants'] );
// Turn string into array.
$variants = explode( ',', $variants );
}
$variants = apply_filters( 'generate_google_font_variants', $variants, $font['fontFamily'] );
$name = str_replace( ' ', '+', $font['fontFamily'] );
if ( $variants ) {
$data[] = $name . ':' . implode( ',', $variants );
} else {
$data[] = $name;
}
}
if ( ! empty( $data ) ) {
$font_args = apply_filters(
'generate_google_font_args',
array(
'family' => implode( '|', $data ),
'subset' => null,
'display' => generate_get_option( 'google_font_display' ),
)
);
$google_fonts_uri = add_query_arg( $font_args, 'https://fonts.googleapis.com/css' );
wp_enqueue_style( 'generate-google-fonts', $google_fonts_uri, array(), GENERATE_VERSION );
}
}
/**
* Build our typography CSS.
*
* @param string $module The name of the module we're generating CSS for.
* @param string $type Either frontend or editor.
*/
public static function get_css( $module = 'core', $type = 'frontend' ) {
$typography = generate_get_option( 'typography' );
// Get data for a specific module so CSS can be compiled separately.
$typography = array_filter(
(array) $typography,
function( $data ) use ( $module ) {
return ( isset( $data['module'] ) && $data['module'] === $module );
}
);
if ( ! empty( $typography ) ) {
$css = new GeneratePress_CSS();
$body_selector = 'body';
$paragraph_selector = 'p';
$tablet_prefix = '';
$mobile_prefix = '';
if ( 'editor' === $type ) {
$body_selector = '.editor-styles-wrapper';
$paragraph_selector = '.editor-styles-wrapper p';
$tablet_prefix = '.gp-is-device-tablet ';
$mobile_prefix = '.gp-is-device-mobile ';
}
foreach ( $typography as $key => $data ) {
$options = wp_parse_args(
$data,
self::get_defaults()
);
$selector = self::get_css_selector( $options['selector'], $type );
if ( 'custom' === $selector ) {
$selector = $options['customSelector'];
}
$font_family = self::get_font_family( $options['fontFamily'] );
$css->set_selector( $selector );
$css->add_property( 'font-family', $font_family );
$css->add_property( 'font-weight', $options['fontWeight'] );
$css->add_property( 'text-transform', $options['textTransform'] );
$css->add_property( 'font-size', $options['fontSize'], false, $options['fontSizeUnit'] );
$css->add_property( 'letter-spacing', $options['letterSpacing'], false, $options['letterSpacingUnit'] );
if ( 'body' !== $options['selector'] ) {
$css->add_property( 'line-height', $options['lineHeight'], false, $options['lineHeightUnit'] );
$css->add_property( 'margin-bottom', $options['marginBottom'], false, $options['marginBottomUnit'] );
} else {
$css->set_selector( $body_selector );
$css->add_property( 'line-height', $options['lineHeight'], false, $options['lineHeightUnit'] );
$css->set_selector( $paragraph_selector );
$css->add_property( 'margin-bottom', $options['marginBottom'], false, $options['marginBottomUnit'] );
}
if ( 'frontend' === $type ) {
$css->start_media_query( generate_get_media_query( 'tablet' ) );
}
if ( 'editor' === $type ) {
// Add the tablet prefix to each class.
$selector = explode( ', ', $selector );
$selector = preg_filter( '/^/', $tablet_prefix, $selector );
$selector = implode( ', ', $selector );
}
$css->set_selector( $selector );
$css->add_property( 'font-size', $options['fontSizeTablet'], false, $options['fontSizeUnit'] );
$css->add_property( 'letter-spacing', $options['letterSpacingTablet'], false, $options['letterSpacingUnit'] );
if ( 'body' !== $options['selector'] ) {
$css->add_property( 'line-height', $options['lineHeightTablet'], false, $options['lineHeightUnit'] );
$css->add_property( 'margin-bottom', $options['marginBottomTablet'], false, $options['marginBottomUnit'] );
} else {
$css->set_selector( $tablet_prefix . $body_selector );
$css->add_property( 'line-height', $options['lineHeightTablet'], false, $options['lineHeightUnit'] );
$css->set_selector( $tablet_prefix . $paragraph_selector );
$css->add_property( 'margin-bottom', $options['marginBottomTablet'], false, $options['marginBottomUnit'] );
}
if ( 'frontend' === $type ) {
$css->stop_media_query();
}
if ( 'frontend' === $type ) {
$css->start_media_query( generate_get_media_query( 'mobile' ) );
}
if ( 'editor' === $type ) {
$selector = str_replace( '.gp-is-device-tablet', '.gp-is-device-mobile', $selector );
}
$css->set_selector( $selector );
$css->add_property( 'font-size', $options['fontSizeMobile'], false, $options['fontSizeUnit'] );
$css->add_property( 'letter-spacing', $options['letterSpacingMobile'], false, $options['letterSpacingUnit'] );
if ( 'body' !== $options['selector'] ) {
$css->add_property( 'line-height', $options['lineHeightMobile'], false, $options['lineHeightUnit'] );
$css->add_property( 'margin-bottom', $options['marginBottomMobile'], false, $options['marginBottomUnit'] );
} else {
$css->set_selector( $mobile_prefix . $body_selector );
$css->add_property( 'line-height', $options['lineHeightMobile'], false, $options['lineHeightUnit'] );
$css->set_selector( $mobile_prefix . $paragraph_selector );
$css->add_property( 'margin-bottom', $options['marginBottomMobile'], false, $options['marginBottomUnit'] );
}
if ( 'frontend' === $type ) {
$css->stop_media_query();
}
}
return $css->css_output();
}
}
/**
* Get the CSS selector.
*
* @param string $selector The saved selector to look up.
* @param string $type Whether we're getting the selectors for the frontend or editor.
*/
public static function get_css_selector( $selector, $type ) {
if ( 'frontend' === $type ) {
switch ( $selector ) {
case 'body':
$selector = 'body, button, input, select, textarea';
break;
case 'main-title':
$selector = '.main-title';
break;
case 'site-description':
$selector = '.site-description';
break;
case 'primary-menu-items':
$selector = '.main-navigation a, .main-navigation .menu-toggle, .main-navigation .menu-bar-items';
break;
case 'primary-sub-menu-items':
$selector = '.main-navigation .main-nav ul ul li a';
break;
case 'primary-menu-toggle':
$selector = '.main-navigation .menu-toggle';
break;
case 'buttons':
$selector = 'button:not(.menu-toggle),html input[type="button"],input[type="reset"],input[type="submit"],.button,.wp-block-button .wp-block-button__link';
break;
case 'all-headings':
$selector = 'h1, h2, h3, h4, h5, h6';
break;
case 'single-content-title':
$selector = 'h1.entry-title';
break;
case 'archive-content-title':
$selector = 'h2.entry-title';
break;
case 'top-bar':
$selector = '.top-bar';
break;
case 'widget-titles':
$selector = '.widget-title';
break;
case 'footer':
$selector = '.site-info';
break;
}
}
if ( 'editor' === $type ) {
switch ( $selector ) {
case 'body':
$selector = 'body .editor-styles-wrapper';
break;
case 'buttons':
$selector = '.editor-styles-wrapper a.button, .block-editor-block-list__layout .wp-block-button .wp-block-button__link';
break;
case 'all-headings':
$selector = '.editor-styles-wrapper h1, .editor-styles-wrapper h2, .editor-styles-wrapper h3, .editor-styles-wrapper h4, .editor-styles-wrapper h5, .editor-styles-wrapper h6';
break;
case 'h1':
$selector = '.editor-styles-wrapper h1, .editor-styles-wrapper .editor-post-title__input';
break;
case 'single-content-title':
$selector = '.editor-styles-wrapper .editor-post-title__input';
break;
case 'h2':
case 'h3':
case 'h4':
case 'h5':
case 'h6':
$selector = '.editor-styles-wrapper ' . $selector;
break;
}
}
return apply_filters( 'generate_typography_css_selector', $selector, $type );
}
/**
* Get our full font family value.
*
* @param string $font_family The font family name.
*/
public static function get_font_family( $font_family ) {
if ( ! $font_family ) {
return $font_family;
}
$font_manager = generate_get_option( 'font_manager' );
$font_families = array();
foreach ( (array) $font_manager as $key => $data ) {
$font_families[ $data['fontFamily'] ] = $data;
}
$font_family_args = array();
if ( ! empty( $font_families[ $font_family ] ) ) {
$font_family_args = $font_families[ $font_family ];
}
if ( ! empty( $font_family_args['googleFont'] ) && ! empty( $font_family_args['googleFontCategory'] ) ) {
$font_family = $font_family . ', ' . $font_family_args['googleFontCategory'];
} elseif ( 'System Default' === $font_family ) {
$font_family = generate_get_system_default_font();
}
return $font_family;
}
/**
* Get the defaults for our CSS options.
*/
public static function get_defaults() {
return array(
'selector' => '',
'fontFamily' => '',
'fontWeight' => '',
'textTransform' => '',
'fontSize' => '',
'fontSizeTablet' => '',
'fontSizeMobile' => '',
'fontSizeUnit' => 'px',
'lineHeight' => '',
'lineHeightTablet' => '',
'lineHeightMobile' => '',
'lineHeightUnit' => '',
'letterSpacing' => '',
'letterSpacingTablet' => '',
'letterSpacingMobile' => '',
'letterSpacingUnit' => 'px',
'marginBottom' => '',
'marginBottomTablet' => '',
'marginBottomMobile' => '',
'marginBottomUnit' => 'px',
);
}
}
GeneratePress_Typography::get_instance();

View File

@ -32,6 +32,31 @@ if ( ! function_exists( 'generate_base_css' ) ) {
$css->set_selector( 'a:visited' )->add_property( 'color', $settings['link_color_visited'] );
$underline_links = generate_get_option( 'underline_links' );
if ( 'never' !== $underline_links ) {
if ( 'always' === $underline_links ) {
$css->set_selector( 'a' );
$css->add_property( 'text-decoration', 'underline' );
}
if ( 'hover' === $underline_links ) {
$css->set_selector( 'a:hover, a:focus' );
$css->add_property( 'text-decoration', 'underline' );
}
if ( 'not-hover' === $underline_links ) {
$css->set_selector( 'a' );
$css->add_property( 'text-decoration', 'underline' );
$css->set_selector( 'a:hover, a:focus' );
$css->add_property( 'text-decoration', 'none' );
}
$css->set_selector( '.entry-title a, .site-branding a, a.button, .wp-block-button__link, .main-navigation a' );
$css->add_property( 'text-decoration', 'none' );
}
$css->set_selector( 'a:hover, a:focus, a:active' );
$css->add_property( 'color', $settings['link_color_hover'] );
@ -62,13 +87,8 @@ if ( ! function_exists( 'generate_base_css' ) ) {
$css->start_media_query( $media_query );
$css->set_selector( '.inside-header' );
$css->add_property( 'display', '-ms-flexbox' );
$css->add_property( 'display', 'flex' );
$css->add_property( '-ms-flex-direction', 'column' );
$css->add_property( 'flex-direction', 'column' );
$css->add_property( '-ms-flex-align', 'center' );
$css->add_property( 'align-items', 'center' );
$css->set_selector( '.site-logo, .site-branding' );
@ -83,8 +103,6 @@ if ( ! function_exists( 'generate_base_css' ) ) {
// phpcs:ignore Generic.WhiteSpace.ScopeIndent.IncorrectExact -- Indented inside media query.
if ( 'nav-float-left' === generate_get_option( 'nav_position_setting' ) ) {
$css->set_selector( '.nav-float-left .site-logo,.nav-float-left .site-branding,.nav-float-left .header-widget' );
$css->add_property( '-webkit-box-ordinal-group', 'initial' );
$css->add_property( '-ms-flex-order', 'initial' );
$css->add_property( 'order', 'initial' );
} // phpcs:ignore Generic.WhiteSpace.ScopeIndent.IncorrectExact -- Indented inside media query.
$css->stop_media_query();
@ -180,6 +198,11 @@ if ( ! function_exists( 'generate_base_css' ) ) {
$css->add_property( 'left', '0' );
$css->add_property( 'top', 'auto' );
$css->add_property( 'position', 'relative' );
$css->add_property( 'box-shadow', 'none' );
$css->add_property( 'border-bottom', '1px solid rgba(0,0,0,0.05)' );
$css->set_selector( '.dropdown-click .main-navigation ul ul li:last-child > ul.toggled-on' );
$css->add_property( 'border-bottom', '0' );
$css->set_selector( '.dropdown-click .main-navigation ul.toggled-on, .dropdown-click .main-navigation ul li.sfHover > ul.toggled-on' );
$css->add_property( 'display', 'block' );
@ -190,6 +213,7 @@ if ( ! function_exists( 'generate_base_css' ) ) {
$css->add_property( 'pointer-events', 'auto' );
$css->add_property( 'height', 'auto' );
$css->add_property( 'overflow', 'visible' );
$css->add_property( 'float', 'none' );
$css->set_selector( '.dropdown-click .main-navigation.sub-menu-left .sub-menu.toggled-on, .dropdown-click .main-navigation.sub-menu-left ul li.sfHover > ul.toggled-on' );
$css->add_property( 'right', '0' );
@ -217,6 +241,28 @@ if ( ! function_exists( 'generate_base_css' ) ) {
$css->add_property( 'transform', 'rotate(180deg)' );
}
$css->set_selector( ':root' );
$global_colors = generate_get_global_colors();
if ( ! empty( $global_colors ) ) {
foreach ( (array) $global_colors as $key => $data ) {
if ( ! empty( $data['slug'] ) && ! empty( $data['color'] ) ) {
$css->add_property( '--' . $data['slug'], $data['color'] );
}
}
foreach ( (array) $global_colors as $key => $data ) {
if ( ! empty( $data['slug'] ) && ! empty( $data['color'] ) ) {
$css->set_selector( '.has-' . $data['slug'] . '-color' );
$css->add_property( 'color', $data['color'] );
$css->set_selector( '.has-' . $data['slug'] . '-background-color' );
$css->add_property( 'background-color', $data['color'] );
}
}
}
do_action( 'generate_base_css', $css );
return apply_filters( 'generate_base_css_output', $css->css_output() );
@ -271,10 +317,10 @@ if ( ! function_exists( 'generate_advanced_css' ) ) {
$css->set_selector( '.main-navigation,.main-navigation ul ul' );
$css->add_property( 'background-color', $settings['navigation_background_color'] );
$css->set_selector( '.main-navigation .main-nav ul li a,.menu-toggle, .main-navigation .menu-bar-items' );
$css->set_selector( '.main-navigation .main-nav ul li a, .main-navigation .menu-toggle, .main-navigation .menu-bar-items' );
$css->add_property( 'color', $settings['navigation_text_color'] );
$css->set_selector( '.main-navigation .main-nav ul li:hover > a,.main-navigation .main-nav ul li:focus > a, .main-navigation .main-nav ul li.sfHover > a, .main-navigation .menu-bar-item:hover > a, .main-navigation .menu-bar-item.sfHover > a' );
$css->set_selector( '.main-navigation .main-nav ul li:not([class*="current-menu-"]):hover > a, .main-navigation .main-nav ul li:not([class*="current-menu-"]):focus > a, .main-navigation .main-nav ul li.sfHover:not([class*="current-menu-"]) > a, .main-navigation .menu-bar-item:hover > a, .main-navigation .menu-bar-item.sfHover > a' );
$css->add_property( 'color', $settings['navigation_text_hover_color'] );
$css->add_property( 'background-color', $settings['navigation_background_hover_color'] );
@ -290,10 +336,6 @@ if ( ! function_exists( 'generate_advanced_css' ) ) {
$css->add_property( 'color', $settings['navigation_text_current_color'] );
$css->add_property( 'background-color', $settings['navigation_background_current_color'] );
$css->set_selector( '.main-navigation .main-nav ul li[class*="current-menu-"] > a:hover,.main-navigation .main-nav ul li[class*="current-menu-"].sfHover > a' );
$css->add_property( 'color', $settings['navigation_text_current_color'] );
$css->add_property( 'background-color', $settings['navigation_background_current_color'] );
$navigation_search_background = $settings['navigation_background_hover_color'];
$navigation_search_text = $settings['navigation_text_hover_color'];
@ -319,7 +361,7 @@ if ( ! function_exists( 'generate_advanced_css' ) ) {
$css->set_selector( '.main-navigation .main-nav ul ul li a' );
$css->add_property( 'color', $settings['subnavigation_text_color'] );
$css->set_selector( '.main-navigation .main-nav ul ul li:hover > a,.main-navigation .main-nav ul ul li:focus > a,.main-navigation .main-nav ul ul li.sfHover > a' );
$css->set_selector( '.main-navigation .main-nav ul ul li:not([class*="current-menu-"]):hover > a,.main-navigation .main-nav ul ul li:not([class*="current-menu-"]):focus > a, .main-navigation .main-nav ul ul li.sfHover:not([class*="current-menu-"]) > a' );
$css->add_property( 'color', $settings['subnavigation_text_hover_color'] );
$css->add_property( 'background-color', $settings['subnavigation_background_hover_color'] );
@ -327,10 +369,6 @@ if ( ! function_exists( 'generate_advanced_css' ) ) {
$css->add_property( 'color', $settings['subnavigation_text_current_color'] );
$css->add_property( 'background-color', $settings['subnavigation_background_current_color'] );
$css->set_selector( '.main-navigation .main-nav ul ul li[class*="current-menu-"] > a:hover,.main-navigation .main-nav ul ul li[class*="current-menu-"].sfHover > a' );
$css->add_property( 'color', $settings['subnavigation_text_current_color'] );
$css->add_property( 'background-color', $settings['subnavigation_background_current_color'] );
$css->set_selector( '.separate-containers .inside-article, .separate-containers .comments-area, .separate-containers .page-header, .one-container .container, .separate-containers .paging-navigation, .inside-page-header' );
$css->add_property( 'color', $settings['content_text_color'] );
$css->add_property( 'background-color', $settings['content_background_color'] );
@ -498,8 +536,10 @@ if ( ! function_exists( 'generate_font_css' ) ) {
$css->set_selector( 'p' );
$css->add_property( 'margin-bottom', floatval( $settings['paragraph_margin'] ), $defaults['paragraph_margin'], 'em' );
if ( apply_filters( 'generate_do_wp_block_margin_bottom', true ) ) {
$css->set_selector( '.entry-content > [class*="wp-block-"]:not(:last-child)' );
$css->add_property( 'margin-bottom', floatval( $settings['paragraph_margin'] ), false, 'em' );
}
$css->set_selector( '.top-bar' );
$css->add_property( 'font-family', $defaults['font_top_bar'] !== $settings['font_top_bar'] ? $top_bar_family : null );
@ -1161,7 +1201,13 @@ function generate_no_cache_dynamic_css() {
* @since 3.0.0
*/
function generate_get_dynamic_css() {
$css = generate_base_css() . generate_font_css() . generate_advanced_css() . generate_spacing_css();
if ( generate_is_using_dynamic_typography() ) {
$typography_css = GeneratePress_Typography::get_css();
} else {
$typography_css = generate_font_css();
}
$css = generate_base_css() . $typography_css . generate_advanced_css() . generate_spacing_css();
return apply_filters( 'generate_dynamic_css', $css );
}
@ -1203,7 +1249,7 @@ function generate_set_dynamic_css_cache() {
$cached_version = get_option( 'generate_dynamic_css_cached_version', '' );
if ( ! $cached_css || GENERATE_VERSION !== $cached_version ) {
$css = generate_base_css() . generate_font_css() . generate_advanced_css() . generate_spacing_css();
$css = generate_get_dynamic_css();
update_option( 'generate_dynamic_css_output', wp_strip_all_tags( $css ) );
update_option( 'generate_dynamic_css_cached_version', esc_html( GENERATE_VERSION ) );
@ -1221,6 +1267,6 @@ function generate_update_dynamic_css_cache() {
return;
}
$css = generate_base_css() . generate_font_css() . generate_advanced_css() . generate_spacing_css();
$css = generate_get_dynamic_css();
update_option( 'generate_dynamic_css_output', wp_strip_all_tags( $css ) );
}

View File

@ -21,16 +21,20 @@ function generate_set_customizer_helpers() {
}
if ( ! function_exists( 'generate_customize_register' ) ) {
add_action( 'customize_register', 'generate_customize_register' );
add_action( 'customize_register', 'generate_customize_register', 20 );
/**
* Add our base options to the Customizer.
*
* @param WP_Customize_Manager $wp_customize Theme Customizer object.
*/
function generate_customize_register( $wp_customize ) {
$defaults = generate_get_defaults();
if ( version_compare( PHP_VERSION, '5.6', '<' ) ) {
return;
}
require_once trailingslashit( get_template_directory() ) . 'inc/customizer/customizer-helpers.php';
$defaults = generate_get_defaults();
$color_defaults = generate_get_color_defaults();
$typography_defaults = generate_get_default_fonts();
if ( $wp_customize->get_control( 'blogdescription' ) ) {
$wp_customize->get_control( 'blogdescription' )->priority = 3;
@ -226,346 +230,264 @@ if ( ! function_exists( 'generate_customize_register' ) ) {
);
$wp_customize->add_section(
'body_section',
'generate_colors_section',
array(
'title' => $wp_customize->get_panel( 'generate_colors_panel' ) ? __( 'Body', 'generatepress' ) : __( 'Colors', 'generatepress' ),
'capability' => 'edit_theme_options',
'title' => esc_attr__( 'Colors', 'generatepress' ),
'priority' => 30,
'panel' => $wp_customize->get_panel( 'generate_colors_panel' ) ? 'generate_colors_panel' : false,
)
);
$wp_customize->add_setting(
'generate_settings[background_color]',
GeneratePress_Customize_Field::add_title(
'generate_color_manager_title',
array(
'default' => $defaults['background_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
'section' => 'generate_colors_section',
'title' => __( 'Global Colors', 'generatepress' ),
)
);
$wp_customize->add_control(
new WP_Customize_Color_Control(
$wp_customize,
'generate_settings[background_color]',
GeneratePress_Customize_Field::add_field(
'generate_settings[global_colors]',
'GeneratePress_Customize_React_Control',
array(
'label' => __( 'Background Color', 'generatepress' ),
'section' => 'body_section',
'settings' => 'generate_settings[background_color]',
)
)
);
'default' => $defaults['global_colors'],
'sanitize_callback' => function( $colors ) {
if ( ! is_array( $colors ) ) {
return;
}
$wp_customize->add_setting(
'generate_settings[text_color]',
array(
'default' => $defaults['text_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$new_settings = array();
$wp_customize->add_control(
new WP_Customize_Color_Control(
$wp_customize,
'generate_settings[text_color]',
array(
'label' => __( 'Text Color', 'generatepress' ),
'section' => 'body_section',
'settings' => 'generate_settings[text_color]',
)
)
);
foreach ( (array) $colors as $key => $data ) {
if ( empty( $data['slug'] ) || empty( $data['color'] ) ) {
continue;
}
$wp_customize->add_setting(
'generate_settings[link_color]',
array(
'default' => $defaults['link_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$slug = preg_replace( '/[^a-z0-9-\s]+/i', '', $data['slug'] );
$slug = strtolower( $slug );
$new_settings[ $key ]['name'] = sanitize_text_field( $slug );
$new_settings[ $key ]['slug'] = sanitize_text_field( $slug );
$new_settings[ $key ]['color'] = generate_sanitize_rgba_color( $data['color'] );
}
$wp_customize->add_control(
new WP_Customize_Color_Control(
$wp_customize,
'generate_settings[link_color]',
array(
'label' => __( 'Link Color', 'generatepress' ),
'section' => 'body_section',
'settings' => 'generate_settings[link_color]',
)
)
);
// Reset array keys starting at 0.
$new_settings = array_values( $new_settings );
$wp_customize->add_setting(
'generate_settings[link_color_hover]',
array(
'default' => $defaults['link_color_hover'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_control(
new WP_Customize_Color_Control(
$wp_customize,
'generate_settings[link_color_hover]',
array(
'label' => __( 'Link Color Hover', 'generatepress' ),
'section' => 'body_section',
'settings' => 'generate_settings[link_color_hover]',
)
)
);
if ( '' !== generate_get_option( 'link_color_visited' ) ) {
$wp_customize->add_setting(
'generate_settings[link_color_visited]',
array(
'default' => $defaults['link_color_visited'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
return $new_settings;
},
'transport' => 'refresh',
),
array(
'type' => 'generate-color-manager-control',
'label' => __( 'Choose Color', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'showPalette' => false,
'showReset' => false,
'showVarName' => true,
),
)
);
$wp_customize->add_control(
new WP_Customize_Color_Control(
$wp_customize,
'generate_settings[link_color_visited]',
$fields_dir = trailingslashit( get_template_directory() ) . 'inc/customizer/fields';
require_once $fields_dir . '/body.php';
require_once $fields_dir . '/top-bar.php';
require_once $fields_dir . '/header.php';
require_once $fields_dir . '/primary-navigation.php';
do_action( 'generate_customize_after_primary_navigation', $wp_customize );
require_once $fields_dir . '/buttons.php';
require_once $fields_dir . '/content.php';
require_once $fields_dir . '/forms.php';
require_once $fields_dir . '/sidebar-widgets.php';
require_once $fields_dir . '/footer-widgets.php';
require_once $fields_dir . '/footer-bar.php';
require_once $fields_dir . '/back-to-top.php';
do_action( 'generate_customize_after_controls', $wp_customize );
$wp_customize->add_section(
'generate_typography_section',
array(
'label' => __( 'Link Color Visited', 'generatepress' ),
'section' => 'body_section',
'settings' => 'generate_settings[link_color_visited]',
)
)
);
'title' => esc_attr__( 'Typography', 'generatepress' ),
'priority' => 35,
'active_callback' => function() {
if ( ! generate_is_using_dynamic_typography() ) {
return false;
}
$color_defaults = generate_get_color_defaults();
if ( ! $wp_customize->get_setting( 'generate_settings[blog_post_title_color]' ) ) {
$wp_customize->add_setting(
'generate_settings[blog_post_title_color]',
array(
'default' => $color_defaults['blog_post_title_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
return true;
},
)
);
$wp_customize->add_control(
new WP_Customize_Color_Control(
$wp_customize,
'blog_post_title_color',
GeneratePress_Customize_Field::add_title(
'generate_font_manager_title',
array(
'label' => __( 'Blog Post Title', 'generatepress' ),
'section' => $wp_customize->get_section( 'content_color_section' ) ? 'content_color_section' : 'body_section',
'settings' => 'generate_settings[blog_post_title_color]',
)
'section' => 'generate_typography_section',
'title' => __( 'Font Manager', 'generatepress' ),
)
);
$wp_customize->add_setting(
'generate_settings[blog_post_title_hover_color]',
GeneratePress_Customize_Field::add_field(
'generate_settings[font_manager]',
'GeneratePress_Customize_React_Control',
array(
'default' => $color_defaults['blog_post_title_hover_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_control(
new WP_Customize_Color_Control(
$wp_customize,
'blog_post_title_hover_color',
array(
'label' => __( 'Blog Post Title Hover', 'generatepress' ),
'section' => $wp_customize->get_section( 'content_color_section' ) ? 'content_color_section' : 'body_section',
'settings' => 'generate_settings[blog_post_title_hover_color]',
)
)
);
'default' => $defaults['font_manager'],
'sanitize_callback' => function( $fonts ) {
if ( ! is_array( $fonts ) ) {
return;
}
$wp_customize->add_setting(
'nav_color_presets',
$options = array(
'fontFamily' => 'sanitize_text_field',
'googleFont' => 'rest_sanitize_boolean',
'googleFontApi' => 'absint',
'googleFontCategory' => 'sanitize_text_field',
'googleFontVariants' => 'sanitize_text_field',
);
$new_settings = array();
foreach ( (array) $fonts as $key => $data ) {
if ( empty( $data['fontFamily'] ) ) {
continue;
}
foreach ( $options as $option => $sanitize ) {
if ( array_key_exists( $option, $data ) ) {
$new_settings[ $key ][ $option ] = $sanitize( $data[ $option ] );
}
}
}
// Reset array keys starting at 0.
$new_settings = array_values( $new_settings );
return $new_settings;
},
'transport' => 'refresh',
),
array(
'default' => 'current',
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_preset_layout',
'transport' => 'postMessage',
'type' => 'generate-font-manager-control',
'label' => __( 'Choose Font', 'generatepress' ),
'section' => 'generate_typography_section',
)
);
$wp_customize->add_control(
'nav_color_presets',
GeneratePress_Customize_Field::add_field(
'generate_settings[google_font_display]',
'',
array(
'default' => $defaults['google_font_display'],
'sanitize_callback' => 'generate_sanitize_choices',
'transport' => 'refresh',
),
array(
'type' => 'select',
'label' => __( 'Navigation Color Presets', 'generatepress' ),
'section' => $wp_customize->get_section( 'navigation_color_section' ) ? 'navigation_color_section' : 'body_section',
'priority' => $wp_customize->get_section( 'navigation_color_section' ) ? 0 : null,
'choices' => array(
'current' => __( 'Current', 'generatepress' ),
'default' => __( 'Default', 'generatepress' ),
'classic' => __( 'Classic', 'generatepress' ),
'grey' => __( 'Grey', 'generatepress' ),
'red' => __( 'Red', 'generatepress' ),
'green' => __( 'Green', 'generatepress' ),
'blue' => __( 'Blue', 'generatepress' ),
'label' => __( 'Google font-display', 'generatepress' ),
'description' => sprintf(
'<a href="%s" target="_blank" rel="noreferrer noopener">%s</a>',
'https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display',
esc_html__( 'Learn about font-display', 'generatepress' )
),
'settings' => 'nav_color_presets',
)
);
'section' => 'generate_typography_section',
'choices' => array(
'auto' => esc_html__( 'Auto', 'generatepress' ),
'block' => esc_html__( 'Block', 'generatepress' ),
'swap' => esc_html__( 'Swap', 'generatepress' ),
'fallback' => esc_html__( 'Fallback', 'generatepress' ),
'optional' => esc_html__( 'Optional', 'generatepress' ),
),
'active_callback' => function() {
$font_manager = generate_get_option( 'font_manager' );
$has_google_font = false;
if ( ! $wp_customize->get_setting( 'generate_settings[navigation_background_color]' ) ) {
$wp_customize->add_setting(
'generate_settings[navigation_background_color]',
array(
'default' => $color_defaults['navigation_background_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_setting(
'generate_settings[navigation_text_color]',
array(
'default' => $color_defaults['navigation_text_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_setting(
'generate_settings[navigation_background_hover_color]',
array(
'default' => $color_defaults['navigation_background_hover_color'],
'type' => 'option',
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
)
);
$wp_customize->add_setting(
'generate_settings[navigation_text_hover_color]',
array(
'default' => $color_defaults['navigation_text_hover_color'],
'type' => 'option',
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_hex_color',
)
);
$wp_customize->add_setting(
'generate_settings[navigation_background_current_color]',
array(
'default' => $color_defaults['navigation_background_current_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_setting(
'generate_settings[navigation_text_current_color]',
array(
'default' => $color_defaults['navigation_text_current_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_setting(
'generate_settings[subnavigation_background_color]',
array(
'default' => $color_defaults['subnavigation_background_color'],
'type' => 'option',
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
)
);
$wp_customize->add_setting(
'generate_settings[subnavigation_text_color]',
array(
'default' => $color_defaults['subnavigation_text_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_setting(
'generate_settings[subnavigation_background_hover_color]',
array(
'default' => $color_defaults['subnavigation_background_hover_color'],
'type' => 'option',
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
)
);
$wp_customize->add_setting(
'generate_settings[subnavigation_text_hover_color]',
array(
'default' => $color_defaults['subnavigation_text_hover_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
$wp_customize->add_setting(
'generate_settings[subnavigation_background_current_color]',
array(
'default' => $color_defaults['subnavigation_background_current_color'],
'type' => 'option',
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
)
);
$wp_customize->add_setting(
'generate_settings[subnavigation_text_current_color]',
array(
'default' => $color_defaults['subnavigation_text_current_color'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
)
);
foreach ( (array) $font_manager as $key => $data ) {
if ( ! empty( $data['googleFont'] ) ) {
$has_google_font = true;
break;
}
}
if ( ! function_exists( 'generate_colors_customize_register' ) && ! defined( 'GP_PREMIUM_VERSION' ) ) {
$wp_customize->add_control(
new Generate_Customize_Misc_Control(
$wp_customize,
'colors_get_addon_desc',
array(
'section' => 'body_section',
'type' => 'addon',
'label' => __( 'Learn More', 'generatepress' ),
'description' => __( 'More options are available for this section in our premium version.', 'generatepress' ),
'url' => generate_get_premium_url( 'https://generatepress.com/premium/#colors', false ),
'priority' => 30,
'settings' => ( isset( $wp_customize->selective_refresh ) ) ? array() : 'blogname',
)
return $has_google_font;
},
)
);
GeneratePress_Customize_Field::add_title(
'generate_typography_manager_title',
array(
'section' => 'generate_typography_section',
'title' => __( 'Typography Manager', 'generatepress' ),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[typography]',
'GeneratePress_Customize_React_Control',
array(
'default' => $defaults['typography'],
'sanitize_callback' => function( $settings ) {
if ( ! is_array( $settings ) ) {
return;
}
if ( class_exists( 'WP_Customize_Panel' ) ) {
$options = array(
'selector' => 'sanitize_text_field',
'customSelector' => 'sanitize_text_field',
'fontFamily' => 'sanitize_text_field',
'fontWeight' => 'sanitize_text_field',
'textTransform' => 'sanitize_text_field',
'fontSize' => 'generate_sanitize_empty_decimal_integer',
'fontSizeTablet' => 'generate_sanitize_empty_decimal_integer',
'fontSizeMobile' => 'generate_sanitize_empty_decimal_integer',
'fontSizeUnit' => 'sanitize_text_field',
'lineHeight' => 'generate_sanitize_empty_decimal_integer',
'lineHeightTablet' => 'generate_sanitize_empty_decimal_integer',
'lineHeightMobile' => 'generate_sanitize_empty_decimal_integer',
'lineHeightUnit' => 'sanitize_text_field',
'letterSpacing' => 'generate_sanitize_empty_negative_decimal_integer',
'letterSpacingTablet' => 'generate_sanitize_empty_negative_decimal_integer',
'letterSpacingMobile' => 'generate_sanitize_empty_negative_decimal_integer',
'letterSpacingUnit' => 'sanitize_text_field',
'marginBottom' => 'generate_sanitize_empty_decimal_integer',
'marginBottomTablet' => 'generate_sanitize_empty_decimal_integer',
'marginBottomMobile' => 'generate_sanitize_empty_decimal_integer',
'marginBottomUnit' => 'sanitize_text_field',
'module' => 'sanitize_text_field',
'group' => 'sanitize_text_field',
);
$new_settings = array();
foreach ( (array) $settings as $key => $data ) {
if ( empty( $data['selector'] ) ) {
continue;
}
foreach ( $options as $option => $sanitize ) {
if ( array_key_exists( $option, $data ) ) {
$new_settings[ $key ][ $option ] = $sanitize( $data[ $option ] );
}
}
}
// Reset array keys starting at 0.
$new_settings = array_values( $new_settings );
return $new_settings;
},
'transport' => 'refresh',
),
array(
'type' => 'generate-typography-control',
'label' => __( 'Configure', 'generatepress' ),
'section' => 'generate_typography_section',
)
);
if ( ! $wp_customize->get_panel( 'generate_layout_panel' ) ) {
$wp_customize->add_panel(
'generate_layout_panel',
@ -575,7 +497,6 @@ if ( ! function_exists( 'generate_customize_register' ) ) {
)
);
}
}
$wp_customize->add_section(
'generate_layout_container',
@ -1456,7 +1377,7 @@ if ( ! function_exists( 'generate_customize_register' ) ) {
}
if ( generate_is_using_flexbox() ) {
$show_flexbox_option = true;
$show_flexbox_option = false;
}
$show_flexbox_option = apply_filters( 'generate_show_flexbox_customizer_option', $show_flexbox_option );
@ -1518,6 +1439,32 @@ if ( ! function_exists( 'generate_customize_register' ) ) {
)
);
$wp_customize->add_setting(
'generate_settings[underline_links]',
array(
'default' => $defaults['underline_links'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_choices',
)
);
$wp_customize->add_control(
'generate_settings[underline_links]',
array(
'type' => 'select',
'label' => __( 'Underline Links', 'generatepress' ),
'description' => __( 'Add underlines to your links in your main content areas.', 'generatepress' ),
'section' => 'generate_general_section',
'choices' => array(
'always' => __( 'Always', 'generatepress' ),
'hover' => __( 'On hover', 'generatepress' ),
'not-hover' => __( 'Not on hover', 'generatepress' ),
'never' => __( 'Never', 'generatepress' ),
),
'settings' => 'generate_settings[underline_links]',
)
);
$wp_customize->add_setting(
'generate_settings[combine_css]',
array(
@ -1556,5 +1503,43 @@ if ( ! function_exists( 'generate_customize_register' ) ) {
'section' => 'generate_general_section',
)
);
$show_legacy_typography_option = true;
if ( defined( 'GP_PREMIUM_VERSION' ) && version_compare( GP_PREMIUM_VERSION, '2.1.0-alpha.1', '<' ) ) {
$show_legacy_typography_option = false;
}
if ( generate_is_using_dynamic_typography() ) {
$show_legacy_typography_option = false;
}
$show_legacy_typography_option = apply_filters( 'generate_show_legacy_typography_customizer_option', $show_legacy_typography_option );
if ( $show_legacy_typography_option ) {
$wp_customize->add_setting(
'generate_settings[use_dynamic_typography]',
array(
'default' => $defaults['use_dynamic_typography'],
'type' => 'option',
'sanitize_callback' => 'generate_sanitize_checkbox',
)
);
$wp_customize->add_control(
'generate_settings[use_dynamic_typography]',
array(
'type' => 'checkbox',
'label' => __( 'Use dynamic typography system', 'generatepress' ),
'description' => sprintf(
/* translators: Learn more here */
__( 'Switching to our dynamic typography system can change how your fonts display. Review your website thoroughly before publishing this change. Learn more %s.', 'generatepress' ),
'<a href="https://docs.generatepress.com/article/switching-to-dynamic-typography/" target="_blank" rel="noopener noreferrer">' . __( 'here', 'generatepress' ) . '</a>'
),
'section' => 'generate_general_section',
'settings' => 'generate_settings[use_dynamic_typography]',
)
);
}
}
}

View File

@ -0,0 +1,217 @@
<?php
/**
* This file handles adding Customizer controls.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Helper functions to add Customizer fields.
*/
class GeneratePress_Customize_Field {
/**
* Instance.
*
* @access private
* @var object Instance
*/
private static $instance;
/**
* Initiator.
*
* @since 1.2.0
* @return object initialized object of class.
*/
public static function get_instance() {
if ( ! isset( self::$instance ) ) {
self::$instance = new self();
}
return self::$instance;
}
/**
* Add a wrapper for defined controls.
*
* @param string $id The settings ID for this field.
* @param array $control_args The args for add_control().
*/
public static function add_wrapper( $id, $control_args = array() ) {
global $wp_customize;
if ( ! $id ) {
return;
}
$control_args['settings'] = isset( $wp_customize->selective_refresh ) ? array() : 'blogname';
$control_args['choices']['id'] = str_replace( '_', '-', $id );
$control_args['type'] = 'generate-wrapper-control';
$wp_customize->add_control(
new GeneratePress_Customize_React_Control(
$wp_customize,
$id,
$control_args
)
);
}
/**
* Add a title.
*
* @param string $id The settings ID for this field.
* @param array $control_args The args for add_control().
*/
public static function add_title( $id, $control_args = array() ) {
global $wp_customize;
if ( ! $id ) {
return;
}
$control_args['settings'] = isset( $wp_customize->selective_refresh ) ? array() : 'blogname';
$control_args['type'] = 'generate-title-control';
$control_args['choices']['title'] = $control_args['title'];
unset( $control_args['title'] );
$wp_customize->add_control(
new GeneratePress_Customize_React_Control(
$wp_customize,
$id,
$control_args
)
);
}
/**
* Add a Customizer field.
*
* @param string $id The settings ID for this field.
* @param object $control_class A custom control classes if we want one.
* @param array $setting_args The args for add_setting().
* @param array $control_args The args for add_control().
*/
public static function add_field( $id, $control_class, $setting_args = array(), $control_args = array() ) {
global $wp_customize;
if ( ! $id ) {
return;
}
$settings = wp_parse_args(
$setting_args,
array(
'type' => 'option',
'capability' => 'edit_theme_options',
'default' => '',
'transport' => 'refresh',
'validate_callback' => '',
'sanitize_callback' => '',
)
);
$wp_customize->add_setting(
$id,
array(
'type' => $settings['type'],
'capability' => $settings['capability'],
'default' => $settings['default'],
'transport' => $settings['transport'],
'validate_callback' => $settings['validate_callback'],
'sanitize_callback' => $settings['sanitize_callback'],
)
);
$control_args['settings'] = $id;
if ( ! isset( $control_args['type'] ) ) {
unset( $control_args['type'] );
}
if ( ! isset( $control_args['defaultValue'] ) && isset( $setting_args['default'] ) ) {
$control_args['defaultValue'] = $setting_args['default'];
}
if ( isset( $control_args['output'] ) ) {
global $generate_customize_fields;
$generate_customize_fields[] = array(
'js_vars' => $control_args['output'],
'settings' => $id,
);
}
if ( $control_class ) {
$wp_customize->add_control(
new $control_class(
$wp_customize,
$id,
$control_args
)
);
return;
}
$wp_customize->add_control(
$id,
$control_args
);
}
/**
* Add color field group.
*
* @param string $id The ID for the group wrapper.
* @param string $section_id The section ID.
* @param string $toggle_id The Toggle ID.
* @param array $fields The color fields.
*/
public static function add_color_field_group( $id, $section_id, $toggle_id, $fields ) {
self::add_wrapper(
"generate_{$id}_wrapper",
array(
'section' => $section_id,
'choices' => array(
'type' => 'color',
'toggleId' => $toggle_id,
'items' => array_keys( $fields ),
),
)
);
foreach ( $fields as $key => $field ) {
self::add_field(
$key,
'GeneratePress_Customize_Color_Control',
array(
'default' => $field['default_value'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => $field['label'],
'section' => $section_id,
'choices' => array(
'alpha' => isset( $field['alpha'] ) ? $field['alpha'] : true,
'toggleId' => $toggle_id,
'wrapper' => $key,
'tooltip' => $field['tooltip'],
'hideLabel' => isset( $field['hide_label'] ) ? $field['hide_label'] : false,
),
'output' => array(
array(
'element' => $field['element'],
'property' => $field['property'],
),
),
)
);
}
}
}

View File

@ -0,0 +1,44 @@
<?php
/**
* Customize API: ColorAlpha class
*
* @package GeneratePress
*/
/**
* Customize Color Control class.
*
* @since 1.0.0
*
* @see WP_Customize_Control
*/
class GeneratePress_Customize_Color_Control extends WP_Customize_Color_Control {
/**
* Type.
*
* @access public
* @since 1.0.0
* @var string
*/
public $type = 'generate-color-control';
/**
* Refresh the parameters passed to the JavaScript via JSON.
*
* @since 3.4.0
* @uses WP_Customize_Control::to_json()
*/
public function to_json() {
parent::to_json();
$this->json['choices'] = $this->choices;
}
/**
* Empty JS template.
*
* @access public
* @since 1.0.0
* @return void
*/
public function content_template() {}
}

View File

@ -0,0 +1,53 @@
<?php
/**
* Customize API: ColorAlpha class
*
* @package GeneratePress
*/
/**
* Customize Color Control class.
*
* @since 1.0.0
*
* @see WP_Customize_Control
*/
class GeneratePress_Customize_React_Control extends WP_Customize_Control {
/**
* Type.
*
* @access public
* @since 1.0.0
* @var string
*/
public $type = 'generate-react-control';
/**
* Refresh the parameters passed to the JavaScript via JSON.
*
* @since 3.4.0
* @uses WP_Customize_Control::to_json()
*/
public function to_json() {
parent::to_json();
$this->json['choices'] = $this->choices;
}
/**
* Empty JS template.
*
* @access public
* @since 1.0.0
* @return void
*/
public function content_template() {}
/**
* Empty PHP template.
*
* @access public
* @since 1.0.0
* @return void
*/
public function render_content() {}
}

View File

@ -278,224 +278,20 @@
} );
} );
api( 'nav_color_presets', function( value ) {
var backgroundColor = false,
textColor = false,
backgroundColorHover = false,
textColorHover = false,
currentBackgroundColor = false,
currentTextColor = false,
subMenuBackgroundColor = false,
subMenuTextColor = false,
subMenuBackgroundColorHover = false,
subMenuTextColorHover = false,
subMenuCurrentBackgroundColor = false,
subMenuCurrentTextColor = false;
api( 'generate_settings[use_dynamic_typography]', function( value ) {
var fontManager = api.control( 'generate_settings[font_manager]' );
var typographyManager = api.control( 'generate_settings[typography]' );
value.bind( function( newval ) {
var backgroundColorSetting = api.instance( 'generate_settings[navigation_background_color]' ),
textColorSetting = api.instance( 'generate_settings[navigation_text_color]' ),
backgroundColorHoverSetting = api.instance( 'generate_settings[navigation_background_hover_color]' ),
textColorHoverSetting = api.instance( 'generate_settings[navigation_text_hover_color]' ),
currentBackgroundColorSetting = api.instance( 'generate_settings[navigation_background_current_color]' ),
currentTextColorSetting = api.instance( 'generate_settings[navigation_text_current_color]' ),
subMenuBackgroundColorSetting = api.instance( 'generate_settings[subnavigation_background_color]' ),
subMenuTextColorSetting = api.instance( 'generate_settings[subnavigation_text_color]' ),
subMenuBackgroundColorHoverSetting = api.instance( 'generate_settings[subnavigation_background_hover_color]' ),
subMenuTextColorHoverSetting = api.instance( 'generate_settings[subnavigation_text_hover_color]' ),
subMenuCurrentBackgroundColorSetting = api.instance( 'generate_settings[subnavigation_background_current_color]' ),
subMenuCurrentTextColorSetting = api.instance( 'generate_settings[subnavigation_text_current_color]' );
if ( ! backgroundColorSetting._dirty ) {
backgroundColor = backgroundColorSetting.get();
if ( newval ) {
if ( fontManager.setting.get().length === 0 ) {
fontManager.setting.set( generatepressCustomizeControls.mappedTypographyData.fonts );
}
if ( ! textColorSetting._dirty ) {
textColor = textColorSetting.get();
if ( typographyManager.setting.get().length === 0 ) {
typographyManager.setting.set( generatepressCustomizeControls.mappedTypographyData.typography );
}
if ( ! backgroundColorHoverSetting._dirty ) {
backgroundColorHover = backgroundColorHoverSetting.get();
}
if ( ! textColorHoverSetting._dirty ) {
textColorHover = textColorHoverSetting.get();
}
if ( ! currentBackgroundColorSetting._dirty ) {
currentBackgroundColor = currentBackgroundColorSetting.get();
}
if ( ! currentTextColorSetting._dirty ) {
currentTextColor = currentTextColorSetting.get();
}
if ( ! subMenuBackgroundColorSetting._dirty ) {
subMenuBackgroundColor = subMenuBackgroundColorSetting.get();
}
if ( ! subMenuTextColorSetting._dirty ) {
subMenuTextColor = subMenuTextColorSetting.get();
}
if ( ! subMenuBackgroundColorHoverSetting._dirty ) {
subMenuBackgroundColorHover = subMenuBackgroundColorHoverSetting.get();
}
if ( ! subMenuTextColorHoverSetting._dirty ) {
subMenuTextColorHover = subMenuTextColorHoverSetting.get();
}
if ( ! subMenuCurrentBackgroundColorSetting._dirty ) {
subMenuCurrentBackgroundColor = subMenuCurrentBackgroundColorSetting.get();
}
if ( ! subMenuCurrentTextColorSetting._dirty ) {
subMenuCurrentTextColor = subMenuCurrentTextColorSetting.get();
}
if ( 'current' === newval ) {
backgroundColorSetting.set( backgroundColor );
textColorSetting.set( textColor );
backgroundColorHoverSetting.set( backgroundColorHover );
textColorHoverSetting.set( textColorHover );
currentBackgroundColorSetting.set( currentBackgroundColor );
currentTextColorSetting.set( currentTextColorSetting );
subMenuBackgroundColorSetting.set( subMenuBackgroundColor );
subMenuTextColorSetting.set( subMenuTextColor );
subMenuBackgroundColorHoverSetting.set( subMenuBackgroundColorHover );
subMenuTextColorHoverSetting.set( subMenuTextColorHover );
subMenuCurrentBackgroundColorSetting.set( subMenuCurrentBackgroundColor );
subMenuCurrentTextColorSetting.set( subMenuCurrentTextColorSetting );
}
if ( 'default' === newval ) {
backgroundColorSetting.set( generatepress_color_defaults.navigation_background_color );
textColorSetting.set( generatepress_color_defaults.navigation_text_color );
backgroundColorHoverSetting.set( generatepress_color_defaults.navigation_background_hover_color );
textColorHoverSetting.set( generatepress_color_defaults.navigation_text_hover_color );
currentBackgroundColorSetting.set( generatepress_color_defaults.navigation_background_current_color );
currentTextColorSetting.set( generatepress_color_defaults.navigation_text_current_color );
subMenuBackgroundColorSetting.set( generatepress_color_defaults.subnavigation_background_color );
subMenuTextColorSetting.set( generatepress_color_defaults.subnavigation_text_color );
subMenuBackgroundColorHoverSetting.set( generatepress_color_defaults.subnavigation_background_hover_color );
subMenuTextColorHoverSetting.set( generatepress_color_defaults.subnavigation_text_hover_color );
subMenuCurrentBackgroundColorSetting.set( generatepress_color_defaults.subnavigation_background_current_color );
subMenuCurrentTextColorSetting.set( generatepress_color_defaults.subnavigation_text_current_color );
}
if ( 'classic' === newval ) {
backgroundColorSetting.set( '#222222' );
textColorSetting.set( '#ffffff' );
backgroundColorHoverSetting.set( '#3f3f3f' );
textColorHoverSetting.set( '#ffffff' );
currentBackgroundColorSetting.set( '#3f3f3f' );
currentTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorSetting.set( '#3f3f3f' );
subMenuTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorHoverSetting.set( '#4f4f4f' );
subMenuTextColorHoverSetting.set( '#ffffff' );
subMenuCurrentBackgroundColorSetting.set( '#4f4f4f' );
subMenuCurrentTextColorSetting.set( '#ffffff' );
}
if ( 'grey' === newval ) {
backgroundColorSetting.set( '#595959' );
textColorSetting.set( '#ffffff' );
backgroundColorHoverSetting.set( '#424242' );
textColorHoverSetting.set( '#ffffff' );
currentBackgroundColorSetting.set( '#424242' );
currentTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorSetting.set( '#424242' );
subMenuTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorHoverSetting.set( '#424242' );
subMenuTextColorHoverSetting.set( '#dbdbdb' );
subMenuCurrentBackgroundColorSetting.set( '#424242' );
subMenuCurrentTextColorSetting.set( '#dbdbdb' );
}
if ( 'blue' === newval ) {
backgroundColorSetting.set( '#1e73be' );
textColorSetting.set( '#ffffff' );
backgroundColorHoverSetting.set( '#035a9e' );
textColorHoverSetting.set( '#ffffff' );
currentBackgroundColorSetting.set( '#035a9e' );
currentTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorSetting.set( '#035a9e' );
subMenuTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorHoverSetting.set( '#035a9e' );
subMenuTextColorHoverSetting.set( '#bbd2e8' );
subMenuCurrentBackgroundColorSetting.set( '#035a9e' );
subMenuCurrentTextColorSetting.set( '#bbd2e8' );
}
if ( 'red' === newval ) {
backgroundColorSetting.set( '#ed4250' );
textColorSetting.set( '#ffffff' );
backgroundColorHoverSetting.set( '#c42f2f' );
textColorHoverSetting.set( '#ffffff' );
currentBackgroundColorSetting.set( '#c42f2f' );
currentTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorSetting.set( '#c42f2f' );
subMenuTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorHoverSetting.set( '#c42f2f' );
subMenuTextColorHoverSetting.set( '#fcd9d6' );
subMenuCurrentBackgroundColorSetting.set( '#c42f2f' );
subMenuCurrentTextColorSetting.set( '#fcd9d6' );
}
if ( 'green' === newval ) {
backgroundColorSetting.set( '#16aa74' );
textColorSetting.set( '#ffffff' );
backgroundColorHoverSetting.set( '#119b6d' );
textColorHoverSetting.set( '#ffffff' );
currentBackgroundColorSetting.set( '#119b6d' );
currentTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorSetting.set( '#119b6d' );
subMenuTextColorSetting.set( '#ffffff' );
subMenuBackgroundColorHoverSetting.set( '#119b6d' );
subMenuTextColorHoverSetting.set( '#c2e8de' );
subMenuCurrentBackgroundColorSetting.set( '#119b6d' );
subMenuCurrentTextColorSetting.set( '#c2e8de' );
}
jQuery('.wp-color-picker').wpColorPicker().change();
} );
} );
}( wp.customize ) );

View File

@ -2,6 +2,12 @@
* Theme Customizer enhancements for a better user experience.
*
* Contains handlers to make Theme Customizer preview reload changes asynchronously.
*
* @param id
* @param selector
* @param property
* @param default_value
* @param get_value
*/
function generatepress_colors_live_update( id, selector, property, default_value, get_value ) {
default_value = typeof default_value !== 'undefined' ? default_value : 'initial';
@ -9,16 +15,16 @@ function generatepress_colors_live_update( id, selector, property, default_value
wp.customize( 'generate_settings[' + id + ']', function( value ) {
value.bind( function( newval ) {
default_value = ( '' !== get_value ) ? wp.customize.value('generate_settings[' + get_value + ']')() : default_value;
default_value = ( '' !== get_value ) ? wp.customize.value( 'generate_settings[' + get_value + ']' )() : default_value;
newval = ( '' !== newval ) ? newval : default_value;
if ( jQuery( 'style#' + id ).length ) {
jQuery( 'style#' + id ).html( selector + '{' + property + ':' + newval + ';}' );
} else {
jQuery( 'head' ).append( '<style id="' + id + '">' + selector + '{' + property + ':' + newval + '}</style>' );
setTimeout(function() {
setTimeout( function() {
jQuery( 'style#' + id ).not( ':last' ).remove();
}, 1000);
}, 1000 );
}
} );
} );
@ -31,7 +37,7 @@ function generatepress_classes_live_update( id, classes, selector, prefix ) {
value.bind( function( newval ) {
jQuery.each( classes, function( i, v ) {
jQuery( selector ).removeClass( prefix + v );
});
} );
jQuery( selector ).addClass( prefix + newval );
} );
} );
@ -48,28 +54,27 @@ function generatepress_typography_live_update( id, selector, property, unit, med
isMobile = ( 'mobile' == id.substring( 0, 6 ) ) ? true : false;
if ( isTablet ) {
if ( '' == wp.customize(settings + '[' + id + ']').get() ) {
if ( '' == wp.customize( settings + '[' + id + ']' ).get() ) {
var desktopID = id.replace( 'tablet_', '' );
newval = wp.customize(settings + '[' + desktopID + ']').get();
newval = wp.customize( settings + '[' + desktopID + ']' ).get();
}
}
if ( isMobile ) {
if ( '' == wp.customize(settings + '[' + id + ']').get() ) {
if ( '' == wp.customize( settings + '[' + id + ']' ).get() ) {
var desktopID = id.replace( 'mobile_', '' );
newval = wp.customize(settings + '[' + desktopID + ']').get();
newval = wp.customize( settings + '[' + desktopID + ']' ).get();
}
}
if ( 'buttons_font_size' == id && '' == wp.customize('generate_settings[buttons_font_size]').get() ) {
newval = wp.customize('generate_settings[body_font_size]').get();
if ( 'buttons_font_size' == id && '' == wp.customize( 'generate_settings[buttons_font_size]' ).get() ) {
newval = wp.customize( 'generate_settings[body_font_size]' ).get();
}
// We're using a desktop value
if ( ! isTablet && ! isMobile ) {
var tabletValue = ( typeof wp.customize(settings + '[tablet_' + id + ']') !== 'undefined' ) ? wp.customize(settings + '[tablet_' + id + ']').get() : '',
mobileValue = ( typeof wp.customize(settings + '[mobile_' + id + ']') !== 'undefined' ) ? wp.customize(settings + '[mobile_' + id + ']').get() : '';
var tabletValue = ( typeof wp.customize( settings + '[tablet_' + id + ']' ) !== 'undefined' ) ? wp.customize( settings + '[tablet_' + id + ']' ).get() : '',
mobileValue = ( typeof wp.customize( settings + '[mobile_' + id + ']' ) !== 'undefined' ) ? wp.customize( settings + '[mobile_' + id + ']' ).get() : '';
// The tablet setting exists, mobile doesn't
if ( '' !== tabletValue && '' == mobileValue ) {
@ -85,24 +90,22 @@ function generatepress_typography_live_update( id, selector, property, unit, med
if ( '' == tabletValue && '' == mobileValue ) {
media = generatepress_live_preview.desktop + ', ' + generatepress_live_preview.tablet + ', ' + generatepress_live_preview.mobile;
}
}
// Check if media query
media_query = typeof media !== 'undefined' ? 'media="' + media + '"' : '';
jQuery( 'head' ).append( '<style id="' + id + '" ' + media_query + '>' + selector + '{' + property + ':' + newval + unit + ';}</style>' );
setTimeout(function() {
setTimeout( function() {
jQuery( 'style#' + id ).not( ':last' ).remove();
}, 1000);
}, 1000 );
setTimeout("jQuery('body').trigger('generate_spacing_updated');", 1000);
setTimeout( "jQuery('body').trigger('generate_spacing_updated');", 1000 );
} );
} );
}
( function( $ ) {
// Update the site title in real time...
wp.customize( 'blogname', function( value ) {
value.bind( function( newval ) {
@ -127,169 +130,6 @@ function generatepress_typography_live_update( id, selector, property, unit, med
} );
} );
/**
* Body background color
* Empty: white
*/
generatepress_colors_live_update( 'background_color', 'body', 'background-color', '#FFFFFF' );
/**
* Text color
* Empty: black
*/
generatepress_colors_live_update( 'text_color', 'body', 'color', '#000000' );
/**
* Link color
* Empty: initial
*/
generatepress_colors_live_update( 'link_color', 'a, a:visited', 'color', 'initial' );
/**
* Link color hover
* Empty: initial
*/
generatepress_colors_live_update( 'link_color_hover', 'a:hover', 'color', 'initial' );
/**
* Live update for content & navigation colors thanks to our preset option.
* We only want to run this if GP Premium isn't already doing it.
*/
if ( 'undefined' == typeof generate_colors_live_update ) {
/**
* Blog post title color
* Empty: Body link color
*/
generatepress_colors_live_update( 'blog_post_title_color', '.entry-title a, .entry-title a:visited', 'color', '', 'link_color' );
/**
* Blog post title color on hover
* Empty: Body link color on hover
*/
generatepress_colors_live_update( 'blog_post_title_hover_color', '.entry-title a:hover', 'color', '', 'link_color_hover' );
/**
* Navigation background color
* Empty: Transparent
*/
generatepress_colors_live_update( 'navigation_background_color', '.main-navigation', 'background-color', 'transparent' );
/**
* Primary navigation text color
* Empty: link_color
*/
generatepress_colors_live_update( 'navigation_text_color',
'.main-navigation .main-nav ul li a,\
.menu-toggle,button.menu-toggle:hover,\
button.menu-toggle:focus,\
.main-navigation .mobile-bar-items a,\
.main-navigation .mobile-bar-items a:hover,\
.main-navigation .mobile-bar-items a:focus',
'color',
'',
'link_color'
);
/**
* Primary navigation text color hover
* Empty: link_color_hover
*/
generatepress_colors_live_update( 'navigation_text_hover_color',
'.navigation-search input[type="search"],\
.navigation-search input[type="search"]:active,\
.navigation-search input[type="search"]:focus,\
.main-navigation .main-nav ul li:hover > a,\
.main-navigation .main-nav ul li:focus > a,\
.main-navigation .main-nav ul li.sfHover > a',
'color',
'',
'link_color_hover'
);
/**
* Primary navigation menu item hover
* Empty: transparent
*/
generatepress_colors_live_update( 'navigation_background_hover_color',
'.navigation-search input[type="search"],\
.navigation-search input[type="search"]:focus,\
.main-navigation .main-nav ul li:hover > a,\
.main-navigation .main-nav ul li:focus > a,\
.main-navigation .main-nav ul li.sfHover > a',
'background-color',
'transparent'
);
/**
* Primary sub-navigation color
* Empty: transparent
*/
generatepress_colors_live_update( 'subnavigation_background_color', '.main-navigation ul ul', 'background-color', 'transparent' );
/**
* Primary sub-navigation text color
* Empty: link_color
*/
generatepress_colors_live_update( 'subnavigation_text_color', '.main-navigation .main-nav ul ul li a', 'color', 'link_color' );
/**
* Primary sub-navigation hover
*/
var subnavigation_hover = '.main-navigation .main-nav ul ul li:hover > a, \
.main-navigation .main-nav ul ul li:focus > a, \
.main-navigation .main-nav ul ul li.sfHover > a';
/**
* Primary sub-navigation text hover
* Empty: link_color_hover
*/
generatepress_colors_live_update( 'subnavigation_text_hover_color', subnavigation_hover, 'color', '', 'link_color_hover' );
/**
* Primary sub-navigation background hover
* Empty: transparent
*/
generatepress_colors_live_update( 'subnavigation_background_hover_color', subnavigation_hover, 'background-color', 'transparent' );
/**
* Navigation current selectors
*/
var navigation_current = '.main-navigation .main-nav ul li[class*="current-menu-"] > a, \
.main-navigation .main-nav ul li[class*="current-menu-"]:hover > a, \
.main-navigation .main-nav ul li[class*="current-menu-"].sfHover > a';
/**
* Primary navigation current text
* Empty: link_color
*/
generatepress_colors_live_update( 'navigation_text_current_color', navigation_current, 'color', '', 'link_color' );
/**
* Primary navigation current background
* Empty: transparent
*/
generatepress_colors_live_update( 'navigation_background_current_color', navigation_current, 'background-color', 'transparent' );
/**
* Primary sub-navigation current selectors
*/
var subnavigation_current = '.main-navigation .main-nav ul ul li[class*="current-menu-"] > a,\
.main-navigation .main-nav ul ul li[class*="current-menu-"]:hover > a, \
.main-navigation .main-nav ul ul li[class*="current-menu-"].sfHover > a';
/**
* Primary sub-navigation current text
* Empty: link_color
*/
generatepress_colors_live_update( 'subnavigation_text_current_color', subnavigation_current, 'color', '', 'link_color' );
/**
* Primary navigation current item background
* Empty: transparent
*/
generatepress_colors_live_update( 'subnavigation_background_current_color', subnavigation_current, 'background-color', 'transparent' );
}
/**
* Container width
*/
@ -299,11 +139,11 @@ function generatepress_typography_live_update( id, selector, property, unit, med
jQuery( 'style#container_width' ).html( 'body .grid-container, .wp-block-group__inner-container{max-width:' + newval + 'px;}' );
} else {
jQuery( 'head' ).append( '<style id="container_width">body .grid-container, .wp-block-group__inner-container{max-width:' + newval + 'px;}</style>' );
setTimeout(function() {
setTimeout( function() {
jQuery( 'style#container_width' ).not( ':last' ).remove();
}, 100);
}, 100 );
}
jQuery('body').trigger('generate_spacing_updated');
jQuery( 'body' ).trigger( 'generate_spacing_updated' );
} );
} );
@ -311,7 +151,7 @@ function generatepress_typography_live_update( id, selector, property, unit, med
* Live update for typography options.
* We only want to run this if GP Premium isn't already doing it.
*/
if ( 'undefined' == typeof gp_premium_typography_live_update ) {
if ( 'undefined' === typeof gp_premium_typography_live_update ) {
/**
* Body font size, weight and transform
*/
@ -355,7 +195,7 @@ function generatepress_typography_live_update( id, selector, property, unit, med
value.bind( function( newval ) {
if ( 'full' == newval ) {
$( '.top-bar' ).removeClass( 'grid-container' ).removeClass( 'grid-parent' );
if ( 'contained' == wp.customize.value('generate_settings[top_bar_inner_width]')() ) {
if ( 'contained' == wp.customize.value( 'generate_settings[top_bar_inner_width]' )() ) {
$( '.inside-top-bar' ).addClass( 'grid-container' ).addClass( 'grid-parent' );
}
}
@ -392,7 +232,7 @@ function generatepress_typography_live_update( id, selector, property, unit, med
value.bind( function( newval ) {
if ( 'fluid-header' == newval ) {
$( '.site-header' ).removeClass( 'grid-container' ).removeClass( 'grid-parent' );
if ( 'contained' == wp.customize.value('generate_settings[header_inner_width]')() ) {
if ( 'contained' == wp.customize.value( 'generate_settings[header_inner_width]' )() ) {
$( '.inside-header' ).addClass( 'grid-container' ).addClass( 'grid-parent' );
}
}
@ -427,7 +267,7 @@ function generatepress_typography_live_update( id, selector, property, unit, med
*/
wp.customize( 'generate_settings[nav_layout_setting]', function( value ) {
value.bind( function( newval ) {
var navLocation = wp.customize.value('generate_settings[nav_position_setting]')();
var navLocation = wp.customize.value( 'generate_settings[nav_position_setting]' )();
if ( $( 'body' ).hasClass( 'sticky-enabled' ) ) {
wp.customize.preview.send( 'refresh' );
@ -436,7 +276,7 @@ function generatepress_typography_live_update( id, selector, property, unit, med
if ( 'fluid-nav' == newval ) {
mainNavigation.removeClass( 'grid-container' ).removeClass( 'grid-parent' );
if ( 'full-width' !== wp.customize.value('generate_settings[nav_inner_width]')() ) {
if ( 'full-width' !== wp.customize.value( 'generate_settings[nav_inner_width]' )() ) {
$( '.main-navigation .inside-navigation' ).addClass( 'grid-container' ).addClass( 'grid-parent' );
}
}
@ -481,15 +321,13 @@ function generatepress_typography_live_update( id, selector, property, unit, med
jQuery.each( classes, function( i, v ) {
jQuery( selector ).removeClass( prefix + v );
});
} );
if ( generatepress_live_preview.isFlex && generatepress_live_preview.isRTL ) {
jQuery( selector ).addClass( prefix + newval );
} else {
if ( 'nav-align-left' !== prefix + newval ) {
} else if ( 'nav-align-left' !== prefix + newval ) {
jQuery( selector ).addClass( prefix + newval );
}
}
} );
} );
@ -558,9 +396,9 @@ function generatepress_typography_live_update( id, selector, property, unit, med
jQuery( 'style#wide_container_width' ).html( 'body:not(.full-width-content) #page{max-width:' + newContainerWidth + 'px;}' );
} else {
jQuery( 'head' ).append( '<style id="wide_container_width">body:not(.full-width-content) #page{max-width:' + newContainerWidth + 'px;}</style>' );
setTimeout(function() {
setTimeout( function() {
jQuery( 'style#wide_container_width' ).not( ':last' ).remove();
}, 100);
}, 100 );
}
}
@ -615,9 +453,9 @@ function generatepress_typography_live_update( id, selector, property, unit, med
jQuery( 'style#box_sizing_widths' ).html( '.inside-top-bar.grid-container{max-width:' + newTopBarWidth + 'px;}.inside-header.grid-container{max-width:' + newHeaderWidth + 'px;}.footer-widgets-container.grid-container{max-width:' + newFooterWidgetWidth + 'px;}.inside-site-info.grid-container{max-width:' + newFooterBarWidth + 'px;}' );
} else {
jQuery( 'head' ).append( '<style id="box_sizing_widths">.inside-top-bar.grid-container{max-width:' + newTopBarWidth + 'px;}.inside-header.grid-container{max-width:' + newHeaderWidth + 'px;}.footer-widgets-container.grid-container{max-width:' + newFooterWidgetWidth + 'px;}.inside-site-info.grid-container{max-width:' + newFooterBarWidth + 'px;}</style>' );
setTimeout(function() {
setTimeout( function() {
jQuery( 'style#box_sizing_widths' ).not( ':last' ).remove();
}, 100);
}, 100 );
}
}
@ -654,11 +492,11 @@ function generatepress_typography_live_update( id, selector, property, unit, med
} else {
jQuery( 'head' ).append( '<style id="navigation_padding">.nav-below-header .main-navigation .inside-navigation.grid-container, .nav-above-header .main-navigation .inside-navigation.grid-container{padding: 0 ' + newNavPaddingRight + 'px 0 ' + newNavPaddingLeft + 'px;}</style>' );
jQuery( 'head' ).append( '<style id="secondary_navigation_padding">.secondary-nav-below-header .secondary-navigation .inside-navigation.grid-container, .secondary-nav-above-header .secondary-navigation .inside-navigation.grid-container{padding: 0 ' + newSecondaryNavPaddingRight + 'px 0 ' + newSecondaryNavPaddingLeft + 'px;}</style>' );
setTimeout(function() {
setTimeout( function() {
jQuery( 'style#navigation_padding' ).not( ':last' ).remove();
jQuery( 'style#secondary_navigation_padding' ).not( ':last' ).remove();
}, 100);
}, 100 );
}
}
} );
} )( jQuery );
}( jQuery ) );

View File

@ -0,0 +1,341 @@
/* global gpPostMessageFields */
/* eslint max-depth: off */
var gpPostMessage = {
/**
* The fields.
*
* @since 1.0.0
*/
fields: {},
/**
* A collection of methods for the <style> tags.
*
* @since 1.0.0
*/
styleTag: {
/**
* Add a <style> tag in <head> if it doesn't already exist.
*
* @since 1.0.0
*
* @param {string} id - The field-ID.
*
* @return {void}
*/
add( id ) {
id = id.replace( /[^\w\s]/gi, '-' );
if ( null === document.getElementById( 'gp-postmessage-' + id ) || 'undefined' === typeof document.getElementById( 'gp-postmessage-' + id ) ) {
jQuery( 'head' ).append( '<style id="gp-postmessage-' + id + '"></style>' );
}
},
/**
* Add a <style> tag in <head> if it doesn't already exist,
* by calling the this.add method, and then add styles inside it.
*
* @since 1.0.0
*
* @param {string} id - The field-ID.
* @param {string} styles - The styles to add.
*
* @return {void}
*/
addData( id, styles ) {
id = id.replace( '[', '-' ).replace( ']', '' );
gpPostMessage.styleTag.add( id );
jQuery( '#gp-postmessage-' + id ).text( styles );
},
},
/**
* Common utilities.
*
* @since 1.0.0
*/
util: {
/**
* Processes the value and applies any replacements and/or additions.
*
* @since 1.0.0
*
* @param {Object} output - The output (js_vars) argument.
* @param {mixed} value - The value.
* @param {string} controlType - The control-type.
*
* @return {string|false} - Returns false if value is excluded, otherwise a string.
*/
processValue( output, value ) {
var self = this,
settings = window.parent.wp.customize.get(),
excluded = false;
if ( 'object' === typeof value ) {
_.each( value, function( subValue, key ) {
value[ key ] = self.processValue( output, subValue );
} );
return value;
}
output = _.defaults( output, {
prefix: '',
units: '',
suffix: '',
value_pattern: '$',
pattern_replace: {},
exclude: [],
} );
if ( 1 <= output.exclude.length ) {
_.each( output.exclude, function( exclusion ) {
if ( value == exclusion ) {
excluded = true;
}
} );
}
if ( excluded ) {
return false;
}
value = output.value_pattern.replace( new RegExp( '\\$', 'g' ), value );
_.each( output.pattern_replace, function( id, placeholder ) {
if ( ! _.isUndefined( settings[ id ] ) ) {
value = value.replace( placeholder, settings[ id ] );
}
} );
return output.prefix + value + output.units + output.suffix;
},
/**
* Make sure urls are properly formatted for background-image properties.
*
* @since 1.0.0
*
* @param {string} url - The URL.
*
* @return {string} - Returns the URL.
*/
backgroundImageValue( url ) {
return ( -1 === url.indexOf( 'url(' ) ) ? 'url(' + url + ')' : url;
},
},
/**
* A collection of utilities for CSS generation.
*
* @since 1.0.0
*/
css: {
/**
* Generates the CSS from the output (js_vars) parameter.
*
* @since 1.0.0
*
* @param {Object} output - The output (js_vars) argument.
* @param {mixed} value - The value.
* @param {string} controlType - The control-type.
*
* @return {string} - Returns CSS as a string.
*/
fromOutput( output, value, controlType ) {
var styles = '',
mediaQuery = false,
processedValue;
try {
value = JSON.parse( value );
} catch ( e ) {} // eslint-disable-line no-empty
if ( output.js_callback && 'function' === typeof window[ output.js_callback ] ) {
value = window[ output.js_callback[ 0 ] ]( value, output.js_callback[ 1 ] );
}
// Apply the gpPostMessageStylesOutput filter.
styles = wp.hooks.applyFilters( 'gpPostMessageStylesOutput', styles, value, output, controlType );
if ( '' === styles ) {
switch ( controlType ) {
case 'kirki-multicolor':
case 'kirki-sortable':
styles += output.element + '{';
_.each( value, function( val, key ) {
if ( output.choice && key !== output.choice ) {
return;
}
processedValue = gpPostMessage.util.processValue( output, val );
if ( '' === processedValue ) {
if ( 'background-color' === output.property ) {
processedValue = 'unset';
} else if ( 'background-image' === output.property ) {
processedValue = 'none';
}
}
if ( false !== processedValue ) {
styles += output.property ? output.property + '-' + key + ':' + processedValue + ';' : key + ':' + processedValue + ';';
}
} );
styles += '}';
break;
default:
if ( 'kirki-image' === controlType ) {
value = ( ! _.isUndefined( value.url ) ) ? gpPostMessage.util.backgroundImageValue( value.url ) : gpPostMessage.util.backgroundImageValue( value );
}
if ( _.isObject( value ) ) {
styles += output.element + '{';
_.each( value, function( val, key ) {
var property;
if ( output.choice && key !== output.choice ) {
return;
}
processedValue = gpPostMessage.util.processValue( output, val );
property = output.property ? output.property : key;
if ( '' === processedValue ) {
if ( 'background-color' === property ) {
processedValue = 'unset';
} else if ( 'background-image' === property ) {
processedValue = 'none';
}
}
if ( false !== processedValue ) {
styles += property + ':' + processedValue + ';';
}
} );
styles += '}';
} else {
processedValue = gpPostMessage.util.processValue( output, value );
if ( '' === processedValue ) {
if ( 'background-color' === output.property ) {
processedValue = 'unset';
} else if ( 'background-image' === output.property ) {
processedValue = 'none';
}
}
if ( false !== processedValue ) {
styles += output.element + '{' + output.property + ':' + processedValue + ';}';
}
}
break;
}
}
// Get the media-query.
if ( output.media_query && 'string' === typeof output.media_query && ! _.isEmpty( output.media_query ) ) {
mediaQuery = output.media_query;
if ( -1 === mediaQuery.indexOf( '@media' ) ) {
mediaQuery = '@media ' + mediaQuery;
}
}
// If we have a media-query, add it and return.
if ( mediaQuery ) {
return mediaQuery + '{' + styles + '}';
}
// Return the styles.
return styles;
},
},
/**
* A collection of utilities to change the HTML in the document.
*
* @since 1.0.0
*/
html: {
/**
* Modifies the HTML from the output (js_vars) parameter.
*
* @since 1.0.0
*
* @param {Object} output - The output (js_vars) argument.
* @param {mixed} value - The value.
*
* @return {void}
*/
fromOutput( output, value ) {
if ( output.js_callback && 'function' === typeof window[ output.js_callback ] ) {
value = window[ output.js_callback[ 0 ] ]( value, output.js_callback[ 1 ] );
}
if ( _.isObject( value ) || _.isArray( value ) ) {
if ( ! output.choice ) {
return;
}
_.each( value, function( val, key ) {
if ( output.choice && key !== output.choice ) {
return;
}
value = val;
} );
}
value = gpPostMessage.util.processValue( output, value );
if ( output.attr ) {
jQuery( output.element ).attr( output.attr, value );
} else {
jQuery( output.element ).html( value );
}
},
},
/**
* A collection of utilities to allow toggling a CSS class.
*
* @since 1.0.0
*/
toggleClass: {
/**
* Toggles a CSS class from the output (js_vars) parameter.
*
* @since 1.0.0
*
* @param {Object} output - The output (js_vars) argument.
* @param {mixed} value - The value.
*
* @return {void}
*/
fromOutput( output, value ) {
if ( 'undefined' === typeof output.class || 'undefined' === typeof output.value ) {
return;
}
if ( value === output.value && ! jQuery( output.element ).hasClass( output.class ) ) {
jQuery( output.element ).addClass( output.class );
} else {
jQuery( output.element ).removeClass( output.class );
}
},
},
};
jQuery( document ).ready( function() {
var styles;
_.each( gpPostMessageFields, function( field ) {
wp.customize( field.settings, function( value ) {
value.bind( function( newVal ) {
styles = '';
_.each( field.js_vars, function( output ) {
output.function = ( ! output.function || 'undefined' === typeof gpPostMessage[ output.function ] ) ? 'css' : output.function;
field.type = ( field.choices && field.choices.parent_type ) ? field.choices.parent_type : field.type;
if ( 'css' === output.function ) {
styles += gpPostMessage.css.fromOutput( output, newVal, field.type );
} else {
gpPostMessage[ output.function ].fromOutput( output, newVal, field.type );
}
} );
gpPostMessage.styleTag.addData( field.settings, styles );
} );
} );
} );
} );

View File

@ -9,7 +9,12 @@ if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
// Add fields.
require_once trailingslashit( dirname( __FILE__ ) ) . 'class-customize-field.php';
// Controls.
require_once trailingslashit( dirname( __FILE__ ) ) . 'controls/class-react-control.php';
require_once trailingslashit( dirname( __FILE__ ) ) . 'controls/class-color-control.php';
require_once trailingslashit( dirname( __FILE__ ) ) . 'controls/class-range-control.php';
require_once trailingslashit( dirname( __FILE__ ) ) . 'controls/class-typography-control.php';
require_once trailingslashit( dirname( __FILE__ ) ) . 'controls/class-upsell-section.php';

View File

@ -0,0 +1,162 @@
<?php
/**
* This file handles the customizer fields for the back to top button.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_back_to_top_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Back to Top', 'generatepress' ),
'choices' => array(
'toggleId' => 'back-to-top-colors',
),
'active_callback' => function() {
if ( generate_get_option( 'back_to_top' ) ) {
return true;
}
return false;
},
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_back_to_top_background_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'back-to-top-colors',
'items' => array(
'back_to_top_background_color',
'back_to_top_background_color_hover',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[back_to_top_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['back_to_top_background_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'back-to-top-colors',
'wrapper' => 'back_to_top_background_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => 'a.generate-back-to-top',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[back_to_top_background_color_hover]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['back_to_top_background_color_hover'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'back-to-top-colors',
'wrapper' => 'back_to_top_background_color_hover',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => 'a.generate-back-to-top:hover, a.generate-back-to-top:focus',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_back_to_top_text_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'back-to-top-colors',
'items' => array(
'back_to_top_text_color',
'back_to_top_text_color_hover',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[back_to_top_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['back_to_top_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'button-colors',
'wrapper' => 'back_to_top_text_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => 'a.generate-back-to-top',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[back_to_top_text_color_hover]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['back_to_top_text_color_hover'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'back-to-top-colors',
'wrapper' => 'back_to_top_text_color_hover',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => 'a.generate-back-to-top:hover, a.generate-back-to-top:focus',
'property' => 'color',
),
),
)
);

View File

@ -0,0 +1,156 @@
<?php
/**
* This file handles the customizer fields for the Body.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_body_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Body', 'generatepress' ),
'choices' => array(
'toggleId' => 'base-colors',
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $defaults['background_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'base-colors',
),
'output' => array(
array(
'element' => 'body',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $defaults['text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'base-colors',
),
'output' => array(
array(
'element' => 'body',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_body_link_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'base-colors',
'items' => array(
'link_color',
'link_color_hover',
'link_color_visited',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $defaults['link_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'toggleId' => 'base-colors',
),
'output' => array(
array(
'element' => 'a, a:visited',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[link_color_hover]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $defaults['link_color_hover'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'link_color_hover',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'toggleId' => 'base-colors',
'hideLabel' => true,
),
'output' => array(
array(
'element' => 'a:hover',
'property' => 'color',
),
),
)
);
if ( '' !== generate_get_option( 'link_color_visited' ) ) {
GeneratePress_Customize_Field::add_field(
'generate_settings[link_color_visited]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $defaults['link_color_visited'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'refresh',
),
array(
'label' => __( 'Link Color Visited', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'link_color_visited',
'tooltip' => __( 'Choose Visited Color', 'generatepress' ),
'toggleId' => 'base-colors',
'hideLabel' => true,
),
)
);
}

View File

@ -0,0 +1,158 @@
<?php
/**
* This file handles the customizer fields for the Body.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_buttons_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Buttons', 'generatepress' ),
'choices' => array(
'toggleId' => 'button-colors',
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_buttons_background_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'button-colors',
'items' => array(
'form_button_background_color',
'form_button_background_color_hover',
),
),
)
);
$buttons_selector = 'button, html input[type="button"], input[type="reset"], input[type="submit"], a.button, a.button:visited, a.wp-block-button__link:not(.has-background)';
$buttons_hover_selector = 'button:hover, html input[type="button"]:hover, input[type="reset"]:hover, input[type="submit"]:hover, a.button:hover, button:focus, html input[type="button"]:focus, input[type="reset"]:focus, input[type="submit"]:focus, a.button:focus, a.wp-block-button__link:not(.has-background):active, a.wp-block-button__link:not(.has-background):focus, a.wp-block-button__link:not(.has-background):hover';
GeneratePress_Customize_Field::add_field(
'generate_settings[form_button_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_button_background_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'button-colors',
'wrapper' => 'form_button_background_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => $buttons_selector,
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_button_background_color_hover]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_button_background_color_hover'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'button-colors',
'wrapper' => 'form_button_background_color_hover',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => $buttons_hover_selector,
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_buttons_text_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'button-colors',
'items' => array(
'form_button_text_color',
'form_button_text_color_hover',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_button_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_button_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'button-colors',
'wrapper' => 'form_button_text_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => $buttons_selector,
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_button_text_color_hover]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_button_text_color_hover'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'button-colors',
'wrapper' => 'form_button_text_color_hover',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => $buttons_hover_selector,
'property' => 'color',
),
),
)
);

View File

@ -0,0 +1,372 @@
<?php
/**
* This file handles the customizer fields for the content.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_content_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Content', 'generatepress' ),
'choices' => array(
'toggleId' => 'content-colors',
),
)
);
$content_colors = '.separate-containers .inside-article, .separate-containers .comments-area, .separate-containers .page-header, .one-container .container, .separate-containers .paging-navigation, .inside-page-header';
GeneratePress_Customize_Field::add_field(
'generate_settings[content_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['content_background_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => $content_colors,
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[content_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['content_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => $content_colors,
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_content_link_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'content-colors',
'items' => array(
'content_link_color',
'content_link_hover_color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[content_link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['content_link_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'content_link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => '.inside-article a:not(.button):not(.wp-block-button__link), .inside-article a:not(.button):not(.wp-block-button__link):visited, .paging-navigation a, .paging-navigation a:visited, .comments-area a, .comments-area a:visited, .page-header a, .page-header a:visited',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[content_link_hover_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['content_link_hover_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'content_link_hover_color',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'toggleId' => 'content-colors',
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.inside-article a:not(.button):not(.wp-block-button__link):hover, .paging-navigation a:hover, .comments-area a:hover, .page-header a:hover',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[content_title_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['content_title_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Content Title', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => '.entry-header h1,.page-header h1',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_archive_content_title_link_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'content-colors',
'items' => array(
'blog_post_title_color',
'blog_post_title_hover_color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[blog_post_title_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['blog_post_title_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Archive Content Title', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'blog_post_title_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => '.entry-title a,.entry-title a:visited',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[blog_post_title_hover_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['blog_post_title_hover_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Archive Content Title Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'blog_post_title_hover_color',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'toggleId' => 'content-colors',
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.entry-title a:hover',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[entry_meta_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['entry_meta_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Entry Meta Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => '.entry-meta',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_entry_meta_link_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'content-colors',
'items' => array(
'entry_meta_link_color',
'entry_meta_link_color_hover',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[entry_meta_link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['entry_meta_link_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Entry Meta Links', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'entry_meta_link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => '.entry-meta a',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[entry_meta_link_color_hover]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['entry_meta_link_color_hover'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Entry Meta Links Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'wrapper' => 'entry_meta_link_color_hover',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'toggleId' => 'content-colors',
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.entry-meta a:hover',
'property' => 'color',
),
),
)
);
$headings = array(
array(
'slug' => 'h1_color',
'label' => __( 'Heading 1 (H1) Color', 'generatepress' ),
'selector' => 'h1',
),
array(
'slug' => 'h2_color',
'label' => __( 'Heading 2 (H2) Color', 'generatepress' ),
'selector' => 'h2',
),
array(
'slug' => 'h3_color',
'label' => __( 'Heading 3 (H3) Color', 'generatepress' ),
'selector' => 'h3',
),
array(
'slug' => 'h4_color',
'label' => __( 'Heading 4 (H4) Color', 'generatepress' ),
'selector' => 'h4',
),
array(
'slug' => 'h5_color',
'label' => __( 'Heading 5 (H5) Color', 'generatepress' ),
'selector' => 'h5',
),
array(
'slug' => 'h6_color',
'label' => __( 'Heading 6 (H6) Color', 'generatepress' ),
'selector' => 'h6',
),
);
foreach ( $headings as $heading ) {
GeneratePress_Customize_Field::add_field(
'generate_settings[' . $heading['slug'] . ']',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults[ $heading['slug'] ],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => $heading['label'],
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'content-colors',
),
'output' => array(
array(
'element' => $heading['selector'],
'property' => 'color',
),
),
)
);
}

View File

@ -0,0 +1,138 @@
<?php
/**
* This file handles the customizer fields for the footer bar.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_footer_bar_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Footer Bar', 'generatepress' ),
'choices' => array(
'toggleId' => 'footer-bar-colors',
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_background_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'footer-bar-colors',
'wrapper' => 'footer_background_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.site-info',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'footer-bar-colors',
'wrapper' => 'footer_text_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.site-info',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_footer_bar_colors_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'footer-bar-colors',
'items' => array(
'footer_link_color',
'footer_link_hover_color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_link_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'footer-bar-colors',
'wrapper' => 'footer_link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.site-info a',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_link_hover_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_link_hover_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'footer-bar-colors',
'wrapper' => 'footer_link_hover_color',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.site-info a:hover',
'property' => 'color',
),
),
)
);

View File

@ -0,0 +1,161 @@
<?php
/**
* This file handles the customizer fields for the footer widgets.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_footer_widgets_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Footer Widgets', 'generatepress' ),
'choices' => array(
'toggleId' => 'footer-widget-colors',
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_widget_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_widget_background_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'footer-widget-colors',
'wrapper' => 'footer_widget_background_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.footer-widgets',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_widget_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_widget_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'footer-widget-colors',
'wrapper' => 'footer_widget_text_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.footer-widgets',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_footer_widget_colors_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'footer-widget-colors',
'items' => array(
'footer_widget_link_color',
'footer_widget_link_hover_color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_widget_link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_widget_link_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'footer-widget-colors',
'wrapper' => 'footer_widget_link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.footer-widgets a',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_widget_link_hover_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_widget_link_hover_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'footer-widget-colors',
'wrapper' => 'footer_widget_link_hover_color',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.footer-widgets a:hover',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[footer_widget_title_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['footer_widget_title_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Widget Title', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'footer-widget-colors',
),
'output' => array(
array(
'element' => '.footer-widgets .widget-title',
'property' => 'color',
),
),
)
);

View File

@ -0,0 +1,226 @@
<?php
/**
* This file handles the customizer fields for the Body.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_forms_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Forms', 'generatepress' ),
'choices' => array(
'toggleId' => 'form-colors',
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_forms_background_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'form-colors',
'items' => array(
'form_background_color',
'form_background_color_focus',
),
),
)
);
$forms_selector = 'input[type="text"], input[type="email"], input[type="url"], input[type="password"], input[type="search"], input[type="number"], input[type="tel"], textarea, select';
$forms_focus_selector = 'input[type="text"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="number"]:focus, input[type="tel"]:focus, textarea:focus, select:focus';
GeneratePress_Customize_Field::add_field(
'generate_settings[form_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_background_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'form-colors',
'wrapper' => 'form_background_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => $forms_selector,
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_background_color_focus]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_background_color_focus'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background Focus', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'form-colors',
'wrapper' => 'form_background_color_focus',
'tooltip' => __( 'Choose Focus Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => $forms_focus_selector,
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_forms_text_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'form-colors',
'items' => array(
'form_text_color',
'form_text_color_focus',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'form-colors',
'wrapper' => 'form_text_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => $forms_selector,
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_text_color_focus]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_text_color_focus'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text Focus', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'form-colors',
'wrapper' => 'form_text_color_focus',
'tooltip' => __( 'Choose Focus Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => $forms_focus_selector,
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_forms_border_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'form-colors',
'items' => array(
'form_border_color',
'form_border_color_focus',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_border_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_border_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Border', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'form-colors',
'wrapper' => 'form_border_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => $forms_selector,
'property' => 'border-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[form_border_color_focus]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['form_border_color_focus'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Border Focus', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'form-colors',
'wrapper' => 'form_border_color_focus',
'tooltip' => __( 'Choose Focus Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => $forms_focus_selector,
'property' => 'border-color',
),
),
)
);

View File

@ -0,0 +1,180 @@
<?php
/**
* This file handles the customizer fields for the header.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_header_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Header', 'generatepress' ),
'choices' => array(
'toggleId' => 'header-colors',
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[header_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['header_background_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'header-colors',
),
'output' => array(
array(
'element' => '.site-header',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[header_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['header_text_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'header-colors',
),
'output' => array(
array(
'element' => '.site-header',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_header_link_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'header-colors',
'items' => array(
'header_link_color',
'header_link_hover_color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[header_link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['header_link_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Link', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'header-colors',
'wrapper' => 'header_link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.site-header a:not([rel="home"])',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[header_link_hover_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['header_link_hover_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Link Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'header-colors',
'wrapper' => 'header_link_hover_color',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.site-header a:not([rel="home"]):hover',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[site_title_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['site_title_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Site Title', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'header-colors',
),
'output' => array(
array(
'element' => '.main-title a, .main-title a:hover',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[site_tagline_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['site_tagline_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Tagline', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'header-colors',
),
'output' => array(
array(
'element' => '.site-description',
'property' => 'color',
),
),
)
);

View File

@ -0,0 +1,214 @@
<?php
/**
* This file handles the customizer fields for the primary navigation.
*
* @package GeneratePress
*
* @var array $color_defaults
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
$menu_hover_selectors = '.navigation-search input[type="search"], .navigation-search input[type="search"]:active, .navigation-search input[type="search"]:focus, .main-navigation .main-nav ul li:not([class*="current-menu-"]):hover > a, .main-navigation .main-nav ul li:not([class*="current-menu-"]):focus > a, .main-navigation .main-nav ul li.sfHover:not([class*="current-menu-"]) > a, .main-navigation .menu-bar-item:hover > a, .main-navigation .menu-bar-item.sfHover > a';
$menu_current_selectors = '.main-navigation .main-nav ul li[class*="current-menu-"] > a';
$submenu_hover_selectors = '.main-navigation .main-nav ul ul li:not([class*="current-menu-"]):hover > a,.main-navigation .main-nav ul ul li:not([class*="current-menu-"]):focus > a,.main-navigation .main-nav ul ul li.sfHover:not([class*="current-menu-"]) > a';
$submenu_current_selectors = '.main-navigation .main-nav ul ul li[class*="current-menu-"] > a';
GeneratePress_Customize_Field::add_title(
'generate_primary_navigation_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Primary Navigation', 'generatepress' ),
'choices' => array(
'toggleId' => 'primary-navigation-colors',
),
)
);
// Navigation background group.
GeneratePress_Customize_Field::add_color_field_group(
'primary_navigation_background',
'generate_colors_section',
'primary-navigation-colors',
array(
'generate_settings[navigation_background_color]' => array(
'default_value' => $color_defaults['navigation_background_color'],
'label' => __( 'Navigation Background', 'generatepress' ),
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'element' => '.main-navigation',
'property' => 'background-color',
'hide_label' => false,
),
'generate_settings[navigation_background_hover_color]' => array(
'default_value' => $color_defaults['navigation_background_hover_color'],
'label' => __( 'Navigation Background Hover', 'generatepress' ),
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'element' => $menu_hover_selectors,
'property' => 'background-color',
'hide_label' => true,
),
'generate_settings[navigation_background_current_color]' => array(
'default_value' => $color_defaults['navigation_background_current_color'],
'label' => __( 'Navigation Background Current', 'generatepress' ),
'tooltip' => __( 'Choose Current Color', 'generatepress' ),
'element' => $menu_current_selectors,
'property' => 'background-color',
'hide_label' => true,
),
)
);
// Navigation text group.
GeneratePress_Customize_Field::add_color_field_group(
'primary_navigation_text',
'generate_colors_section',
'primary-navigation-colors',
array(
'generate_settings[navigation_text_color]' => array(
'default_value' => $color_defaults['navigation_text_color'],
'label' => __( 'Navigation Text', 'generatepress' ),
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'element' => '.main-navigation .main-nav ul li a, .main-navigation .menu-toggle, .main-navigation button.menu-toggle:hover, .main-navigation button.menu-toggle:focus, .main-navigation .mobile-bar-items a, .main-navigation .mobile-bar-items a:hover, .main-navigation .mobile-bar-items a:focus, .main-navigation .menu-bar-items',
'property' => 'color',
'hide_label' => false,
),
'generate_settings[navigation_text_hover_color]' => array(
'default_value' => $color_defaults['navigation_text_hover_color'],
'label' => __( 'Navigation Text Hover', 'generatepress' ),
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'element' => $menu_hover_selectors,
'property' => 'color',
'hide_label' => true,
),
'generate_settings[navigation_text_current_color]' => array(
'default_value' => $color_defaults['navigation_text_current_color'],
'label' => __( 'Navigation Text Current', 'generatepress' ),
'tooltip' => __( 'Choose Current Color', 'generatepress' ),
'element' => $menu_current_selectors,
'property' => 'color',
'hide_label' => true,
),
)
);
// Sub-Menu background group.
GeneratePress_Customize_Field::add_color_field_group(
'primary_navigation_submenu_background',
'generate_colors_section',
'primary-navigation-colors',
array(
'generate_settings[subnavigation_background_color]' => array(
'default_value' => $color_defaults['subnavigation_background_color'],
'label' => __( 'Sub-Menu Background', 'generatepress' ),
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'element' => '.main-navigation ul ul',
'property' => 'background-color',
'hide_label' => false,
),
'generate_settings[subnavigation_background_hover_color]' => array(
'default_value' => $color_defaults['subnavigation_background_hover_color'],
'label' => __( 'Sub-Menu Background Hover', 'generatepress' ),
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'element' => $submenu_hover_selectors,
'property' => 'background-color',
'hide_label' => true,
),
'generate_settings[subnavigation_background_current_color]' => array(
'default_value' => $color_defaults['subnavigation_background_current_color'],
'label' => __( 'Sub-Menu Background Current', 'generatepress' ),
'tooltip' => __( 'Choose Current Color', 'generatepress' ),
'element' => $submenu_current_selectors,
'property' => 'background-color',
'hide_label' => true,
),
)
);
// Sub-Menu text group.
GeneratePress_Customize_Field::add_color_field_group(
'primary_navigation_submenu_text',
'generate_colors_section',
'primary-navigation-colors',
array(
'generate_settings[subnavigation_text_color]' => array(
'default_value' => $color_defaults['subnavigation_text_color'],
'label' => __( 'Sub-Menu Text', 'generatepress' ),
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'element' => '.main-navigation .main-nav ul ul li a',
'property' => 'color',
'hide_label' => false,
),
'generate_settings[subnavigation_text_hover_color]' => array(
'default_value' => $color_defaults['subnavigation_text_hover_color'],
'label' => __( 'Sub-Menu Text Hover', 'generatepress' ),
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'element' => $submenu_hover_selectors,
'property' => 'color',
'hide_label' => true,
),
'generate_settings[subnavigation_text_current_color]' => array(
'default_value' => $color_defaults['subnavigation_text_current_color'],
'label' => __( 'Sub-Menu Text Current', 'generatepress' ),
'tooltip' => __( 'Choose Current Color', 'generatepress' ),
'element' => $submenu_current_selectors,
'property' => 'color',
'hide_label' => true,
),
)
);
GeneratePress_Customize_Field::add_title(
'generate_navigation_search_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Navigation Search', 'generatepress' ),
'choices' => array(
'toggleId' => 'primary-navigation-search-colors',
),
'active_callback' => function() {
if ( 'enable' === generate_get_option( 'nav_search' ) ) {
return true;
}
return false;
},
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[navigation_search_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['navigation_search_background_color'],
'transport' => 'refresh',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'primary-navigation-search-colors',
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[navigation_search_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['navigation_search_text_color'],
'transport' => 'refresh',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'primary-navigation-search-colors',
),
)
);

View File

@ -0,0 +1,161 @@
<?php
/**
* This file handles the customizer fields for the sidebar widgets.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_sidebar_widgets_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Sidebar Widgets', 'generatepress' ),
'choices' => array(
'toggleId' => 'sidebar-widget-colors',
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[sidebar_widget_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['sidebar_widget_background_color'],
'sanitize_callback' => 'generate_sanitize_rgba_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'alpha' => true,
'toggleId' => 'sidebar-widget-colors',
'wrapper' => 'sidebar_widget_background_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.sidebar .widget',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[sidebar_widget_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['sidebar_widget_text_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'sidebar-widget-colors',
'wrapper' => 'sidebar_widget_text_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.sidebar .widget',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_sidebar_widget_colors_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'sidebar-widget-colors',
'items' => array(
'sidebar_widget_link_color',
'sidebar_widget_link_hover_color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[sidebar_widget_link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['sidebar_widget_link_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'sidebar-widget-colors',
'wrapper' => 'sidebar_widget_link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
),
'output' => array(
array(
'element' => '.sidebar .widget a',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[sidebar_widget_link_hover_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['sidebar_widget_link_hover_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Link Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'sidebar-widget-colors',
'wrapper' => 'sidebar_widget_link_hover_color',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.sidebar .widget a:hover',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[sidebar_widget_title_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['sidebar_widget_title_color'],
'sanitize_callback' => 'generate_sanitize_hex_color',
'transport' => 'postMessage',
),
array(
'label' => __( 'Widget Title', 'generatepress' ),
'section' => 'generate_colors_section',
'choices' => array(
'toggleId' => 'sidebar-widget-colors',
),
'output' => array(
array(
'element' => '.sidebar .widget .widget-title',
'property' => 'color',
),
),
)
);

View File

@ -0,0 +1,140 @@
<?php
/**
* This file handles the customizer fields for the top bar.
*
* @package GeneratePress
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // No direct access, please.
}
GeneratePress_Customize_Field::add_title(
'generate_top_bar_colors_title',
array(
'section' => 'generate_colors_section',
'title' => __( 'Top Bar', 'generatepress' ),
'choices' => array(
'toggleId' => 'top-bar-colors',
),
'active_callback' => 'generate_is_top_bar_active',
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[top_bar_background_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['top_bar_background_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Background', 'generatepress' ),
'section' => 'generate_colors_section',
'settings' => 'generate_settings[top_bar_background_color]',
'active_callback' => 'generate_is_top_bar_active',
'choices' => array(
'alpha' => true,
'toggleId' => 'top-bar-colors',
),
'output' => array(
array(
'element' => '.top-bar',
'property' => 'background-color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[top_bar_text_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['top_bar_text_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Text', 'generatepress' ),
'section' => 'generate_colors_section',
'active_callback' => 'generate_is_top_bar_active',
'choices' => array(
'toggleId' => 'top-bar-colors',
),
'output' => array(
array(
'element' => '.top-bar',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_wrapper(
'generate_top_bar_link_wrapper',
array(
'section' => 'generate_colors_section',
'choices' => array(
'type' => 'color',
'toggleId' => 'top-bar-colors',
'items' => array(
'top_bar_link_color',
'top_bar_link_color_hover',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[top_bar_link_color]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['top_bar_link_color'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Link', 'generatepress' ),
'section' => 'generate_colors_section',
'active_callback' => 'generate_is_top_bar_active',
'choices' => array(
'wrapper' => 'top_bar_link_color',
'tooltip' => __( 'Choose Initial Color', 'generatepress' ),
'toggleId' => 'top-bar-colors',
),
'output' => array(
array(
'element' => '.top-bar a',
'property' => 'color',
),
),
)
);
GeneratePress_Customize_Field::add_field(
'generate_settings[top_bar_link_color_hover]',
'GeneratePress_Customize_Color_Control',
array(
'default' => $color_defaults['top_bar_link_color_hover'],
'transport' => 'postMessage',
'sanitize_callback' => 'generate_sanitize_rgba_color',
),
array(
'label' => __( 'Link Hover', 'generatepress' ),
'section' => 'generate_colors_section',
'active_callback' => 'generate_is_top_bar_active',
'choices' => array(
'wrapper' => 'top_bar_link_color_hover',
'tooltip' => __( 'Choose Hover Color', 'generatepress' ),
'toggleId' => 'top-bar-colors',
'hideLabel' => true,
),
'output' => array(
array(
'element' => '.top-bar a:hover',
'property' => 'color',
),
),
)
);

View File

@ -111,6 +111,34 @@ if ( ! function_exists( 'generate_sanitize_decimal_integer' ) ) {
}
}
/**
* Sanitize integers that can use decimals.
*
* @since 3.1.0
* @param string $input The value to check.
*/
function generate_sanitize_empty_decimal_integer( $input ) {
if ( '' === $input ) {
return '';
}
return abs( floatval( $input ) );
}
/**
* Sanitize integers that can use negative decimals.
*
* @since 3.1.0
* @param string $input The value to check.
*/
function generate_sanitize_empty_negative_decimal_integer( $input ) {
if ( '' === $input ) {
return '';
}
return floatval( $input );
}
/**
* Sanitize a positive number, but allow an empty value.
*
@ -180,6 +208,10 @@ if ( ! function_exists( 'generate_sanitize_hex_color' ) ) {
return $color;
}
if ( strpos( $color, 'var(' ) !== false ) {
return sanitize_text_field( $color );
}
return '';
}
}
@ -275,6 +307,68 @@ function generate_do_control_inline_scripts() {
wp_localize_script( 'generatepress-customizer-controls', 'generatepress_color_defaults', generate_get_color_defaults() );
wp_localize_script( 'generatepress-customizer-controls', 'generatepress_typography_defaults', generate_get_default_fonts() );
wp_localize_script( 'generatepress-customizer-controls', 'generatepress_spacing_defaults', generate_spacing_get_defaults() );
wp_localize_script(
'generatepress-customizer-controls',
'generatepressCustomizeControls',
array(
'mappedTypographyData' => array(
'typography' => GeneratePress_Typography_Migration::get_mapped_typography_data(),
'fonts' => GeneratePress_Typography_Migration::get_mapped_font_data(),
),
)
);
wp_enqueue_script(
'generate-customizer-controls',
trailingslashit( get_template_directory_uri() ) . 'assets/dist/customizer.js',
// We're including wp-color-picker for localized strings, nothing more.
array( 'customize-controls', 'wp-i18n', 'wp-components', 'wp-element', 'jquery', 'customize-base', 'wp-color-picker' ),
GENERATE_VERSION,
true
);
$color_palette = get_theme_support( 'editor-color-palette' );
$colors = array();
if ( is_array( $color_palette ) ) {
foreach ( $color_palette as $key => $value ) {
foreach ( $value as $color ) {
$colors[] = array(
'name' => $color['name'],
'color' => $color['color'],
);
}
}
}
wp_localize_script(
'generate-customizer-controls',
'generateCustomizerControls',
array(
'palette' => $colors,
)
);
wp_enqueue_style(
'generate-customizer-controls',
trailingslashit( get_template_directory_uri() ) . 'assets/dist/style-customizer.css',
array( 'wp-components' ),
GENERATE_VERSION
);
$global_colors = generate_get_global_colors();
$global_colors_css = ':root {';
if ( ! empty( $global_colors ) ) {
foreach ( (array) $global_colors as $key => $data ) {
$global_colors_css .= '--' . $data['slug'] . ':' . $data['color'] . ';';
}
}
$global_colors_css .= '}';
wp_add_inline_style( 'generate-customizer-controls', $global_colors_css );
}
if ( ! function_exists( 'generate_customizer_live_preview' ) ) {
@ -297,7 +391,7 @@ if ( ! function_exists( 'generate_customizer_live_preview' ) ) {
'generatepress_live_preview',
array(
'mobile' => generate_get_media_query( 'mobile' ),
'tablet' => generate_get_media_query( 'tablet' ),
'tablet' => generate_get_media_query( 'tablet_only' ),
'desktop' => generate_get_media_query( 'desktop' ),
'contentLeft' => absint( $spacing_settings['content_left'] ),
'contentRight' => absint( $spacing_settings['content_right'] ),
@ -305,6 +399,17 @@ if ( ! function_exists( 'generate_customizer_live_preview' ) ) {
'isRTL' => is_rtl(),
)
);
wp_enqueue_script(
'generate-postMessage',
trailingslashit( get_template_directory_uri() ) . 'inc/customizer/controls/js/postMessage.js',
array( 'jquery', 'customize-preview', 'wp-hooks' ),
GENERATE_VERSION,
true
);
global $generate_customize_fields;
wp_localize_script( 'generate-postMessage', 'gpPostMessageFields', $generate_customize_fields );
}
}

View File

@ -51,16 +51,62 @@ if ( ! function_exists( 'generate_get_defaults' ) ) {
'footer_widget_setting' => '3',
'footer_bar_alignment' => 'right',
'back_to_top' => '',
'background_color' => '#f7f8f9',
'text_color' => '#222222',
'link_color' => '#1e73be',
'link_color_hover' => '#000000',
'background_color' => 'var(--base-2)',
'text_color' => 'var(--contrast)',
'link_color' => 'var(--accent)',
'link_color_hover' => 'var(--contrast)',
'link_color_visited' => '',
'font_awesome_essentials' => true,
'icons' => 'svg',
'combine_css' => true,
'dynamic_css_cache' => true,
'structure' => 'flexbox',
'underline_links' => 'always',
'font_manager' => array(),
'typography' => array(),
'google_font_display' => 'auto',
'use_dynamic_typography' => true,
'global_colors' => array(
array(
'name' => __( 'Contrast', 'generatepress' ),
'slug' => 'contrast',
'color' => '#222222',
),
array(
/* translators: Contrast number */
'name' => sprintf( __( 'Contrast %s', 'generatepress' ), '2' ),
'slug' => 'contrast-2',
'color' => '#575760',
),
array(
/* translators: Contrast number */
'name' => sprintf( __( 'Contrast %s', 'generatepress' ), '3' ),
'slug' => 'contrast-3',
'color' => '#b2b2be',
),
array(
'name' => __( 'Base', 'generatepress' ),
'slug' => 'base',
'color' => '#f0f0f0',
),
array(
/* translators: Base number */
'name' => sprintf( __( 'Base %s', 'generatepress' ), '2' ),
'slug' => 'base-2',
'color' => '#f7f8f9',
),
array(
/* translators: Base number */
'name' => sprintf( __( 'Base %s', 'generatepress' ), '3' ),
'slug' => 'base-3',
'color' => '#ffffff',
),
array(
'name' => __( 'Accent', 'generatepress' ),
'slug' => 'accent',
'color' => '#1e73be',
),
),
)
);
}
@ -78,34 +124,34 @@ if ( ! function_exists( 'generate_get_color_defaults' ) ) {
'top_bar_text_color' => '#ffffff',
'top_bar_link_color' => '#ffffff',
'top_bar_link_color_hover' => '#303030',
'header_background_color' => '#ffffff',
'header_background_color' => 'var(--base-3)',
'header_text_color' => '',
'header_link_color' => '',
'header_link_hover_color' => '',
'site_title_color' => '#222222',
'site_tagline_color' => '#757575',
'navigation_background_color' => '#ffffff',
'navigation_text_color' => '#515151',
'navigation_background_hover_color' => '#ffffff',
'navigation_text_hover_color' => '#7a8896',
'navigation_background_current_color' => '#ffffff',
'navigation_text_current_color' => '#7a8896',
'subnavigation_background_color' => '#eaeaea',
'subnavigation_text_color' => '#515151',
'subnavigation_background_hover_color' => '#eaeaea',
'subnavigation_text_hover_color' => '#7a8896',
'subnavigation_background_current_color' => '#eaeaea',
'subnavigation_text_current_color' => '#7a8896',
'site_title_color' => 'var(--contrast)',
'site_tagline_color' => 'var(--contrast-2)',
'navigation_background_color' => 'var(--base-3)',
'navigation_text_color' => 'var(--contrast)',
'navigation_background_hover_color' => '',
'navigation_text_hover_color' => 'var(--accent)',
'navigation_background_current_color' => '',
'navigation_text_current_color' => 'var(--accent)',
'subnavigation_background_color' => 'var(--base)',
'subnavigation_text_color' => '',
'subnavigation_background_hover_color' => '',
'subnavigation_text_hover_color' => '',
'subnavigation_background_current_color' => '',
'subnavigation_text_current_color' => '',
'navigation_search_background_color' => '',
'navigation_search_text_color' => '',
'content_background_color' => '#ffffff',
'content_background_color' => 'var(--base-3)',
'content_text_color' => '',
'content_link_color' => '',
'content_link_hover_color' => '',
'content_title_color' => '',
'blog_post_title_color' => '#222222',
'blog_post_title_hover_color' => '#55555e',
'entry_meta_text_color' => '#595959',
'blog_post_title_color' => 'var(--contrast)',
'blog_post_title_hover_color' => 'var(--contrast-2)',
'entry_meta_text_color' => 'var(--contrast-2)',
'entry_meta_link_color' => '',
'entry_meta_link_color_hover' => '',
'h1_color' => '',
@ -114,26 +160,26 @@ if ( ! function_exists( 'generate_get_color_defaults' ) ) {
'h4_color' => '',
'h5_color' => '',
'h6_color' => '',
'sidebar_widget_background_color' => '#ffffff',
'sidebar_widget_background_color' => 'var(--base-3)',
'sidebar_widget_text_color' => '',
'sidebar_widget_link_color' => '',
'sidebar_widget_link_hover_color' => '',
'sidebar_widget_title_color' => '',
'footer_widget_background_color' => '#ffffff',
'footer_widget_background_color' => 'var(--base-3)',
'footer_widget_text_color' => '',
'footer_widget_link_color' => '',
'footer_widget_link_hover_color' => '',
'footer_widget_title_color' => '#000000',
'footer_background_color' => '#55555e',
'footer_text_color' => '#ffffff',
'footer_link_color' => '#ffffff',
'footer_link_hover_color' => '#d3d3d3',
'form_background_color' => '#fafafa',
'form_text_color' => '#666666',
'form_background_color_focus' => '#ffffff',
'form_text_color_focus' => '#666666',
'form_border_color' => '#cccccc',
'form_border_color_focus' => '#bfbfbf',
'footer_widget_title_color' => '',
'footer_background_color' => 'var(--base-3)',
'footer_text_color' => '',
'footer_link_color' => '',
'footer_link_hover_color' => '',
'form_background_color' => 'var(--base-2)',
'form_text_color' => 'var(--contrast)',
'form_background_color_focus' => 'var(--base-2)',
'form_text_color_focus' => 'var(--contrast)',
'form_border_color' => 'var(--base)',
'form_border_color_focus' => 'var(--contrast-3)',
'form_button_background_color' => '#55555e',
'form_button_background_color_hover' => '#3f4047',
'form_button_text_color' => '#ffffff',

View File

@ -19,7 +19,8 @@ if ( ! function_exists( 'generate_scripts' ) ) {
$dir_uri = get_template_directory_uri();
if ( generate_is_using_flexbox() ) {
if ( is_singular() && comments_open() ) {
// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Intentionally loose.
if ( is_singular() && ( comments_open() || '0' != get_comments_number() ) ) {
wp_enqueue_style( 'generate-comments', $dir_uri . "/assets/css/components/comments{$suffix}.css", array(), GENERATE_VERSION, 'all' );
}
@ -71,17 +72,12 @@ if ( ! function_exists( 'generate_scripts' ) ) {
wp_script_add_data( 'generate-classlist', 'conditional', 'lte IE 11' );
}
if ( apply_filters( 'generate_combine_js', true ) && $suffix ) {
wp_enqueue_script( 'generate-main', $dir_uri . "/assets/js/main{$suffix}.js", array(), GENERATE_VERSION, true );
$script_handle = 'generate-main';
} else {
if ( generate_has_active_menu() ) {
wp_enqueue_script( 'generate-menu', $dir_uri . "/assets/js/menu{$suffix}.js", array(), GENERATE_VERSION, true );
wp_enqueue_script( 'generate-a11y', $dir_uri . "/assets/js/a11y{$suffix}.js", array(), GENERATE_VERSION, true );
$script_handle = 'generate-menu';
}
wp_localize_script(
$script_handle,
'generate-menu',
'generatepressMenu',
apply_filters(
'generate_localize_js_args',
@ -112,6 +108,17 @@ if ( ! function_exists( 'generate_scripts' ) ) {
if ( 'enable' === generate_get_option( 'back_to_top' ) ) {
wp_enqueue_script( 'generate-back-to-top', $dir_uri . "/assets/js/back-to-top{$suffix}.js", array(), GENERATE_VERSION, true );
wp_localize_script(
'generate-back-to-top',
'generatepressBackToTop',
apply_filters(
'generate_back_to_top_js_args',
array(
'smooth' => true,
)
)
);
}
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
@ -233,7 +240,9 @@ if ( ! function_exists( 'generate_resource_hints' ) ) {
* @return array $urls URLs to print for resource hints.
*/
function generate_resource_hints( $urls, $relation_type ) {
if ( wp_style_is( 'generate-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
$handle = generate_is_using_dynamic_typography() ? 'generate-google-fonts' : 'generate-fonts';
if ( wp_style_is( $handle, 'queue' ) && 'preconnect' === $relation_type ) {
if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
$urls[] = array(
'href' => 'https://fonts.gstatic.com',
@ -434,3 +443,19 @@ function generate_set_microdata_markup( $output, $context ) {
return $output;
}
add_action( 'wp_footer', 'generate_do_a11y_scripts' );
/**
* Enqueue scripts in the footer.
*
* @since 3.1.0
*/
function generate_do_a11y_scripts() {
if ( apply_filters( 'generate_print_a11y_script', true ) ) {
// Add our small a11y script inline.
printf(
'<script id="generate-a11y">%s</script>',
'!function(){"use strict";if("querySelector"in document&&"addEventListener"in window){var e=document.body;e.addEventListener("mousedown",function(){e.classList.add("using-mouse")}),e.addEventListener("keydown",function(){e.classList.remove("using-mouse")})}}();'
);
}
}

View File

@ -49,7 +49,7 @@ function generate_register_layout_meta_box() {
$blog_id = get_option( 'page_for_posts' );
// No need for the Layout metabox on the blog page.
if ( $blog_id && (int) $blog_id === (int) $post->ID ) {
if ( isset( $post->ID ) && $blog_id && (int) $blog_id === (int) $post->ID ) {
return;
}

View File

@ -41,8 +41,8 @@ if ( ! function_exists( 'generate_woocommerce_start' ) ) {
*/
function generate_woocommerce_start() {
?>
<div id="primary" <?php generate_do_element_classes( 'content' ); ?>>
<main id="main" <?php generate_do_element_classes( 'main' ); ?>>
<div <?php generate_do_attr( 'content' ); ?>>
<main <?php generate_do_attr( 'main' ); ?>>
<?php
/**
* generate_before_main_content hook.
@ -805,6 +805,16 @@ function generate_pro_compat_customize_register( $wp_customize ) {
$wp_customize->get_setting( 'generate_spacing_settings[footer_left]' )->transport = 'refresh';
}
}
if ( $wp_customize->get_panel( 'generate_typography_panel' ) ) {
$wp_customize->get_panel( 'generate_typography_panel' )->active_callback = function() {
if ( generate_is_using_dynamic_typography() ) {
return false;
}
return true;
};
}
}
add_action( 'wp', 'generate_do_pro_compatibility_setup' );
@ -824,4 +834,66 @@ function generate_do_pro_compatibility_setup() {
add_filter( 'generate_show_title', '__return_true', 20 );
}
}
if ( generate_is_using_dynamic_typography() ) {
remove_action( 'wp_enqueue_scripts', 'generate_enqueue_google_fonts', 0 );
remove_action( 'wp_enqueue_scripts', 'generate_typography_premium_css', 100 );
remove_filter( 'generate_external_dynamic_css_output', 'generate_typography_add_to_external_stylesheet' );
}
}
add_filter( 'generate_has_active_menu', 'generate_do_pro_active_menus' );
/**
* Tell GP about our active pro menus.
*
* @since 3.1.0
* @param boolean $has_active_menu Whether we have an active menu.
*/
function generate_do_pro_active_menus( $has_active_menu ) {
if ( ! defined( 'GP_PREMIUM_VERSION' ) ) {
return $has_active_menu;
}
if ( version_compare( GP_PREMIUM_VERSION, '2.1.0-alpha.1', '<' ) ) {
if ( function_exists( 'generate_menu_plus_get_defaults' ) ) {
$menu_plus_settings = wp_parse_args(
get_option( 'generate_menu_plus_settings', array() ),
generate_menu_plus_get_defaults()
);
if ( 'disable' !== $menu_plus_settings['mobile_header'] || 'false' !== $menu_plus_settings['slideout_menu'] ) {
$has_active_menu = true;
}
}
if ( function_exists( 'generate_secondary_nav_get_defaults' ) && has_nav_menu( 'secondary' ) ) {
$has_active_menu = true;
}
}
return $has_active_menu;
}
add_action( 'init', 'generate_do_customizer_compatibility_setup' );
/**
* Make changes to the Customizer in the Pro version.
*/
function generate_do_customizer_compatibility_setup() {
if ( ! defined( 'GP_PREMIUM_VERSION' ) ) {
return;
}
if ( version_compare( GP_PREMIUM_VERSION, '2.1.0-alpha.1', '<' ) ) {
if ( generate_is_using_dynamic_typography() ) {
remove_action( 'customize_register', 'generate_fonts_customize_register' );
remove_action( 'customize_preview_init', 'generate_typography_customizer_live_preview' );
}
remove_action( 'customize_register', 'generate_colors_customize_register' );
remove_action( 'customize_preview_init', 'generate_colors_customizer_live_preview' );
remove_action( 'customize_controls_enqueue_scripts', 'generate_enqueue_color_palettes', 1001 );
remove_action( 'customize_register', 'generate_colors_secondary_nav_customizer', 1000 );
remove_action( 'customize_register', 'generate_slideout_navigation_color_controls', 150 );
remove_action( 'customize_register', 'generate_colors_wc_customizer', 100 );
}
}

View File

@ -21,7 +21,7 @@ if ( ! function_exists( 'generate_archive_title' ) ) {
return;
}
?>
<header class="page-header">
<header <?php generate_do_attr( 'page-header' ); ?>>
<?php
/**
* generate_before_archive_title hook.
@ -98,14 +98,14 @@ add_action( 'generate_after_archive_title', 'generate_do_archive_description' );
* @since 2.3
*/
function generate_do_archive_description() {
$term_description = term_description();
$term_description = get_the_archive_description();
if ( ! empty( $term_description ) ) {
if ( is_author() ) {
printf( '<div class="author-info">%s</div>', $term_description ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
} else {
printf( '<div class="taxonomy-description">%s</div>', $term_description ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
}
if ( get_the_author_meta( 'description' ) && is_author() ) {
echo '<div class="author-info">' . get_the_author_meta( 'description' ) . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
}
/**
@ -115,3 +115,28 @@ function generate_do_archive_description() {
*/
do_action( 'generate_after_archive_description' );
}
add_action( 'generate_before_loop', 'generate_do_search_results_title' );
/**
* Add the search results title to the search results page.
*
* @since 3.1.0
* @param string $template The template we're targeting.
*/
function generate_do_search_results_title( $template ) {
if ( 'search' === $template ) {
// phpcs:ignore -- No escaping needed.
echo apply_filters(
'generate_search_title_output',
sprintf(
'<header %s><h1 class="page-title">%s</h1></header>',
generate_get_attr( 'page-header' ),
sprintf(
/* translators: 1: Search query name */
__( 'Search Results for: %s', 'generatepress' ),
'<span>' . get_search_query() . '</span>'
)
)
);
}
}

View File

@ -31,8 +31,8 @@ if ( ! function_exists( 'generate_comment' ) ) {
<?php else : ?>
<li id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
<article id="div-comment-<?php comment_ID(); ?>" <?php generate_do_element_classes( 'comment-body', 'comment-body' ); ?>>
<footer class="comment-meta">
<article <?php generate_do_attr( 'comment-body', array(), array( 'comment-id' => get_comment_ID() ) ); ?>>
<footer <?php generate_do_attr( 'comment-meta' ); ?>>
<?php
if ( 0 != $args['avatar_size'] ) { // phpcs:ignore
echo get_avatar( $comment, $args['avatar_size'] );
@ -43,6 +43,16 @@ if ( ! function_exists( 'generate_comment' ) ) {
<?php printf( '<cite itemprop="name" class="fn">%s</cite>', get_comment_author_link() ); ?>
</div>
<?php
/**
* generate_after_comment_author_name hook.
*
* @since 3.1.0
*/
do_action( 'generate_after_comment_author_name' );
if ( apply_filters( 'generate_show_comment_entry_meta', true ) ) :
?>
<div class="entry-meta comment-metadata">
<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
<time datetime="<?php comment_time( 'c' ); ?>" itemprop="datePublished">
@ -58,6 +68,9 @@ if ( ! function_exists( 'generate_comment' ) ) {
</a>
<?php edit_comment_link( __( 'Edit', 'generatepress' ), '<span class="edit-link">| ', '</span>' ); ?>
</div>
<?php
endif;
?>
</div>
<?php if ( '0' == $comment->comment_approved ) : // phpcs:ignore ?>
@ -125,7 +138,7 @@ add_filter( 'comment_form_defaults', 'generate_set_comment_form_defaults' );
*/
function generate_set_comment_form_defaults( $defaults ) {
$defaults['comment_field'] = sprintf(
'<p class="comment-form-comment"><label for="comment" class="screen-reader-text">%1$s</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></textarea></p>',
'<p class="comment-form-comment"><label for="comment" class="screen-reader-text">%1$s</label><textarea id="comment" name="comment" cols="45" rows="8" required></textarea></p>',
esc_html__( 'Comment', 'generatepress' )
);
@ -152,17 +165,19 @@ function generate_filter_comment_fields( $fields ) {
$required = get_option( 'require_name_email' );
$fields['author'] = sprintf(
'<label for="author" class="screen-reader-text">%1$s</label><input placeholder="%1$s%3$s" id="author" name="author" type="text" value="%2$s" size="30" />',
'<label for="author" class="screen-reader-text">%1$s</label><input placeholder="%1$s%3$s" id="author" name="author" type="text" value="%2$s" size="30"%4$s />',
esc_html__( 'Name', 'generatepress' ),
esc_attr( $commenter['comment_author'] ),
$required ? ' *' : ''
$required ? ' *' : '',
$required ? ' required' : ''
);
$fields['email'] = sprintf(
'<label for="email" class="screen-reader-text">%1$s</label><input placeholder="%1$s%3$s" id="email" name="email" type="email" value="%2$s" size="30" />',
'<label for="email" class="screen-reader-text">%1$s</label><input placeholder="%1$s%3$s" id="email" name="email" type="email" value="%2$s" size="30"%4$s />',
esc_html__( 'Email', 'generatepress' ),
esc_attr( $commenter['comment_author_email'] ),
$required ? ' *' : ''
$required ? ' *' : '',
$required ? ' required' : ''
);
$fields['url'] = sprintf(

View File

@ -17,18 +17,9 @@ if ( ! function_exists( 'generate_construct_footer' ) ) {
* @since 1.3.42
*/
function generate_construct_footer() {
$inside_site_info_class = '';
if ( 'full-width' !== generate_get_option( 'footer_inner_width' ) ) {
$inside_site_info_class = ' grid-container grid-parent';
if ( generate_is_using_flexbox() ) {
$inside_site_info_class = ' grid-container';
}
}
?>
<footer <?php generate_do_element_classes( 'site-info', 'site-info' ); ?>>
<div class="inside-site-info<?php echo $inside_site_info_class; // phpcs:ignore ?>">
<footer <?php generate_do_attr( 'site-info' ); ?>>
<div <?php generate_do_attr( 'inside-site-info' ); ?>>
<?php
/**
* generate_before_copyright hook.
@ -173,7 +164,7 @@ if ( ! function_exists( 'generate_construct_footer_widgets' ) ) {
}
?>
<div id="footer-widgets" class="site footer-widgets">
<div <?php generate_do_element_classes( 'inside_footer' ); ?>>
<div <?php generate_do_attr( 'footer-widgets-container' ); ?>>
<div class="inside-footer-widgets">
<?php
if ( $widgets >= 1 ) {

View File

@ -18,8 +18,8 @@ if ( ! function_exists( 'generate_construct_header' ) ) {
*/
function generate_construct_header() {
?>
<header id="masthead" <?php generate_do_element_classes( 'header' ); ?>>
<div <?php generate_do_element_classes( 'inside_header' ); ?>>
<header <?php generate_do_attr( 'header' ); ?>>
<div <?php generate_do_attr( 'inside-header' ); ?>>
<?php
/**
* generate_before_header_content hook.
@ -343,19 +343,9 @@ if ( ! function_exists( 'generate_top_bar' ) ) {
if ( ! is_active_sidebar( 'top-bar' ) ) {
return;
}
$inside_top_bar_class = '';
if ( 'contained' === generate_get_option( 'top_bar_inner_width' ) ) {
$inside_top_bar_class = ' grid-container grid-parent';
if ( generate_is_using_flexbox() ) {
$inside_top_bar_class = ' grid-container';
}
}
?>
<div <?php generate_do_element_classes( 'top_bar' ); ?>>
<div class="inside-top-bar<?php echo $inside_top_bar_class; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- False positive. ?>">
<div <?php generate_do_attr( 'top-bar' ); ?>>
<div <?php generate_do_attr( 'inside-top-bar' ); ?>>
<?php dynamic_sidebar( 'top-bar' ); ?>
</div>
</div>
@ -378,7 +368,7 @@ if ( ! function_exists( 'generate_pingback_header' ) ) {
}
if ( ! function_exists( 'generate_add_viewport' ) ) {
add_action( 'wp_head', 'generate_add_viewport' );
add_action( 'wp_head', 'generate_add_viewport', 1 );
/**
* Add viewport to wp_head.
*

View File

@ -23,8 +23,8 @@ if ( ! function_exists( 'generate_navigation_position' ) ) {
*/
do_action( 'generate_before_navigation' );
?>
<nav id="site-navigation" <?php generate_do_element_classes( 'navigation' ); ?>>
<div <?php generate_do_element_classes( 'inside_navigation' ); ?>>
<nav <?php generate_do_attr( 'navigation' ); ?>>
<div <?php generate_do_attr( 'inside-navigation' ); ?>>
<?php
/**
* generate_inside_navigation hook.
@ -36,7 +36,7 @@ if ( ! function_exists( 'generate_navigation_position' ) ) {
*/
do_action( 'generate_inside_navigation' );
?>
<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false">
<button <?php generate_do_attr( 'menu-toggle' ); ?>>
<?php
/**
* generate_inside_mobile_menu hook.
@ -116,7 +116,7 @@ function generate_do_header_mobile_menu_toggle() {
return;
}
?>
<nav id="mobile-menu-control-wrapper" <?php generate_do_element_classes( 'mobile-navigation-toggle', array( 'main-navigation', 'mobile-menu-control-wrapper' ) ); ?>>
<nav <?php generate_do_attr( 'mobile-menu-control-wrapper' ); ?>>
<?php
/**
* generate_inside_mobile_menu_control_wrapper hook.
@ -125,7 +125,7 @@ function generate_do_header_mobile_menu_toggle() {
*/
do_action( 'generate_inside_mobile_menu_control_wrapper' );
?>
<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false" data-nav="site-navigation">
<button <?php generate_do_attr( 'menu-toggle', array( 'data-nav' => 'site-navigation' ) ); ?>>
<?php
/**
* generate_inside_mobile_menu hook.

View File

@ -34,10 +34,8 @@ if ( ! function_exists( 'generate_content_nav' ) ) {
if ( $wp_query->max_num_pages < 2 && ( is_home() || is_archive() || is_search() ) ) {
return;
}
$nav_class = ( is_single() ) ? 'post-navigation' : 'paging-navigation';
?>
<nav id="<?php echo esc_attr( $nav_id ); ?>" class="<?php echo esc_attr( $nav_class ); ?>">
<nav <?php generate_do_attr( 'post-navigation', array( 'id' => esc_attr( $nav_id ) ) ); ?>>
<span class="screen-reader-text"><?php esc_html_e( 'Post navigation', 'generatepress' ); ?></span>
<?php
@ -549,7 +547,7 @@ if ( ! function_exists( 'generate_footer_meta' ) ) {
*/
function generate_footer_meta() {
?>
<footer class="entry-meta">
<footer <?php generate_do_attr( 'footer-entry-meta' ); ?>>
<?php generate_entry_meta(); ?>
</footer>
<?php

View File

@ -274,75 +274,51 @@ function generate_get_svg_icon( $icon, $replace = false ) {
$output = '';
if ( 'menu-bars' === $icon ) {
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path d="M0 96c0-13.255 10.745-24 24-24h464c13.255 0 24 10.745 24 24s-10.745 24-24 24H24c-13.255 0-24-10.745-24-24zm0 160c0-13.255 10.745-24 24-24h464c13.255 0 24 10.745 24 24s-10.745 24-24 24H24c-13.255 0-24-10.745-24-24zm0 160c0-13.255 10.745-24 24-24h464c13.255 0 24 10.745 24 24s-10.745 24-24 24H24c-13.255 0-24-10.745-24-24z" />
</svg>';
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path d="M0 96c0-13.255 10.745-24 24-24h464c13.255 0 24 10.745 24 24s-10.745 24-24 24H24c-13.255 0-24-10.745-24-24zm0 160c0-13.255 10.745-24 24-24h464c13.255 0 24 10.745 24 24s-10.745 24-24 24H24c-13.255 0-24-10.745-24-24zm0 160c0-13.255 10.745-24 24-24h464c13.255 0 24 10.745 24 24s-10.745 24-24 24H24c-13.255 0-24-10.745-24-24z" /></svg>';
}
if ( 'close' === $icon ) {
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path d="M71.029 71.029c9.373-9.372 24.569-9.372 33.942 0L256 222.059l151.029-151.03c9.373-9.372 24.569-9.372 33.942 0 9.372 9.373 9.372 24.569 0 33.942L289.941 256l151.03 151.029c9.372 9.373 9.372 24.569 0 33.942-9.373 9.372-24.569 9.372-33.942 0L256 289.941l-151.029 151.03c-9.373 9.372-24.569 9.372-33.942 0-9.372-9.373-9.372-24.569 0-33.942L222.059 256 71.029 104.971c-9.372-9.373-9.372-24.569 0-33.942z" />
</svg>';
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path d="M71.029 71.029c9.373-9.372 24.569-9.372 33.942 0L256 222.059l151.029-151.03c9.373-9.372 24.569-9.372 33.942 0 9.372 9.373 9.372 24.569 0 33.942L289.941 256l151.03 151.029c9.372 9.373 9.372 24.569 0 33.942-9.373 9.372-24.569 9.372-33.942 0L256 289.941l-151.029 151.03c-9.373 9.372-24.569 9.372-33.942 0-9.372-9.373-9.372-24.569 0-33.942L222.059 256 71.029 104.971c-9.372-9.373-9.372-24.569 0-33.942z" /></svg>';
}
if ( 'search' === $icon ) {
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path fill-rule="evenodd" clip-rule="evenodd" d="M208 48c-88.366 0-160 71.634-160 160s71.634 160 160 160 160-71.634 160-160S296.366 48 208 48zM0 208C0 93.125 93.125 0 208 0s208 93.125 208 208c0 48.741-16.765 93.566-44.843 129.024l133.826 134.018c9.366 9.379 9.355 24.575-.025 33.941-9.379 9.366-24.575 9.355-33.941-.025L337.238 370.987C301.747 399.167 256.839 416 208 416 93.125 416 0 322.875 0 208z"/>
</svg>';
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path fill-rule="evenodd" clip-rule="evenodd" d="M208 48c-88.366 0-160 71.634-160 160s71.634 160 160 160 160-71.634 160-160S296.366 48 208 48zM0 208C0 93.125 93.125 0 208 0s208 93.125 208 208c0 48.741-16.765 93.566-44.843 129.024l133.826 134.018c9.366 9.379 9.355 24.575-.025 33.941-9.379 9.366-24.575 9.355-33.941-.025L337.238 370.987C301.747 399.167 256.839 416 208 416 93.125 416 0 322.875 0 208z" /></svg>';
}
if ( 'categories' === $icon ) {
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path d="M0 112c0-26.51 21.49-48 48-48h110.014a48 48 0 0 1 43.592 27.907l12.349 26.791A16 16 0 0 0 228.486 128H464c26.51 0 48 21.49 48 48v224c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V112z" fill-rule="nonzero"/>
</svg>';
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path d="M0 112c0-26.51 21.49-48 48-48h110.014a48 48 0 0143.592 27.907l12.349 26.791A16 16 0 00228.486 128H464c26.51 0 48 21.49 48 48v224c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V112z" /></svg>';
}
if ( 'tags' === $icon ) {
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path d="M20 39.5c-8.836 0-16 7.163-16 16v176c0 4.243 1.686 8.313 4.687 11.314l224 224c6.248 6.248 16.378 6.248 22.626 0l176-176c6.244-6.244 6.25-16.364.013-22.615l-223.5-224A15.999 15.999 0 0 0 196.5 39.5H20zm56 96c0-13.255 10.745-24 24-24s24 10.745 24 24-10.745 24-24 24-24-10.745-24-24z"/>
<path d="M259.515 43.015c4.686-4.687 12.284-4.687 16.97 0l228 228c4.686 4.686 4.686 12.284 0 16.97l-180 180c-4.686 4.687-12.284 4.687-16.97 0-4.686-4.686-4.686-12.284 0-16.97L479.029 279.5 259.515 59.985c-4.686-4.686-4.686-12.284 0-16.97z" fill-rule="nonzero"/>
</svg>';
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path d="M20 39.5c-8.836 0-16 7.163-16 16v176c0 4.243 1.686 8.313 4.687 11.314l224 224c6.248 6.248 16.378 6.248 22.626 0l176-176c6.244-6.244 6.25-16.364.013-22.615l-223.5-224A15.999 15.999 0 00196.5 39.5H20zm56 96c0-13.255 10.745-24 24-24s24 10.745 24 24-10.745 24-24 24-24-10.745-24-24z"/><path d="M259.515 43.015c4.686-4.687 12.284-4.687 16.97 0l228 228c4.686 4.686 4.686 12.284 0 16.97l-180 180c-4.686 4.687-12.284 4.687-16.97 0-4.686-4.686-4.686-12.284 0-16.97L479.029 279.5 259.515 59.985c-4.686-4.686-4.686-12.284 0-16.97z" /></svg>';
}
if ( 'comments' === $icon ) {
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path d="M132.838 329.973a435.298 435.298 0 0 0 16.769-9.004c13.363-7.574 26.587-16.142 37.419-25.507 7.544.597 15.27.925 23.098.925 54.905 0 105.634-15.311 143.285-41.28 23.728-16.365 43.115-37.692 54.155-62.645 54.739 22.205 91.498 63.272 91.498 110.286 0 42.186-29.558 79.498-75.09 102.828 23.46 49.216 75.09 101.709 75.09 101.709s-115.837-38.35-154.424-78.46c-9.956 1.12-20.297 1.758-30.793 1.758-88.727 0-162.927-43.071-181.007-100.61z" fill-rule="nonzero"/>
<path d="M383.371 132.502c0 70.603-82.961 127.787-185.216 127.787-10.496 0-20.837-.639-30.793-1.757-38.587 40.093-154.424 78.429-154.424 78.429s51.63-52.472 75.09-101.67c-45.532-23.321-75.09-60.619-75.09-102.79C12.938 61.9 95.9 4.716 198.155 4.716 300.41 4.715 383.37 61.9 383.37 132.502z" fill-rule="nonzero" />
</svg>';
$output = '<svg viewBox="0 0 512 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path d="M132.838 329.973a435.298 435.298 0 0016.769-9.004c13.363-7.574 26.587-16.142 37.419-25.507 7.544.597 15.27.925 23.098.925 54.905 0 105.634-15.311 143.285-41.28 23.728-16.365 43.115-37.692 54.155-62.645 54.739 22.205 91.498 63.272 91.498 110.286 0 42.186-29.558 79.498-75.09 102.828 23.46 49.216 75.09 101.709 75.09 101.709s-115.837-38.35-154.424-78.46c-9.956 1.12-20.297 1.758-30.793 1.758-88.727 0-162.927-43.071-181.007-100.61z"/><path d="M383.371 132.502c0 70.603-82.961 127.787-185.216 127.787-10.496 0-20.837-.639-30.793-1.757-38.587 40.093-154.424 78.429-154.424 78.429s51.63-52.472 75.09-101.67c-45.532-23.321-75.09-60.619-75.09-102.79C12.938 61.9 95.9 4.716 198.155 4.716 300.41 4.715 383.37 61.9 383.37 132.502z" /></svg>';
}
if ( 'arrow' === $icon ) {
$output = '<svg viewBox="0 0 330 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path d="M305.913 197.085c0 2.266-1.133 4.815-2.833 6.514L171.087 335.593c-1.7 1.7-4.249 2.832-6.515 2.832s-4.815-1.133-6.515-2.832L26.064 203.599c-1.7-1.7-2.832-4.248-2.832-6.514s1.132-4.816 2.832-6.515l14.162-14.163c1.7-1.699 3.966-2.832 6.515-2.832 2.266 0 4.815 1.133 6.515 2.832l111.316 111.317 111.316-111.317c1.7-1.699 4.249-2.832 6.515-2.832s4.815 1.133 6.515 2.832l14.162 14.163c1.7 1.7 2.833 4.249 2.833 6.515z" fill-rule="nonzero"/>
</svg>';
$output = '<svg viewBox="0 0 330 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path d="M305.913 197.085c0 2.266-1.133 4.815-2.833 6.514L171.087 335.593c-1.7 1.7-4.249 2.832-6.515 2.832s-4.815-1.133-6.515-2.832L26.064 203.599c-1.7-1.7-2.832-4.248-2.832-6.514s1.132-4.816 2.832-6.515l14.162-14.163c1.7-1.699 3.966-2.832 6.515-2.832 2.266 0 4.815 1.133 6.515 2.832l111.316 111.317 111.316-111.317c1.7-1.699 4.249-2.832 6.515-2.832s4.815 1.133 6.515 2.832l14.162 14.163c1.7 1.7 2.833 4.249 2.833 6.515z" /></svg>';
}
if ( 'arrow-right' === $icon ) {
$output = '<svg viewBox="0 0 192 512" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414">
<path d="M178.425 256.001c0 2.266-1.133 4.815-2.832 6.515L43.599 394.509c-1.7 1.7-4.248 2.833-6.514 2.833s-4.816-1.133-6.515-2.833l-14.163-14.162c-1.699-1.7-2.832-3.966-2.832-6.515 0-2.266 1.133-4.815 2.832-6.515l111.317-111.316L16.407 144.685c-1.699-1.7-2.832-4.249-2.832-6.515s1.133-4.815 2.832-6.515l14.163-14.162c1.7-1.7 4.249-2.833 6.515-2.833s4.815 1.133 6.514 2.833l131.994 131.993c1.7 1.7 2.832 4.249 2.832 6.515z" fill-rule="nonzero"/>
</svg>';
$output = '<svg viewBox="0 0 192 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M178.425 256.001c0 2.266-1.133 4.815-2.832 6.515L43.599 394.509c-1.7 1.7-4.248 2.833-6.514 2.833s-4.816-1.133-6.515-2.833l-14.163-14.162c-1.699-1.7-2.832-3.966-2.832-6.515 0-2.266 1.133-4.815 2.832-6.515l111.317-111.316L16.407 144.685c-1.699-1.7-2.832-4.249-2.832-6.515s1.133-4.815 2.832-6.515l14.163-14.162c1.7-1.7 4.249-2.833 6.515-2.833s4.815 1.133 6.514 2.833l131.994 131.993c1.7 1.7 2.832 4.249 2.832 6.515z" fill-rule="nonzero" /></svg>';
}
if ( 'arrow-left' === $icon ) {
$output = '<svg viewBox="0 0 192 512" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414">
<path d="M178.425 138.212c0 2.265-1.133 4.813-2.832 6.512L64.276 256.001l111.317 111.277c1.7 1.7 2.832 4.247 2.832 6.513 0 2.265-1.133 4.813-2.832 6.512L161.43 394.46c-1.7 1.7-4.249 2.832-6.514 2.832-2.266 0-4.816-1.133-6.515-2.832L16.407 262.514c-1.699-1.7-2.832-4.248-2.832-6.513 0-2.265 1.133-4.813 2.832-6.512l131.994-131.947c1.7-1.699 4.249-2.831 6.515-2.831 2.265 0 4.815 1.132 6.514 2.831l14.163 14.157c1.7 1.7 2.832 3.965 2.832 6.513z" fill-rule="nonzero"/>
</svg>';
$output = '<svg viewBox="0 0 192 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M178.425 138.212c0 2.265-1.133 4.813-2.832 6.512L64.276 256.001l111.317 111.277c1.7 1.7 2.832 4.247 2.832 6.513 0 2.265-1.133 4.813-2.832 6.512L161.43 394.46c-1.7 1.7-4.249 2.832-6.514 2.832-2.266 0-4.816-1.133-6.515-2.832L16.407 262.514c-1.699-1.7-2.832-4.248-2.832-6.513 0-2.265 1.133-4.813 2.832-6.512l131.994-131.947c1.7-1.699 4.249-2.831 6.515-2.831 2.265 0 4.815 1.132 6.514 2.831l14.163 14.157c1.7 1.7 2.832 3.965 2.832 6.513z" fill-rule="nonzero" /></svg>';
}
if ( 'arrow-up' === $icon ) {
$output = '<svg viewBox="0 0 330 512" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414">
<path d="M305.863 314.916c0 2.266-1.133 4.815-2.832 6.514l-14.157 14.163c-1.699 1.7-3.964 2.832-6.513 2.832-2.265 0-4.813-1.133-6.512-2.832L164.572 224.276 53.295 335.593c-1.699 1.7-4.247 2.832-6.512 2.832-2.265 0-4.814-1.133-6.513-2.832L26.113 321.43c-1.699-1.7-2.831-4.248-2.831-6.514s1.132-4.816 2.831-6.515L158.06 176.408c1.699-1.7 4.247-2.833 6.512-2.833 2.265 0 4.814 1.133 6.513 2.833L303.03 308.4c1.7 1.7 2.832 4.249 2.832 6.515z" fill-rule="nonzero"/>
</svg>';
}
if ( $replace ) {
$output .= '<svg viewBox="0 0 512 512" aria-hidden="true" role="img" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1em" height="1em">
<path d="M71.029 71.029c9.373-9.372 24.569-9.372 33.942 0L256 222.059l151.029-151.03c9.373-9.372 24.569-9.372 33.942 0 9.372 9.373 9.372 24.569 0 33.942L289.941 256l151.03 151.029c9.372 9.373 9.372 24.569 0 33.942-9.373 9.372-24.569 9.372-33.942 0L256 289.941l-151.029 151.03c-9.373 9.372-24.569 9.372-33.942 0-9.372-9.373-9.372-24.569 0-33.942L222.059 256 71.029 104.971c-9.372-9.373-9.372-24.569 0-33.942z" />
</svg>';
$output = '<svg viewBox="0 0 330 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M305.863 314.916c0 2.266-1.133 4.815-2.832 6.514l-14.157 14.163c-1.699 1.7-3.964 2.832-6.513 2.832-2.265 0-4.813-1.133-6.512-2.832L164.572 224.276 53.295 335.593c-1.699 1.7-4.247 2.832-6.512 2.832-2.265 0-4.814-1.133-6.513-2.832L26.113 321.43c-1.699-1.7-2.831-4.248-2.831-6.514s1.132-4.816 2.831-6.515L158.06 176.408c1.699-1.7 4.247-2.833 6.512-2.833 2.265 0 4.814 1.133 6.513 2.833L303.03 308.4c1.7 1.7 2.832 4.249 2.832 6.515z" fill-rule="nonzero" /></svg>';
}
$output = apply_filters( 'generate_svg_icon_element', $output, $icon );
if ( $replace ) {
$output .= '<svg viewBox="0 0 512 512" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em"><path d="M71.029 71.029c9.373-9.372 24.569-9.372 33.942 0L256 222.059l151.029-151.03c9.373-9.372 24.569-9.372 33.942 0 9.372 9.373 9.372 24.569 0 33.942L289.941 256l151.03 151.029c9.372 9.373 9.372 24.569 0 33.942-9.373 9.372-24.569 9.372-33.942 0L256 289.941l-151.029 151.03c-9.373 9.372-24.569 9.372-33.942 0-9.372-9.373-9.372-24.569 0-33.942L222.059 256 71.029 104.971c-9.372-9.373-9.372-24.569 0-33.942z" /></svg>';
}
$classes = array(
'gp-icon',
'icon-' . $icon,
@ -379,7 +355,7 @@ function generate_do_svg_icon( $icon, $replace = false ) {
*/
function generate_get_media_query( $name ) {
$desktop = apply_filters( 'generate_desktop_media_query', '(min-width:1025px)' );
$tablet = apply_filters( 'generate_tablet_media_query', '(min-width: 769px) and (max-width: 1024px)' );
$tablet_only = apply_filters( 'generate_tablet_media_query', '(min-width: 769px) and (max-width: 1024px)' );
$mobile = apply_filters( 'generate_mobile_media_query', '(max-width:768px)' );
$mobile_menu = apply_filters( 'generate_mobile_menu_media_query', $mobile );
@ -387,7 +363,8 @@ function generate_get_media_query( $name ) {
'generate_media_queries',
array(
'desktop' => $desktop,
'tablet' => $tablet,
'tablet_only' => $tablet_only,
'tablet' => '(max-width: 1024px)',
'mobile' => $mobile,
'mobile-menu' => $mobile_menu,
)
@ -692,3 +669,176 @@ function generate_needs_site_branding_container() {
return $container;
}
/**
* Merge array of attributes with defaults, and apply contextual filter on array.
*
* The contextual filter is of the form `generate_attr_{context}`.
*
* @since 3.1.0
*
* @param string $context The context, to build filter name.
* @param array $attributes Optional. Extra attributes to merge with defaults.
* @param array $settings Optional. Custom data to pass to filter.
* @return array Merged and filtered attributes.
*/
function generate_parse_attr( $context, $attributes = array(), $settings = array() ) {
// Initialize an empty class attribute so it's easier to append to in filters.
if ( ! isset( $attributes['class'] ) ) {
$attributes['class'] = '';
}
// We used to have a class-only system. If it's in use, add the classes.
$classes = generate_get_element_classes( $context );
if ( $classes ) {
$attributes['class'] .= join( ' ', $classes );
}
// Contextual filter.
return apply_filters( 'generate_parse_attr', $attributes, $context, $settings );
}
/**
* Build list of attributes into a string and apply contextual filter on string.
*
* The contextual filter is of the form `generate_attr_{context}_output`.
*
* @since 3.1.0
*
* @param string $context The context, to build filter name.
* @param array $attributes Optional. Extra attributes to merge with defaults.
* @param array $settings Optional. Custom data to pass to filter.
* @return string String of HTML attributes and values.
*/
function generate_get_attr( $context, $attributes = array(), $settings = array() ) {
$attributes = generate_parse_attr( $context, $attributes, $settings );
$output = '';
// Cycle through attributes, build tag attribute string.
foreach ( $attributes as $key => $value ) {
if ( ! $value ) {
continue;
}
// Remove any whitespace at the start or end of our classes.
if ( 'class' === $key ) {
$value = trim( $value );
}
if ( true === $value ) {
$output .= esc_html( $key ) . ' ';
} else {
$output .= sprintf( '%s="%s" ', esc_html( $key ), esc_attr( $value ) );
}
}
// Before this function existed we had the below to add attributes after the class attribute.
$after = apply_filters( 'generate_after_element_class_attribute', '', $context );
if ( $after ) {
$after = ' ' . $after;
}
$output .= $after;
$output = apply_filters( 'generate_get_attr_output', $output, $attributes, $context, $settings );
return trim( $output );
}
/**
* Output our string of HTML attributes.
*
* @since 3.1.0
*
* @param string $context The context, to build filter name.
* @param array $attributes Optional. Extra attributes to merge with defaults.
* @param array $settings Optional. Custom data to pass to filter.
*/
function generate_do_attr( $context, $attributes = array(), $settings = array() ) {
echo generate_get_attr( $context, $attributes, $settings ); // phpcs:ignore -- Escaping done in function.
}
/**
* Build our editor color palette based on our global colors.
*
* @since 3.1.0
*/
function generate_get_editor_color_palette() {
$global_colors = generate_get_option( 'global_colors' );
$editor_palette = array();
$static_colors = false;
if ( apply_filters( 'generate_color_palette_use_static_colors', false ) ) {
$static_colors = true;
}
if ( ! empty( $global_colors ) ) {
foreach ( (array) $global_colors as $key => $data ) {
$editor_palette[] = array(
'name' => $data['name'],
'slug' => $data['slug'],
'color' => $static_colors ? $data['color'] : 'var(--' . $data['slug'] . ')',
);
}
}
return $editor_palette;
}
/**
* Get our global colors.
*
* @since 3.1.0
*/
function generate_get_global_colors() {
$global_colors = generate_get_option( 'global_colors' );
$colors = array();
if ( ! empty( $global_colors ) ) {
foreach ( (array) $global_colors as $key => $data ) {
$colors[] = array(
'slug' => $data['slug'],
'color' => $data['color'],
);
}
}
return $colors;
}
/**
* Get our system default font.
*
* @since 3.1.0
*/
function generate_get_system_default_font() {
return apply_filters( 'generate_typography_system_stack', '-apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"' );
}
/**
* Check to see if we have a GP menu active.
* This is primarily used to know whether we need to enqueue menu.js or not.
*
* @since 3.1.0
*/
function generate_has_active_menu() {
$has_active_menu = true;
if ( ! generate_get_navigation_location() ) {
$has_active_menu = false;
}
return apply_filters( 'generate_has_active_menu', $has_active_menu );
}
/**
* Check to see if we're using dynamic typography.
*
* @since 3.1.0
*/
function generate_is_using_dynamic_typography() {
return generate_get_option( 'use_dynamic_typography' );
}

View File

@ -17,6 +17,10 @@ if ( ! function_exists( 'generate_enqueue_google_fonts' ) ) {
* @since 0.1
*/
function generate_enqueue_google_fonts() {
if ( generate_is_using_dynamic_typography() ) {
return;
}
$generate_settings = wp_parse_args(
get_option( 'generate_settings', array() ),
generate_get_default_fonts()
@ -107,6 +111,10 @@ if ( ! function_exists( 'generate_default_fonts_customize_register' ) ) {
* @param std_Class $wp_customize The Customize class.
*/
function generate_default_fonts_customize_register( $wp_customize ) {
if ( generate_is_using_dynamic_typography() ) {
return;
}
if ( function_exists( 'generate_fonts_customize_register' ) ) {
// Bail if GP Premium is active.
return;
@ -127,6 +135,13 @@ if ( ! function_exists( 'generate_default_fonts_customize_register' ) ) {
'title' => __( 'Typography', 'generatepress' ),
'capability' => 'edit_theme_options',
'priority' => 30,
'active_callback' => function() {
if ( generate_is_using_dynamic_typography() ) {
return false;
}
return true;
},
)
);
@ -792,6 +807,10 @@ if ( ! function_exists( 'generate_get_all_google_fonts_ajax' ) ) {
* @since 1.3.0
*/
function generate_get_all_google_fonts_ajax() {
if ( generate_is_using_dynamic_typography() ) {
wp_die();
}
if ( ! isset( $_POST['gp_customize_nonce'] ) || ! wp_verify_nonce( sanitize_key( $_POST['gp_customize_nonce'] ), 'gp_customize_nonce' ) ) {
wp_die();
}
@ -1059,6 +1078,10 @@ if ( ! function_exists( 'generate_typography_set_font_data' ) ) {
* @since 1.3.40
*/
function generate_typography_set_font_data() {
if ( generate_is_using_dynamic_typography() ) {
return;
}
// Get our defaults.
$defaults = generate_get_default_fonts();

View File

@ -17,8 +17,8 @@ if ( ! defined( 'ABSPATH' ) ) {
get_header(); ?>
<div id="primary" <?php generate_do_element_classes( 'content' ); ?>>
<main id="main" <?php generate_do_element_classes( 'main' ); ?>>
<div <?php generate_do_attr( 'content' ); ?>>
<main <?php generate_do_attr( 'main' ); ?>>
<?php
/**
* generate_before_main_content hook.
@ -30,6 +30,13 @@ get_header(); ?>
if ( generate_has_default_loop() ) {
if ( have_posts() ) :
/**
* generate_before_loop hook.
*
* @since 3.1.0
*/
do_action( 'generate_before_loop', 'index' );
while ( have_posts() ) :
the_post();

View File

@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
do_action( 'generate_before_content' );
?>
<header class="entry-header">
<header <?php generate_do_attr( 'entry-header' ); ?>>
<h1 class="entry-title"><?php _e( 'Nothing Found', 'generatepress' ); ?></h1>
</header>

View File

@ -16,8 +16,8 @@ if ( ! defined( 'ABSPATH' ) ) {
get_header(); ?>
<div id="primary" <?php generate_do_element_classes( 'content' ); ?>>
<main id="main" <?php generate_do_element_classes( 'main' ); ?>>
<div <?php generate_do_attr( 'content' ); ?>>
<main <?php generate_do_attr( 'main' ); ?>>
<?php
/**
* generate_before_main_content hook.

View File

@ -4,9 +4,9 @@ Donate link: https://generatepress.com/ongoing-development/
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Tags: two-columns, three-columns, one-column, right-sidebar, left-sidebar, footer-widgets, blog, e-commerce, flexible-header, full-width-template, buddypress, custom-header, custom-background, custom-menu, custom-colors, sticky-post, threaded-comments, translation-ready, rtl-language-support, featured-images, theme-options
Requires at least: 4.5
Requires at least: 5.2
Tested up to: 5.8
Stable tag: 3.0.4
Stable tag: 3.1.0
GeneratePress is a lightweight WordPress theme built with a focus on speed and usability.
@ -14,15 +14,15 @@ GeneratePress is a lightweight WordPress theme built with a focus on speed and u
GeneratePress is a lightweight WordPress theme built with a focus on speed and usability. Performance is important to us, which is why a fresh GeneratePress install adds less than 10kb (gzipped) to your page size.
We take full advantage of the new block editor (Gutenberg), which gives you more control over creating your content.
We take full advantage of the block editor (Gutenberg), which gives you more control over creating your content.
If you use page builders, GeneratePress is the right theme for you. It is completely compatible with all major page builders, including Beaver Builder and Elementor.
Thanks to our emphasis on WordPress coding standards, we can boast full compatibility with all well-coded plugins, including WooCommerce.
GeneratePress is fully responsive, uses valid HTML/CSS and is translated into over 25 languages by our amazing community of users.
GeneratePress is fully responsive, uses valid HTML/CSS, and is translated into over 25 languages by our amazing community of users.
A few of our many features include microdata integration, 9 widget areas, 5 navigation locations, 5 sidebar layouts, dropdown menus (click or hover) and navigation color presets.
A few of our many features include 60+ color controls, powerful dynamic typography, 5 navigation locations, 5 sidebar layouts, dropdown menus (click or hover), and 9 widget areas.
Learn more and check out our [powerful premium version](https://generatepress.com).
@ -93,8 +93,48 @@ MIT License: https://github.com/woocommerce/selectWoo/blob/master/LICENSE.md
By Brian Grinstead, http://briangrinstead.com
MIT License: https://github.com/bgrins/TinyColor/blob/master/LICENSE
= React Select =
By Jed Watson
MIT License: https://github.com/JedWatson/react-select/blob/master/LICENSE
== Changelog ==
= 3.1.0 =
Release date: October 26, 2021
* New: Global color system
* New: Add all theme color options to free theme
* New: Re-build color options in the Customizer
* New: Dynamic typography system
* New: Underline links option
* New: Only load menu.js when needed
* New: generate_has_active_menu filter
* New: generate_before_loop hook
* New: Dynamic HTML attribute system
* New: React-based Dashboard
* New: generate_search_title_output filter
* New: generate_after_comment_author_name hook
* New: generate_show_comment_entry_meta filter
* Tweak: Only allow vertical comment form resizing
* Tweak: Move a11y javascript inline to the footer
* Tweak: Add aria-label attributes to elements that need them
* Tweak: Remove theme structure option for people using flexbox
* Tweak: Remove search result title from template
* Tweak: Add search result title using generate_before_loop hook
* Tweak: Remove aria-required attribute from comment form
* Tweak: Add required attribute to comment author/email fields if required
* Tweak: Move viewport head meta below the title meta
* Tweak: Optimize SVG icon HTML
* Tweak: Move generate_svg_icon_element before the "replace" icon definition
* Tweak: Change sub-menu box-shadow direction when sub-menu opens left
* Tweak: Replace sub-menu box-shadow with border when opening down
* Tweak: Remove query loop block margin
* Tweak: Use get_the_archive_description() instead of term_description()
* Fix: Missing search form button icon when using font icons
* Fix: Load comments CSS if comments exists even if new comments are disabled
* Fix: Sub-menu overlap using dropdown click
= 3.0.4 =
Release date: July 12, 2021

View File

@ -11,8 +11,8 @@ if ( ! defined( 'ABSPATH' ) ) {
get_header(); ?>
<div id="primary" <?php generate_do_element_classes( 'content' ); ?>>
<main id="main" <?php generate_do_element_classes( 'main' ); ?>>
<div <?php generate_do_attr( 'content' ); ?>>
<main <?php generate_do_attr( 'main' ); ?>>
<?php
/**
* generate_before_main_content hook.
@ -23,21 +23,13 @@ get_header(); ?>
if ( generate_has_default_loop() ) {
if ( have_posts() ) :
?>
/**
* generate_before_loop hook.
*
* @since 3.1.0
*/
do_action( 'generate_before_loop', 'search' );
<header class="page-header">
<h1 class="page-title">
<?php
printf(
/* translators: 1: Search query name */
__( 'Search Results for: %s', 'generatepress' ),
'<span>' . get_search_query() . '</span>'
);
?>
</h1>
</header>
<?php
while ( have_posts() ) :
the_post();

View File

@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<div id="left-sidebar" <?php generate_do_element_classes( 'left_sidebar' ); ?>>
<div <?php generate_do_attr( 'left-sidebar' ); ?>>
<div class="inside-left-sidebar">
<?php
/**

View File

@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<div id="right-sidebar" <?php generate_do_element_classes( 'right_sidebar' ); ?>>
<div <?php generate_do_attr( 'right-sidebar' ); ?>>
<div class="inside-right-sidebar">
<?php
/**

View File

@ -11,8 +11,8 @@ if ( ! defined( 'ABSPATH' ) ) {
get_header(); ?>
<div id="primary" <?php generate_do_element_classes( 'content' ); ?>>
<main id="main" <?php generate_do_element_classes( 'main' ); ?>>
<div <?php generate_do_attr( 'content' ); ?>>
<main <?php generate_do_attr( 'main' ); ?>>
<?php
/**
* generate_before_main_content hook.

View File

@ -3,11 +3,11 @@ Theme Name: GeneratePress
Theme URI: https://generatepress.com
Author: Tom Usborne
Author URI: https://tomusborne.com
Description: GeneratePress is a lightweight WordPress theme built with a focus on speed and usability. Performance is important to us, which is why a fresh GeneratePress install adds less than 10kb (gzipped) to your page size. We take full advantage of the new block editor (Gutenberg), which gives you more control over creating your content. If you use page builders, GeneratePress is the right theme for you. It is completely compatible with all major page builders, including Beaver Builder and Elementor. Thanks to our emphasis on WordPress coding standards, we can boast full compatibility with all well-coded plugins, including WooCommerce. GeneratePress is fully responsive, uses valid HTML/CSS and is translated into over 25 languages by our amazing community of users. A few of our many features include microdata integration, 9 widget areas, 5 navigation locations, 5 sidebar layouts, dropdown menus (click or hover) and navigation color presets. Learn more and check out our powerful premium version at https://generatepress.com
Version: 3.0.4
Requires at least: 4.5.0
Description: GeneratePress is a lightweight WordPress theme built with a focus on speed and usability. Performance is important to us, which is why a fresh GeneratePress install adds less than 10kb (gzipped) to your page size. We take full advantage of the block editor (Gutenberg), which gives you more control over creating your content. If you use page builders, GeneratePress is the right theme for you. It is completely compatible with all major page builders, including Beaver Builder and Elementor. Thanks to our emphasis on WordPress coding standards, we can boast full compatibility with all well-coded plugins, including WooCommerce. GeneratePress is fully responsive, uses valid HTML/CSS, and is translated into over 25 languages by our amazing community of users. A few of our many features include 60+ color controls, powerful dynamic typography, 5 navigation locations, 5 sidebar layouts, dropdown menus (click or hover), and 9 widget areas. Learn more and check out our powerful premium version at https://generatepress.com
Version: 3.1.0
Requires at least: 5.2
Tested up to: 5.8
Requires PHP: 5.4.0
Requires PHP: 5.6
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: generatepress