Skip to content

Commit fa2f991

Browse files
authored
Merge branch 'main' into 193-bug-revenue-share-generator-accesability-part-2
2 parents b8c317f + a4fee66 commit fa2f991

22 files changed

Lines changed: 795 additions & 387 deletions

File tree

components/src/widget/views/confirmation/confirmation.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
}
6565

6666
.confirmation-buttons-header {
67-
color: var(--primary-color, #8075b3);
67+
color: var(--primary-color, #7469a8);
6868
font-family: var(--Font-Family-Inter, Inter);
6969
font-size: var(--Font-Size-text-base, 16px);
7070
font-style: normal;

components/src/widget/views/interaction/interaction.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
}
6464

6565
.interaction-body .authorizing {
66-
color: var(--Colors-Purple-300, #8075b3);
66+
color: var(--Colors-Purple-300, #7469a8);
6767
}
6868

6969
.interaction-body .complete {

components/src/widget/widget.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
--Colors-silver-800: #676767;
1515
--Colors-silver-950: #363636;
1616
--Colors-red-600: #e51d25;
17-
--Colors-Purple-300: #8075b3;
17+
--Colors-Purple-300: #7469a8;
1818
--Colors-white: #ffffff;
1919

2020
--Font-Family-Inter: var(--wm-font-family, Inter, sans-serif);

frontend/app/assets/svg.tsx

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export const SVGText: SvgIcon = ({ className }) => (
8282
</svg>
8383
)
8484

85-
export const SVGPosition: SvgIcon = ({ className }) => (
85+
export const SVGHeaderPosition: SvgIcon = ({ className }) => (
8686
<svg className={className} viewBox="0 0 20 20" fill="none">
8787
<path
8888
d="M4.6787 16.6666C4.29481 16.6666 3.97453 16.5383 3.71786 16.2816C3.4612 16.0249 3.33259 15.7044 3.33203 15.3199V4.67992C3.33203 4.29603 3.46064 3.97575 3.71786 3.71909C3.97509 3.46242 4.29536 3.33381 4.6787 3.33325H15.3195C15.7029 3.33325 16.0231 3.46186 16.2804 3.71909C16.5376 3.97631 16.6659 4.29659 16.6654 4.67992V15.3208C16.6654 15.7041 16.537 16.0244 16.2804 16.2816C16.0237 16.5388 15.7031 16.6671 15.3187 16.6666H4.6787ZM15.832 12.9166H4.16536V15.3208C4.16536 15.4485 4.2187 15.566 4.32536 15.6733C4.43203 15.7805 4.54953 15.8338 4.67786 15.8333H15.3195C15.4473 15.8333 15.5648 15.7799 15.672 15.6733C15.7793 15.5666 15.8326 15.4488 15.832 15.3199V12.9166ZM13.4287 12.0833H15.832V4.67992C15.832 4.55159 15.7787 4.43381 15.672 4.32659C15.5654 4.21936 15.4476 4.16603 15.3187 4.16659H13.4279L13.4287 12.0833ZM4.16536 12.0833H6.56953V4.16659H4.67786C4.55009 4.16659 4.43259 4.21992 4.32536 4.32659C4.21814 4.43325 4.16481 4.55103 4.16536 4.67992V12.0833ZM7.40286 12.0833H12.5945V4.16659H7.40286V12.0833Z"
@@ -91,6 +91,30 @@ export const SVGPosition: SvgIcon = ({ className }) => (
9191
</svg>
9292
)
9393

94+
export const SVGPositionRight: SvgIcon = ({ className }) => (
95+
<svg className={className} viewBox="0 0 45 44" fill="none">
96+
<path
97+
d="M4.5 0.5H40.5C42.433 0.5 44 2.067 44 4V40C44 41.933 42.433 43.5 40.5 43.5H4.5C2.567 43.5 1 41.933 1 40V4C1 2.067 2.567 0.5 4.5 0.5Z"
98+
fill="white"
99+
stroke="#C9C9C9"
100+
/>
101+
<rect x="3" y="2.5" width="39" height="11" rx="1" stroke="#C9C9C9" />
102+
<circle cx="35" cy="34.5" r="6.5" fill="#ABE4DF" />
103+
</svg>
104+
)
105+
106+
export const SVGPositionLeft: SvgIcon = ({ className }) => (
107+
<svg className={className} viewBox="0 0 44 44" fill="none">
108+
<path
109+
d="M4 0.5H40C41.933 0.5 43.5 2.067 43.5 4V40C43.5 41.933 41.933 43.5 40 43.5H4C2.067 43.5 0.5 41.933 0.5 40V4C0.5 2.067 2.067 0.5 4 0.5Z"
110+
fill="white"
111+
stroke="#C9C9C9"
112+
/>
113+
<rect x="2.5" y="2.5" width="39" height="11" rx="1" stroke="#C9C9C9" />
114+
<circle cx="9.5" cy="34.5" r="6.5" fill="#ABE4DF" />
115+
</svg>
116+
)
117+
94118
export const SVGCheck: SvgIcon = ({ className }) => (
95119
<svg className={className} viewBox="0 0 12 12" fill="none">
96120
<path

frontend/app/components/compositions/ToolConfig.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,6 @@ const BannerConfig = ({
263263
placeholder="Select Font"
264264
options={fontOptions}
265265
value={defaultFontValue}
266-
onChange={(value) =>
267-
setToolConfig({ ...config, bannerFontName: value ?? '' })
268-
}
269266
/>
270267
</div>
271268
<div className="flex items-center max-w-20 w-18 shrink-0">
@@ -440,9 +437,6 @@ const WidgetConfig = ({
440437
placeholder="Select Font"
441438
options={fontOptions}
442439
value={defaultFontValue}
443-
onChange={(value) =>
444-
setToolConfig({ ...config, widgetFontName: value ?? '' })
445-
}
446440
/>
447441
</div>
448442
<div className="flex items-center max-w-20 w-18 shrink-0">

0 commit comments

Comments
 (0)