Skip to content

Commit 773142d

Browse files
release: fixes
- Fixed styling options of the Menu Icon - Updated dependencies
2 parents b85f501 + b67ac27 commit 773142d

File tree

14 files changed

+139
-416
lines changed

14 files changed

+139
-416
lines changed

.github/workflows/deploy-npm-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
node-version: [16.x]
1616
steps:
1717
- name: Checkout 🛎️
18-
uses: actions/checkout@4
18+
uses: actions/checkout@v4
1919
with:
2020
persist-credentials: false
2121
- name: Setup node ${{ matrix.node-version }} 🔧

assets/apps/components/src/Controls/ColorControl.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ const ColorControl = ({
5252
};
5353

5454
const isGlobal = selectedColor && selectedColor.indexOf('var') > -1;
55+
const defaultGradient = 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)';
5556

5657
const handleClear = () => {
5758
onChange(defaultValue || '');
59+
setGradient(defaultValue || defaultGradient);
5860
toggle();
5961
};
6062

@@ -157,14 +159,14 @@ const ColorControl = ({
157159
<div
158160
className="current-color-gradient"
159161
style={{
160-
background: selectedColor,
162+
background: selectedColor || defaultGradient,
161163
height: '177px',
162164
border: '1px solid #eee',
163165
minWidth: '215px',
164166
}}
165167
/>
166168
<GradientPicker
167-
value={gradient}
169+
value={gradient || defaultGradient}
168170
gradients={[]}
169171
onChange={(currentGradient) => {
170172
setGradient(currentGradient);

assets/apps/components/src/Style/_responsive.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,15 @@ $devicemap : 'tablet', 'mobile', 'desktop';
4040
}
4141
}
4242
}
43+
44+
#tsdk_banner:has(.themeisle-sale) {
45+
margin: 0 auto;
46+
padding: 0 1.5rem;
47+
width: 100%;
48+
max-width: 1535px;
49+
50+
.notice.themeisle-sale {
51+
margin: 0;
52+
}
53+
}
54+

assets/apps/customizer-controls/src/@types/utils.d.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,10 @@ declare global {
160160
nonce: string;
161161
hideConditionalHeaderSelector: boolean;
162162
dashUpdatesMessage: string;
163-
deal?: {
164-
active?: boolean;
165-
dealSlug?: string;
166-
urgencyText?: string;
167-
remaningTime?: string;
168-
bannerUrl?: string;
169-
customizerBannerUrl?: string;
170-
bannerStoreUrl?: string;
171-
linkGlobal?: string;
172-
customizerBannerStoreUrl?: string;
173-
customizerBannerAlt?: string;
174-
bannerAlt?: string;
163+
blackFriday?: {
164+
saleUrl: string;
165+
bannerSrc: string;
166+
message: string;
175167
};
176168
};
177169
NeveProReactCustomize: undefined | StringObjectKeys;

assets/apps/customizer-controls/src/builder-upsell/Upsells.tsx

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,21 @@ const Upsells: React.FC<Props> = ({ control }) => {
1212
const { title, url, cta } = params;
1313

1414
if (
15-
window?.NeveReactCustomize?.deal?.active &&
16-
window?.NeveReactCustomize?.deal?.customizerBannerStoreUrl &&
17-
window?.NeveReactCustomize?.deal?.customizerBannerUrl
15+
window?.NeveReactCustomize?.blackFriday?.saleUrl &&
16+
window?.NeveReactCustomize?.blackFriday?.bannerSrc
1817
) {
1918
return (
2019
<div className="upsell-inner">
2120
<a
22-
href={
23-
window?.NeveReactCustomize?.deal
24-
?.customizerBannerStoreUrl
25-
}
21+
href={window?.NeveReactCustomize?.blackFriday?.saleUrl}
2622
target="_blank"
2723
rel="external noreferrer noopener"
2824
style={{ width: '100%', lineHeight: '0' }}
2925
>
3026
<img
31-
src={
32-
window?.NeveReactCustomize?.deal
33-
?.customizerBannerUrl
34-
}
35-
alt={
36-
window?.NeveReactCustomize?.deal
37-
?.customizerBannerAlt
38-
}
27+
src={window?.NeveReactCustomize?.blackFriday?.bannerSrc}
3928
style={{ width: '100%' }}
29+
alt={window?.NeveReactCustomize?.blackFriday?.message}
4030
/>
4131
</a>
4232
</div>

assets/apps/dashboard/src/Components/App.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const App = () => {
2828
fetchOptions().then((r) => {
2929
setSettings(r);
3030
setLoading(false);
31+
window.tsdk_reposition_notice();
3132
});
3233
}, []);
3334

@@ -38,9 +39,9 @@ const App = () => {
3839
<div className="antialiased grow flex flex-col gap-6 h-full">
3940
<Header />
4041

41-
{/*<Deal />*/}
4242
{'starter-sites' !== currentTab && <Notifications />}
4343

44+
<div id="tsdk_banner"></div>
4445
<Container className="flex flex-col lg:flex-row gap-6 h-full grow">
4546
<div className="grow">{tabs[currentTab].render(setTab)}</div>
4647

assets/apps/dashboard/src/Components/Deal.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

assets/apps/dashboard/src/scss/_general.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,4 @@ svg.is-loading, button.is-loading .dashicon {
162162
aspect-ratio: 16/8;
163163
}
164164
}
165-
}
165+
}

assets/apps/dashboard/src/scss/content/_start.scss

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -48,46 +48,3 @@
4848
}
4949
}
5050
}
51-
52-
.nv-deal {
53-
margin-bottom: 10px;
54-
display: flex;
55-
56-
a {
57-
position: relative;
58-
width: 100%;
59-
}
60-
61-
img {
62-
width: 100%;
63-
}
64-
65-
.nv-urgency {
66-
position: absolute;
67-
68-
top: 10%;
69-
left: 2.7%;
70-
71-
color: #FFF;
72-
font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", sans-serif;
73-
font-size: 14px;
74-
font-style: normal;
75-
font-weight: 700;
76-
line-height: normal;
77-
letter-spacing: 0.3px;
78-
text-transform: uppercase;
79-
}
80-
}
81-
82-
@media(max-width: 480px) {
83-
.nv-deal .nv-urgency {
84-
font-size: 7px;
85-
}
86-
}
87-
88-
@media (min-width: 481px) and (max-width: 1024px) {
89-
.nv-deal .nv-urgency {
90-
font-size: 10px;
91-
}
92-
}
93-
-27.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)