From 05f688893a4ce48e9828384fe6f8667b7cb7a276 Mon Sep 17 00:00:00 2001 From: jamesros Date: Fri, 15 Mar 2024 14:49:57 -0400 Subject: [PATCH] fix weird font stuff by updating kirki (#123) --- README.md | 3 +++ package.json | 2 +- readme.txt | 5 ++++- .../js/customizer/controls/bgtfw-background-control.js | 1 + src/assets/js/customizer/typography/preview.js | 3 ++- src/boldgrid-theme-framework.php | 2 +- style.css | 2 +- yarn.lock | 2 +- 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7f3df0b7..3b478240 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,9 @@ Crio is a WordPress SuperTheme that allows front-end designers, developers and o ## Changelog ## +### 2.22.2 ### +* Bug Fix: Updated kirki user-agent when making Google Fonts Requests [2524](https://github.com/themeum/kirki/issues/2524) + ### 2.22.1 ### * Bug Fix: Do not allow only a number for the font size [#112](https://github.com/BoldGrid/crio/issues/112) * Bug Fix: Comments - currentcolor overrides Customizer settings [#57](https://github.com/BoldGrid/crio/issues/57) diff --git a/package.json b/package.json index 523e53d8..6770a7fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "boldgrid-theme-framework", - "version": "2.22.1", + "version": "2.22.2", "description": "BoldGrid Theme Framework", "main": "index.js", "engines": { diff --git a/readme.txt b/readme.txt index a5d18812..7d1dfa59 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: news, blog, e-commerce, sticky-post, theme-options, threaded-comments, ful Requires PHP: 5.6 Requires at least: 4.8 Tested up to: 6.5 -Stable tag: 2.22.1 +Stable tag: 2.22.2 License: GPL-3.0-or-later License URI: https://www.gnu.org/licenses/gpl-3.0-standalone.html @@ -22,6 +22,9 @@ This version changes the way the color palette CSS is generated. If you are usin ## Changelog ## +== 2.22.2 == +* Bug Fix: Updated kirki user-agent when making Google Fonts Requests [2524](https://github.com/themeum/kirki/issues/2524) + == 2.22.1 == * Bug Fix: Do not allow only a number for the font size [#112](https://github.com/BoldGrid/crio/issues/112) * Bug Fix: Comments - currentcolor overrides Customizer settings [#57](https://github.com/BoldGrid/crio/issues/57) diff --git a/src/assets/js/customizer/controls/bgtfw-background-control.js b/src/assets/js/customizer/controls/bgtfw-background-control.js index 57cf1a4e..77d58f29 100644 --- a/src/assets/js/customizer/controls/bgtfw-background-control.js +++ b/src/assets/js/customizer/controls/bgtfw-background-control.js @@ -129,6 +129,7 @@ export default function() { }; var setActivePattern = function() { + /* * If a pattern is not set, but the control is active, then * it will be an empty string, which will match ALL patterns. diff --git a/src/assets/js/customizer/typography/preview.js b/src/assets/js/customizer/typography/preview.js index d282978f..ddbae341 100644 --- a/src/assets/js/customizer/typography/preview.js +++ b/src/assets/js/customizer/typography/preview.js @@ -40,7 +40,7 @@ export class Preview { sizeUnit = size.replace( sizeBase, '' ), sizeMatches = sizeUnit.match( /(em|ex|%|px|cm|mm|in|pt|pc|rem)/ ); - if ( sizeUnit === '' ) { + if ( '' === sizeUnit ) { sizeUnit = 'px'; } @@ -108,6 +108,7 @@ export class Preview { // Selector lists are pulled from the customizer options matched to controlType. } else if ( controlType === selector.type ) { css += rule + '{font-size:' + sanitizeFontSize( to['font-size'] ) + ';'; + // Adds css for font variants. if ( fontWeight && fontStyle ) { css += 'font-style:' + fontStyle + ';'; diff --git a/src/boldgrid-theme-framework.php b/src/boldgrid-theme-framework.php index 164b9a82..54479fde 100644 --- a/src/boldgrid-theme-framework.php +++ b/src/boldgrid-theme-framework.php @@ -3,7 +3,7 @@ * Plugin Name: BoldGrid Theme Framework * Plugin URI: https://www.boldgrid.com/docs/configuration-file * Description: BoldGrid Theme Framework is a library that allows you to easily make BoldGrid themes. Please see our reference guide for more information: https://www.boldgrid.com/docs/configuration-file - * Version: 2.22.1 + * Version: 2.22.2 * Author: BoldGrid.com * Author URI: https://www.boldgrid.com/ * Text Domain: bgtfw diff --git a/style.css b/style.css index 71128e11..3f7ed7f7 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,7 @@ Author: BoldGrid Theme URI: https://www.boldgrid.com/themes/crio/ Author URI: https://www.boldgrid.com/ Description: Crio is a WordPress SuperTheme that allows front-end designers, developers and other web professionals to create without bounds or restrictions. Crio's advanced customization options are completely integrated with the WordPress Customizer API, providing you with a powerful, but familiar interface to customize your website. Our integration gives you granular control over many elements straight from the Customizer, and even device previews so you can see how your site looks on different devices. Crio’s unique color palette system keeps colors consistent across your site. Drag and drop colors in your palette to increase or decrease the usage of that color throughout your website. Use the advanced controls to create a custom Header, Footer, or Blog Page layout. Be Bold and stand above the rest with Prime by BoldGrid! -Version: 2.22.1 +Version: 2.22.2 Requires at least: 5.5 Tested up to: 6.4 Requires PHP: 5.6 diff --git a/yarn.lock b/yarn.lock index dc4f4c3c..57aa28e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8202,7 +8202,7 @@ kind-of@^6.0.0, kind-of@^6.0.2: "kirki-toolkit@https://github.com/boldgrid/kirki.git#crio-kirki": version "3.0.43" - resolved "https://github.com/boldgrid/kirki.git#a75b01f0d3157ca84d2f7636a8765578d4f27521" + resolved "https://github.com/boldgrid/kirki.git#23c74869298925cca6fa1e0a9ac6fb6786abbac3" lazy-req@^1.0.0: version "1.1.0"