From 3fc2e87a14ecca688984346bb9d18580a71e23ab Mon Sep 17 00:00:00 2001 From: Kiran Prajapati Date: Thu, 5 Sep 2024 20:23:26 +0530 Subject: [PATCH] Merge AUI v0.2.25 --- .../wp-ayecode-ui/ayecode-ui-loader.php | 2 +- vendor/ayecode/wp-ayecode-ui/change-log.txt | 3 ++ .../ayecode/wp-ayecode-ui/example-plugin.php | 2 +- .../includes/ayecode-ui-settings.php | 10 +++++-- vendor/composer/installed.json | 28 +++++++++---------- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php b/vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php index 42eb79f1..2ac67605 100644 --- a/vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php +++ b/vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php @@ -15,7 +15,7 @@ */ add_action('after_setup_theme', function () { global $ayecode_ui_version,$ayecode_ui_file_key; - $this_version = "0.2.18"; + $this_version = "0.2.25"; if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){ $ayecode_ui_version = $this_version ; $ayecode_ui_file_key = wp_hash( __FILE__ ); diff --git a/vendor/ayecode/wp-ayecode-ui/change-log.txt b/vendor/ayecode/wp-ayecode-ui/change-log.txt index 36d39128..58f197f7 100644 --- a/vendor/ayecode/wp-ayecode-ui/change-log.txt +++ b/vendor/ayecode/wp-ayecode-ui/change-log.txt @@ -1,3 +1,6 @@ += 0.2.25 - 2024-09-05 = +* Don't apply custom colors to wp-admin - CHANGED + = 0.2.24 - 2024-08-29 = * Changes for search form conditional fields - CHANGED diff --git a/vendor/ayecode/wp-ayecode-ui/example-plugin.php b/vendor/ayecode/wp-ayecode-ui/example-plugin.php index 996396ae..28da7559 100644 --- a/vendor/ayecode/wp-ayecode-ui/example-plugin.php +++ b/vendor/ayecode/wp-ayecode-ui/example-plugin.php @@ -3,7 +3,7 @@ Plugin Name: AyeCode UI Plugin URI: https://ayecode.io/ Description: This is an example plugin to test AyeCode UI Quickly. -Version: 0.2.24 +Version: 0.2.25 Author: AyeCode Ltd Author URI: https://userswp.io License: GPL-2.0+ diff --git a/vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php b/vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php index de9d2e05..b41c88f8 100644 --- a/vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php +++ b/vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php @@ -35,7 +35,7 @@ class AyeCode_UI_Settings { * * @var string */ - public $version = '0.2.24'; + public $version = '0.2.25'; /** * Class textdomain. @@ -1138,8 +1138,12 @@ public static function custom_css($compatibility = true) { $is_fse = true; } - if(!empty($colors)){ + $custom_admin = $is_fse ? true : apply_filters('ayecode_ui_custom_admin', false ); + + + if(!empty($colors) && $custom_admin ){ $d_colors = self::get_colors(true); + //print_r($d_colors);exit; // $is_fse = !empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template'; foreach($colors as $key => $color ){ @@ -1159,7 +1163,7 @@ public static function custom_css($compatibility = true) { echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}'; } - if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) ){ + if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $custom_admin ){ $css = ''; $theme_settings = wp_get_global_styles(); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index bff0ef43..44a42efd 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -59,20 +59,20 @@ }, { "name": "ayecode/wp-ayecode-ui", - "version": "0.2.22", - "version_normalized": "0.2.22.0", + "version": "0.2.25", + "version_normalized": "0.2.25.0", "source": { "type": "git", "url": "https://github.com/AyeCode/wp-ayecode-ui.git", - "reference": "42f271602a3ce6b1425dbb7481fcf7ac561250a3" + "reference": "1fc1d0e5826988954a297ffc30a5d37486822509" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AyeCode/wp-ayecode-ui/zipball/42f271602a3ce6b1425dbb7481fcf7ac561250a3", - "reference": "42f271602a3ce6b1425dbb7481fcf7ac561250a3", + "url": "https://api.github.com/repos/AyeCode/wp-ayecode-ui/zipball/1fc1d0e5826988954a297ffc30a5d37486822509", + "reference": "1fc1d0e5826988954a297ffc30a5d37486822509", "shasum": "" }, - "time": "2024-08-01T14:41:58+00:00", + "time": "2024-09-05T14:29:37+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -101,7 +101,7 @@ ], "support": { "issues": "https://github.com/AyeCode/wp-ayecode-ui/issues", - "source": "https://github.com/AyeCode/wp-ayecode-ui/tree/0.2.22" + "source": "https://github.com/AyeCode/wp-ayecode-ui/tree/0.2.25" }, "install-path": "../ayecode/wp-ayecode-ui" }, @@ -206,24 +206,24 @@ }, { "name": "ayecode/wp-super-duper", - "version": "1.2.6", - "version_normalized": "1.2.6.0", + "version": "1.2.7", + "version_normalized": "1.2.7.0", "source": { "type": "git", "url": "https://github.com/AyeCode/wp-super-duper.git", - "reference": "2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc" + "reference": "077bbe648ab7b3a9cc77068d2e0c326dfe1a6849" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc", - "reference": "2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc", + "url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/077bbe648ab7b3a9cc77068d2e0c326dfe1a6849", + "reference": "077bbe648ab7b3a9cc77068d2e0c326dfe1a6849", "shasum": "" }, "require": { "composer/installers": "~1.0", "php": ">=5.4.0" }, - "time": "2024-07-18T15:16:04+00:00", + "time": "2024-08-29T16:44:21+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -255,7 +255,7 @@ ], "support": { "issues": "https://github.com/AyeCode/wp-super-duper/issues", - "source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.6" + "source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.7" }, "install-path": "../ayecode/wp-super-duper" },