Merge pull request #118 from brainstormforce/wp-pipeline-fix-change

Added some changes to fix wordpress.org github pipeline.
brainstormforce · Apr 2, 2024 · 9f4b27e · 9f4b27e
2 parents 28132ad + 323b003
commit 9f4b27e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 **Tags:** typography, fonts, custom fonts, Google Fonts, performance, privacy, full site editing, adobe fonts, GDPR  
 **Requires at least:** 5.0  
 **Tested up to:** 6.5  
-**Stable tag:** 2.1.3  
+**Stable tag:** 2.1.4  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -151,6 +151,9 @@ Yes, Custom Fonts is completely free to use, without any limitation.
 
 
 ## Changelog ##
+### 2.1.4 ###
+- Improvement: Compatibility with WordPress 6.5.
+
 ### 2.1.3 ###
 - Fix: Resolved issue with local fonts not rendering properly on the frontend.
 

diff --git a/admin/dashboard/assets/src/common/svg-icons.js b/admin/dashboard/assets/src/common/svg-icons.js
@@ -263,8 +263,15 @@ const Custom_Fonts_Icons = {
         el('path', {
             d: 'M8.00078 1.30005C4.00078 1.30005 0.800781 4.50005 0.800781 8.50005C0.800781 12.5 4.00078 15.7 8.00078 15.7C12.0008 15.7 15.2008 12.5 15.2008 8.50005C15.2008 4.50005 12.0008 1.30005 8.00078 1.30005ZM8.00078 14.1C4.88078 14.1 2.40078 11.62 2.40078 8.50005C2.40078 5.38005 4.88078 2.90005 8.00078 2.90005C11.1208 2.90005 13.6008 5.38005 13.6008 8.50005C13.6008 11.62 11.1208 14.1 8.00078 14.1ZM4.80078 7.70005V9.30005H11.2008V7.70005H4.80078Z',
         })
-    )
-
+    ),
+    'preload_setting': el(
+        'svg',
+        { width: 21, height: 20, viewBox: '0 0 21 20', fill: 'none', xmlns: "http://www.w3.org/2000/svg" },
+        el('path', {
+            d: 'M18.5039 12H16.3239C16.1539 12.7 15.8839 13.35 15.5139 13.93L17.0539 15.47L14.9539 17.57L13.4139 16.03C12.8339 16.39 12.1839 16.66 11.5039 16.82V19H8.50391V16.82C7.82391 16.66 7.17391 16.39 6.59391 16.03L5.05391 17.57L2.93391 15.45L4.47391 13.91C4.11391 13.33 3.84391 12.68 3.68391 12H1.50391V9.03003H3.67391C3.83391 8.33003 4.11391 7.68003 4.47391 7.09003L2.93391 5.55003L5.03391 3.45003L6.57391 4.99003C7.15391 4.62003 7.81391 4.35003 8.50391 4.18003V2.00003H11.5039V4.18003C12.1839 4.34003 12.8339 4.61003 13.4139 4.97003L14.9539 3.43003L17.0739 5.55003L15.5339 7.09003C15.8939 7.68003 16.1739 8.33003 16.3339 9.03003H18.5039V12ZM10.0039 13.5C11.6639 13.5 13.0039 12.16 13.0039 10.5C13.0039 8.84003 11.6639 7.50003 10.0039 7.50003C8.34391 7.50003 7.00391 8.84003 7.00391 10.5C7.00391 12.16 8.34391 13.5 10.0039 13.5Z',
+            fill: '#3C434A',
+        }),
+    ),
 };
 
 export default Custom_Fonts_Icons;
diff --git a/admin/dashboard/assets/src/dashboard-app/pages/welcome/Welcome.js b/admin/dashboard/assets/src/dashboard-app/pages/welcome/Welcome.js
@@ -3,6 +3,7 @@ import CustomFontList from "./CustomFontList";
 import { Link } from "react-router-dom";
 import { __, _x } from "@wordpress/i18n";
 import Settings from "./Settings";
+import Custom_Fonts_Icons from "@Common/svg-icons";
 
 const Welcome = () => {
 	const [showNewDiv, setShowNewDiv] = useState(false);
@@ -33,7 +34,7 @@ const Welcome = () => {
 		if (buttonElement) {
 			const buttonRect = buttonElement.getBoundingClientRect();
 			return {
-				top: (parseInt( buttonRect.bottom ) - 30) + "px",
+				top: parseInt(buttonRect.bottom) - 30 + "px",
 				left: buttonRect.left,
 			};
 		}
@@ -50,7 +51,11 @@ const Welcome = () => {
 						<div className="flex iphone:flex-col lg:flex-row md:flex-row justify-between items-center">
 							<div>
 								<h2 className="text-base font-medium tablet:mb-3">
-									{ _x( "Custom Fonts", "Page title", "custom-fonts" ) }
+									{_x(
+										"Custom Fonts",
+										"Page title",
+										"custom-fonts"
+									)}
 								</h2>
 							</div>
 							<div className="flex">
@@ -59,18 +64,7 @@ const Welcome = () => {
 									className="mr-4 cursor-pointer py-0 px-0 focus:shadow-none focus:outline-none"
 									onClick={handleToggleNewDiv}
 								>
-									<svg
-										width="21"
-										height="20"
-										viewBox="0 0 21 20"
-										fill="none"
-										xmlns="http://www.w3.org/2000/svg"
-									>
-										<path
-											d="M18.5039 12H16.3239C16.1539 12.7 15.8839 13.35 15.5139 13.93L17.0539 15.47L14.9539 17.57L13.4139 16.03C12.8339 16.39 12.1839 16.66 11.5039 16.82V19H8.50391V16.82C7.82391 16.66 7.17391 16.39 6.59391 16.03L5.05391 17.57L2.93391 15.45L4.47391 13.91C4.11391 13.33 3.84391 12.68 3.68391 12H1.50391V9.03003H3.67391C3.83391 8.33003 4.11391 7.68003 4.47391 7.09003L2.93391 5.55003L5.03391 3.45003L6.57391 4.99003C7.15391 4.62003 7.81391 4.35003 8.50391 4.18003V2.00003H11.5039V4.18003C12.1839 4.34003 12.8339 4.61003 13.4139 4.97003L14.9539 3.43003L17.0739 5.55003L15.5339 7.09003C15.8939 7.68003 16.1739 8.33003 16.3339 9.03003H18.5039V12ZM10.0039 13.5C11.6639 13.5 13.0039 12.16 13.0039 10.5C13.0039 8.84003 11.6639 7.50003 10.0039 7.50003C8.34391 7.50003 7.00391 8.84003 7.00391 10.5C7.00391 12.16 8.34391 13.5 10.0039 13.5Z"
-											fill="#3C434A"
-										/>
-									</svg>
+									{Custom_Fonts_Icons["preload_setting"]}
 								</button>
 								<Link
 									to={{
@@ -92,9 +86,12 @@ const Welcome = () => {
 					<div
 						ref={popupRef}
 						className="absolute right-36 bg-white p-5 rounded border-solid border-[#ddd] border divide-y divide-gray-400 flex-col items-start gap-5 settings-popup"
-						style={{ top: popupPosition.top, right: popupPosition.right }}
+						style={{
+							top: popupPosition.top,
+							right: popupPosition.right,
+						}}
 					>
-						<Settings/>
+						<Settings />
 					</div>
 				)}
 
@@ -109,7 +106,7 @@ const Welcome = () => {
 						}}
 						className="components-button is-primary"
 					>
-						{ __("Add New Font", "custom-fonts") }
+						{__("Add New Font", "custom-fonts")}
 					</Link>
 				</div>
 			</div>

diff --git a/classes/class-bsf-custom-fonts-render.php b/classes/class-bsf-custom-fonts-render.php
@@ -228,7 +228,7 @@ public function add_elementor_fonts( $fonts ) {
 		}
 
 		/**
-		 * Add Custom Font list to BB theme and BB Page Builder
+		 * Incorporate a feature allowing users to integrate custom fonts into both the BB theme and BB Page Builder.
 		 *
 		 * @since  1.0.4
 		 * @param array $bb_fonts font families added by bb.

diff --git a/custom-fonts.php b/custom-fonts.php
@@ -6,7 +6,7 @@
  * Author:          Brainstorm Force
  * Author URI:      http://www.brainstormforce.com
  * Text Domain:     custom-fonts
- * Version:         2.1.3
+ * Version:         2.1.4
  *
  * @package         Bsf_Custom_Fonts
  */
@@ -25,7 +25,7 @@
 define( 'BSF_CUSTOM_FONTS_BASE', plugin_basename( BSF_CUSTOM_FONTS_FILE ) );
 define( 'BSF_CUSTOM_FONTS_DIR', plugin_dir_path( BSF_CUSTOM_FONTS_FILE ) );
 define( 'BSF_CUSTOM_FONTS_URI', plugins_url( '/', BSF_CUSTOM_FONTS_FILE ) );
-define( 'BSF_CUSTOM_FONTS_VER', '2.1.3' );
+define( 'BSF_CUSTOM_FONTS_VER', '2.1.4' );
 define( 'BSF_CUSTOM_FONTS_POST_TYPE', 'bsf_custom_fonts' );
 define( 'BSF_CUSTOM_FONTS_ADMIN_PAGE', 'bsf-custom-fonts' );
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "custom-fonts",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "main": "Gruntfile.js",
   "author": "Brainstorm Force",
   "workspaces": [

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.me/BrainstormForce
 Tags: typography, fonts, custom fonts, Google Fonts, performance, privacy, full site editing, adobe fonts, GDPR
 Requires at least: 5.0
 Tested up to: 6.5
-Stable tag: 2.1.3
+Stable tag: 2.1.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -151,6 +151,9 @@ Yes, Custom Fonts is completely free to use, without any limitation.
 
 
 == Changelog ==
+= 2.1.4 =
+- Improvement: Compatibility with WordPress 6.5.
+
 = 2.1.3 =
 - Fix: Resolved issue with local fonts not rendering properly on the frontend.