Skip to content

Commit 745a408

Browse files
authored
Sync branch [skip ci]
2 parents 4c39c71 + 5cb8f48 commit 745a408

File tree

9 files changed

+49
-25
lines changed

9 files changed

+49
-25
lines changed

.github/workflows/deploy.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020
with:
2121
node-version: 16.x
2222
cache: "yarn"
23+
24+
- name: Get the version
25+
id: get_version
26+
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
2327
- name: Build & create dist/artifact
2428
run: |
2529
yarn install --frozen-lockfile
@@ -58,15 +62,12 @@ jobs:
5862
DEST_DIR: ${{ secrets.AWS_PRODUCTS_FOLDER }}/$BUILD_NAME/$BUILD_VERSION
5963
- name: Send update to the store
6064
env:
61-
THEMEISLE_ID: ${{ secrets.THEMEISLE_ID }}
62-
THEMEISLE_AUTH: ${{ secrets.THEMEISLE_AUTH }}
63-
STORE_URL: ${{ secrets.STORE_URL }}
64-
run: |
65-
if [ ! -z "$THEMEISLE_ID" ]; then
66-
STORE_JSON='{"version": "'$BUILD_VERSION'","id": "'$THEMEISLE_ID'","body": ""}';
67-
echo "$STORE_JSON";
68-
curl -X POST -H 'Cache-Control: no-cache' -H "Content-Type: application/json" -H "x-themeisle-auth: $THEMEISLE_AUTH" --data "$STORE_JSON" "$STORE_URL/wp-json/edd-so/v1/update_changelog/" > /dev/null
69-
fi
65+
PRODUCT_ID: ${{ secrets.THEMEISLE_ID }}
66+
AUTH_TOKEN: ${{ secrets.THEMEISLE_AUTH }}
67+
STORE_URL: ${{ secrets.THEMEISLE_STORE_URL }}
68+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
69+
BUILD_VERSION: ${{ steps.get_version.outputs.VERSION }}
70+
uses: Codeinwp/action-store-release@main
7071
- name: WordPress Theme Deploy
7172
uses: Codeinwp/action-wordpress-theme-deploy@primary
7273
env:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
##### [Version 4.1.4](https://github.com/Codeinwp/neve/compare/v4.1.3...v4.1.4) (2025-09-10)
2+
3+
- Fixed border color not working properly for Secondary Buttons
4+
- Fixed the issue related to changing the license key after White Module was enabled [PRO]
5+
- Updated dependencies
6+
17
##### [Version 4.1.3](https://github.com/Codeinwp/neve/compare/v4.1.2...v4.1.3) (2025-07-25)
28

39
- Fixed broken notice layout on checkout page

assets/apps/dashboard/src/Components/Content/Sidebar/LicenseCard.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ const LicenseCard = () => {
2828
const { valid, expiration } = license;
2929
const { whiteLabel, strings } = neveDash;
3030
const { licenseCardHeading, licenseCardDescription } = strings;
31+
const isValid = 'valid' === valid;
3132

3233
const toggleLicense = () => {
33-
const toDo = 'valid' === valid ? 'deactivate' : 'activate';
34+
const toDo = isValid ? 'deactivate' : 'activate';
3435
setStatus('activate' === toDo ? 'activating' : 'deactivating');
3536
send(proApi + '/toggle_license', { key, action: toDo }).then(
3637
(response) => {
@@ -48,7 +49,7 @@ const LicenseCard = () => {
4849
);
4950
};
5051

51-
if (whiteLabel && whiteLabel.hideLicense) {
52+
if (whiteLabel && whiteLabel.hideLicense && isValid) {
5253
return null;
5354
}
5455

@@ -63,9 +64,7 @@ const LicenseCard = () => {
6364
};
6465

6566
if (!status) {
66-
return isOrWasValid
67-
? __('Deactivate', 'neve')
68-
: __('Activate', 'neve');
67+
return isValid ? __('Deactivate', 'neve') : __('Activate', 'neve');
6968
}
7069

7170
return statusLabelMap[status];
@@ -94,22 +93,22 @@ const LicenseCard = () => {
9493
id="license-field"
9594
name="license-field"
9695
className="flex-grow rounded !border-gray-300 text-sm !py-1 !px-2"
97-
disabled={isOrWasValid}
96+
disabled={isValid}
9897
onChange={(e) => {
9998
const keyToSet = e.target.value.replace(/\s+/g, '');
10099
setKey(keyToSet);
101100
}}
102101
value={
103-
isOrWasValid
102+
isValid
104103
? '******************************' +
105104
key.slice(-5)
106105
: key
107106
}
108107
placeholder={__('Enter License Key', 'neve')}
109108
/>
110109
<Button
111-
isPrimary={'valid' !== valid}
112-
isSecondary={'valid' === valid}
110+
isPrimary={!isValid}
111+
isSecondary={isValid}
113112
disabled={!!status || !key}
114113
isSubmit
115114
>
@@ -126,10 +125,10 @@ const LicenseCard = () => {
126125
{isOrWasValid && (
127126
<div className="flex items-center gap-1">
128127
<Pill
129-
type={valid === 'valid' ? 'success' : 'warning'}
128+
type={isValid ? 'success' : 'warning'}
130129
className="inline-flex items-center gap-1 px-2 py-1"
131130
>
132-
{valid === 'valid' ? (
131+
{isValid ? (
133132
<>
134133
<LucideCircleCheck size={14} />
135134
<span>{__('Valid', 'neve')}</span>
@@ -145,7 +144,7 @@ const LicenseCard = () => {
145144
<>
146145
<span className="space-x-1 ml-auto">
147146
<span className="text-xs">
148-
{'valid' === valid
147+
{isValid
149148
? __('Expires', 'neve')
150149
: __('Expired', 'neve')}
151150
</span>

functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @package Neve
99
*/
1010

11-
define( 'NEVE_VERSION', '4.1.3' );
11+
define( 'NEVE_VERSION', '4.1.4' );
1212
define( 'NEVE_INC_DIR', trailingslashit( get_template_directory() ) . 'inc/' );
1313
define( 'NEVE_ASSETS_URL', trailingslashit( get_template_directory_uri() ) . 'assets/' );
1414
define( 'NEVE_MAIN_DIR', get_template_directory() . '/' );

inc/core/styles/frontend.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ private function setup_form_fields_style() {
688688
];
689689
$this->_subscribers[ Config::CSS_SELECTOR_FORM_BUTTON ]['border-color'] = [
690690
'key' => 'neve_form_button_type',
691-
'override' => 'var(--secondarybtnhovercolor)',
691+
'override' => 'var(--secondarybtncolor)',
692692
];
693693
$this->_subscribers[ Config::CSS_SELECTOR_FORM_BUTTON_HOVER ]['border-color'] = [
694694
'key' => 'neve_form_button_type',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "neve",
33
"nicename": "Neve",
4-
"version": "4.1.3",
4+
"version": "4.1.4",
55
"description": "Neve theme by ThemeIsle",
66
"category": "themes",
77
"author": "ThemeIsle <[email protected]>",

readme.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ Neve is distributed under the terms of the GNU GPLv2 or later
1919

2020
## Changelog ##
2121

22+
##### [Version 4.1.4](https://github.com/Codeinwp/neve/compare/v4.1.3...v4.1.4) (2025-09-10)
23+
24+
- Fixed border color not working properly for Secondary Buttons
25+
- Fixed the issue related to changing the license key after White Module was enabled [PRO]
26+
- Updated dependencies
27+
28+
29+
30+
2231
##### [Version 4.1.3](https://github.com/Codeinwp/neve/compare/v4.1.2...v4.1.3) (2025-07-25)
2332

2433
- Fixed broken notice layout on checkout page

readme.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ Neve is distributed under the terms of the GNU GPLv2 or later
1919

2020
== Changelog ==
2121

22+
##### [Version 4.1.4](https://github.com/Codeinwp/neve/compare/v4.1.3...v4.1.4) (2025-09-10)
23+
24+
- Fixed border color not working properly for Secondary Buttons
25+
- Fixed the issue related to changing the license key after White Module was enabled [PRO]
26+
- Updated dependencies
27+
28+
29+
30+
2231
##### [Version 4.1.3](https://github.com/Codeinwp/neve/compare/v4.1.2...v4.1.3) (2025-07-25)
2332

2433
- Fixed broken notice layout on checkout page

style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Tested up to: 6.2
77
Requires PHP: 7.0
88
Requires at least: 5.5
99
Description: Neve is a next-generation, ultra-fast WordPress theme designed for top performance, SEO, and Core Web Vitals. Its lightweight codebase and small size ensure minimal overhead and lightning-fast load times. Fully compatible with the block editor, popular page builders (Elementor, Bricks, Oxygen etc), and WooCommerce, it’s perfect for blogs, small businesses, agencies, portfolios, and online stores. With responsive design, multilingual translations, and easy customization options, Neve empowers you to create a future-proof, high-ranking online presence. Discover everything Neve has to offer and explore our powerful premium version at https://themeisle.com/themes/neve/.
10-
Version: 4.1.3
10+
Version: 4.1.4
1111
License: GNU General Public License v2 or later
1212
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1313
Text Domain: neve

0 commit comments

Comments
 (0)