Skip to content

Commit 976d4b4

Browse files
authored
refactor: use meteor tokens (#58)
1 parent b93a071 commit 976d4b4

File tree

39 files changed

+314
-470
lines changed

39 files changed

+314
-470
lines changed

.gitlab/Dockerfile

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

.gitlab/install_test_data.php

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

.gitlab/post_install_migration_assistant.sh

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

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-assistant/swag-migration-assistant.scss

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
.swag-migration-assistant {
44
h4.swag-migration-assistant__headline {
5-
font-size: 32px;
5+
color: var(--color-text-primary-default);
6+
font-size: var(--font-size-2xl);
7+
font-weight: var(--font-weight-medium);
8+
padding-top: var(--scale-size-10);
69
text-align: center;
710
margin: 0;
8-
padding-top: var(--scale-size-10);
911
}
1012

1113
.swag-migration-assistant__paragraph {
@@ -23,7 +25,7 @@
2325
}
2426

2527
.swag-migration-assistant__illustration {
26-
width: 136px;
28+
width: var(--scale-size-128);
2729
display: block;
2830
margin: 0 auto;
2931
padding-bottom: var(--scale-size-16);
@@ -32,15 +34,17 @@
3234
h5.swag-migration-assistant__title {
3335
font-weight: var(--font-weight-semibold);
3436
margin-bottom: var(--scale-size-8);
37+
color: var(--color-text-primary-default);
3538
}
3639

3740
.swag-migration-assistant__content {
3841
white-space: pre-line;
42+
color: var(--color-text-secondary-default);
3943
}
4044

4145
.swag-migration-assistant__content,
4246
.swag-migration-assistant__link a.link {
43-
font-size: $font-size-xxs;
44-
line-height: 22px;
47+
font-size: var(--font-size-xs);
48+
line-height: var(--font-line-height-xs);
4549
}
4650
}

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-confirm-warning/swag-migration-confirm-warning.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,30 @@
33
.swag-migration-confirm-warning {
44
.swag-migration-confirm-warning__card {
55
text-align: center;
6-
font-size: 14px;
6+
font-size: var(--font-size-xs);
77
}
88

99
.swag-migration-confirm-warning__bubble {
1010
margin: var(--scale-size-12) auto var(--scale-size-20) auto;
1111
width: var(--scale-size-72);
1212
height: var(--scale-size-72);
1313
border-radius: var(--border-radius-round);
14-
background-color: $color-pumpkin-spice-50;
14+
background-color: var(--color-background-attention-default);
1515
flex-shrink: 0;
1616
display: flex;
1717
align-items: center;
1818
justify-content: center;
1919
}
2020

2121
.swag-migration-confirm-warning__bubble-icon {
22-
color: $color-pumpkin-spice-500;
22+
color: var(--color-icon-attention-default);
2323
}
2424

2525
h5.swag-migration-confirm-warning__title {
26-
font-size: 18px;
26+
font-size: var(--font-size-m);
2727
font-weight: var(--font-weight-semibold);
28-
line-height: 25px;
28+
line-height: var(--font-line-height-s);
29+
color: var(--color-text-primary-default);
2930
}
3031

3132
.swag-migration-confirm-warning__alert {

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
{% endblock %}
3232

3333
{% block swag_migration_premapping_success_card %}
34-
<mt-card v-if="!isLoading && isPremappingValid"
34+
<mt-card v-if="!isLoading && isPremappingValid && premapping?.length > 0"
3535
class="swag-migration-premapping__success-card"
3636
position-identifier="swag-migration-premapping__success-card">
3737

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.scss

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,68 +3,75 @@
33
.swag-migration-premapping {
44
.swag-migration-premapping__success-card {
55
text-align: center;
6-
font-size: 14px;
6+
font-size: var(--font-size-xs);
7+
8+
.mt-card__content {
9+
display: flex;
10+
flex-direction: column;
11+
justify-content: center;
12+
align-items: center;
13+
height: var(--scale-size-256);
14+
}
715
}
816

917
.swag-migration-premapping__success-bubble {
10-
margin: var(--scale-size-12) auto var(--scale-size-20) auto;
18+
margin: 0 auto var(--scale-size-20) auto;
1119
width: var(--scale-size-72);
1220
height: var(--scale-size-72);
1321
border-radius: var(--border-radius-round);
14-
background-color: $color-emerald-50;
22+
background-color: var(--color-background-positive-default);
1523
flex-shrink: 0;
1624
display: flex;
1725
align-items: center;
1826
justify-content: center;
1927
}
2028

2129
.swag-migration-premapping__success-icon {
22-
color: $color-emerald-500;
30+
color: var(--color-icon-positive-default);
2331
}
2432

2533
.swag-migration-premapping__success-title {
26-
font-size: 18px;
34+
font-size: var(--font-size-m);
2735
font-weight: var(--font-weight-semibold);
28-
margin-bottom: 5px;
36+
margin-bottom: var(--scale-size-4);
2937
}
3038

3139
.swag-migration-premapping__success-caption {
32-
color: $color-gray-500;
33-
margin-bottom: 45px;
40+
color: var(--color-text-secondary-default);
3441
}
3542

3643
.swag-migration-premapping__loading-card {
3744
text-align: center;
38-
font-size: 14px;
45+
font-size: var(--font-size-xs);
3946
}
4047

4148
.swag-migration-premapping__loading-title {
42-
font-size: 18px;
49+
font-size: var(--font-size-m);
4350
font-weight: var(--font-weight-semibold);
44-
margin-bottom: 5px;
51+
margin-bottom: var(--scale-size-4);
4552
}
4653

4754
.swag-migration-premapping__loading-caption {
48-
color: $color-gray-500;
49-
margin-bottom: 45px;
55+
color: var(--color-text-secondary-default);
56+
margin-bottom: var(--scale-size-48);
5057
}
5158

5259
.sw-loader.swag-migration-premapping__loader {
5360
position: relative;
54-
margin: var(--scale-size-12) auto 42px auto;
61+
margin: var(--scale-size-12) auto var(--scale-size-40) auto;
5562

5663
.sw-loader__container {
5764
transform: translate(-50%);
5865
}
5966
}
6067

6168
.swag-migration-premapping__alert {
62-
max-width: 800px;
69+
max-width: 60rem;
6370
margin-left: auto;
6471
margin-right: auto;
6572

66-
@media screen and (max-width: 1360px) {
67-
max-width: 770px;
73+
@media screen and (max-width: 85rem) {
74+
max-width: calc(var(--scale-size-256) * 3);
6875
}
6976
}
7077

@@ -75,30 +82,30 @@
7582
.swag-migration-premapping__unfilled-card {
7683
margin-top: var(--scale-size-40);
7784
text-align: center;
78-
font-size: 14px;
85+
font-size: var(--font-size-xs);
7986
}
8087

8188
.swag-migration-premapping__unfilled-title {
82-
font-size: 18px;
89+
font-size: var(--font-size-m);
8390
font-weight: var(--font-weight-semibold);
8491
margin-top: var(--scale-size-10);
85-
margin-bottom: 5px;
92+
margin-bottom: var(--scale-size-4);
8693
}
8794

8895
.swag-migration-premapping__unfilled-caption {
89-
color: $color-gray-500;
96+
color: var(--color-text-secondary-default);
9097
margin-bottom: var(--scale-size-10);
9198
}
9299

93100
.swag-migration-premapping__tab-card {
94-
font-size: 14px;
101+
font-size: var(--font-size-xs);
95102
}
96103

97104
.swag-migration-premapping__tab-card-item {
98-
font-size: 14px;
105+
font-size: var(--font-size-xs);
99106
}
100107

101108
.sw-grid__cell-label {
102-
font-size: 14px;
109+
font-size: var(--font-size-xs);
103110
}
104-
}
111+
}

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-progress-bar/swag-migration-progress-bar.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
.swag-migration-progress-bar__point {
2929
position: absolute;
30-
display:flex;
30+
display: flex;
3131
flex-direction: column;
3232
align-items: center;
3333
top: var(--scale-size-30);
34-
font-size: 14px;
34+
font-size: var(--font-size-xs);
3535
font-weight: var(--font-weight-semibold);
3636
}
3737

@@ -51,27 +51,27 @@
5151
}
5252

5353
.swag-migration-progress-bar__bubble--active {
54-
background-color: $color-shopware-brand-50;
55-
color: $color-shopware-brand-500;
54+
background-color: var(--color-background-brand-default);
55+
color: var(--color-icon-brand-default);
5656
}
5757

5858
.swag-migration-progress-bar__bubble--disabled {
59-
background-color: $color-gray-100;
59+
background-color: var(--color-background-tertiary-default);
6060

6161
.swag-migration-progress-bar__icon {
62-
color: $color-gray-300;
62+
color: var(--color-icon-secondary-default);
6363
}
6464
}
6565

6666
.swag-migration-progress-bar__caption {
6767
margin-top: var(--scale-size-12);
68-
font-size: 14px;
68+
font-size: var(--font-size-xs);
6969
text-align: center;
7070
}
7171

7272
.swag-migration-progress-bar__heading {
73-
margin-bottom: 5px;
74-
font-size: 14px;
73+
margin-bottom: var(--scale-size-4);
74+
font-size: var(--font-size-xs);
7575
text-align: center;
7676
font-weight: var(--font-weight-semibold);
7777
}

0 commit comments

Comments
 (0)