Skip to content

Commit e2acdb6

Browse files
larskemperlarskemper
committed
refactor: use meteor scale tokens
1 parent f19ad6c commit e2acdb6

File tree

18 files changed

+66
-65
lines changed

18 files changed

+66
-65
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626

2727
.swag-migration-assistant__illustration {
28-
width: 136px;
28+
width: var(--scale-size-128);
2929
display: block;
3030
margin: 0 auto;
3131
padding-bottom: var(--scale-size-16);

‎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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
flex-direction: column;
1111
justify-content: center;
1212
align-items: center;
13-
height: 15rem;
13+
height: var(--scale-size-256);
1414
}
1515
}
1616

@@ -33,7 +33,7 @@
3333
.swag-migration-premapping__success-title {
3434
font-size: var(--font-size-m);
3535
font-weight: var(--font-weight-semibold);
36-
margin-bottom: 5px;
36+
margin-bottom: var(--scale-size-4);
3737
}
3838

3939
.swag-migration-premapping__success-caption {
@@ -48,17 +48,17 @@
4848
.swag-migration-premapping__loading-title {
4949
font-size: var(--font-size-m);
5050
font-weight: var(--font-weight-semibold);
51-
margin-bottom: 5px;
51+
margin-bottom: var(--scale-size-4);
5252
}
5353

5454
.swag-migration-premapping__loading-caption {
5555
color: var(--color-text-secondary-default);
56-
margin-bottom: 45px;
56+
margin-bottom: var(--scale-size-48);
5757
}
5858

5959
.sw-loader.swag-migration-premapping__loader {
6060
position: relative;
61-
margin: var(--scale-size-12) auto 42px auto;
61+
margin: var(--scale-size-12) auto var(--scale-size-40) auto;
6262

6363
.sw-loader__container {
6464
transform: translate(-50%);
@@ -70,8 +70,8 @@
7070
margin-left: auto;
7171
margin-right: auto;
7272

73-
@media screen and (max-width: 1360px) {
74-
max-width: 770px;
73+
@media screen and (max-width: 85rem) {
74+
max-width: calc(var(--scale-size-256) * 3);
7575
}
7676
}
7777

@@ -89,7 +89,7 @@
8989
font-size: var(--font-size-m);
9090
font-weight: var(--font-weight-semibold);
9191
margin-top: var(--scale-size-10);
92-
margin-bottom: 5px;
92+
margin-bottom: var(--scale-size-4);
9393
}
9494

9595
.swag-migration-premapping__unfilled-caption {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
}
7171

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

‎src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.scss‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
@import "~scss/variables";
22

33
.swag-migration-shop-information {
4-
54
.swag-migration-shop-information__connection {
65
display: grid;
7-
grid-gap: 8px;
8-
grid-template-columns: (112px - 8px) 1fr min-content;
6+
grid-gap: var(--scale-size-8);
7+
grid-template-columns: var(--scale-size-96) 1fr min-content;
98

10-
@media screen and (max-width: 650px) {
9+
@media screen and (max-width: 40rem) {
1110
grid-template-columns: 1fr;
1211
}
1312
}
@@ -109,7 +108,7 @@
109108
font-size: var(--font-size-xs);
110109
text-align: center;
111110
padding-top: var(--scale-size-20);
112-
max-width: 500px;
111+
max-width: calc(var(--scale-size-256) * 2);
113112
margin: auto;
114113
}
115114

‎src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-loading-screen/swag-migration-loading-screen.scss‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
.swag-migration-loading-screen__header {
66
text-align: center;
7-
margin: 5px auto 50px auto;
7+
margin: var(--scale-size-4) auto var(--scale-size-48) auto;
88
}
99

1010
.swag-migration-loading-screen__title {
1111
font-size: var(--font-size-m);
1212
font-weight: var(--font-weight-semibold);
13-
padding-bottom: 5px;
13+
padding-bottom: var(--scale-size-4);
1414
}
1515

1616
.swag-migration-loading-screen__caption {
@@ -29,33 +29,33 @@
2929

3030
.swag-migration-loading-screen__progress-bar-title {
3131
text-align: center;
32-
margin: 15px auto var(--scale-size-10) auto;
32+
margin: var(--scale-size-14) auto var(--scale-size-10) auto;
3333
font-size: var(--font-size-2xs);
3434
}
3535

3636
.sw-loader.swag-migration-loading-screen__loader {
3737
position: relative;
38-
margin: 50px auto 50px auto;
38+
margin: var(--scale-size-48) auto var(--scale-size-48) auto;
3939

4040
.sw-loader__container {
4141
transform: translate(-50%);
4242
}
4343
}
4444

4545
.swag-migration-loading-screen__hint {
46-
margin-top: 59px;
46+
margin-top: var(--scale-size-56);
4747
margin-bottom: 0;
4848
}
4949

5050
.swag-migration-loading-screen__alert-icon {
5151
color: var(--color-text-positive-default);
5252
position: absolute;
5353
display: block;
54-
left: 15px;
54+
left: var(--scale-size-14);
5555
top: var(--scale-size-14);
5656
}
5757

5858
.swag-migration-loading-screen__notice {
59-
margin-top: 50px;
59+
margin-top: var(--scale-size-48);
6060
}
6161
}

‎src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-result-screen/swag-migration-result-screen.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
}
88

99
.swag-migration-result-screen__title {
10-
margin-bottom: 5px;
10+
margin-bottom: var(--scale-size-4);
1111
font-size: var(--font-size-m);
1212
font-weight: var(--font-weight-semibold);
1313
}
1414

1515
.swag-migration-result-screen__caption {
16-
margin: 0 135px var(--scale-size-24) 135px;
16+
margin: 0 var(--scale-size-128) var(--scale-size-24) var(--scale-size-128);
1717
font-size: var(--font-size-2xs);
1818
color: var(--color-text-secondary-default);
1919
}
@@ -53,19 +53,19 @@
5353
}
5454

5555
.swag-migration-result-survey__title {
56-
margin-bottom: 5px;
56+
margin-bottom: var(--scale-size-4);
5757
font-size: var(--font-size-2xs);
5858
font-weight: var(--font-weight-semibold);
5959
}
6060

6161
.swag-migration-result-survey__caption {
62-
margin: var(--scale-size-10) 60px var(--scale-size-24) 60px;
62+
margin: var(--scale-size-10) var(--scale-size-56) var(--scale-size-24) var(--scale-size-56);
6363
font-size: var(--font-size-2xs);
6464
color: var(--color-text-secondary-default);
6565
}
6666

6767
.swag-migration-result-survey__external-icon {
68-
margin-left: 5px;
68+
margin-left: var(--scale-size-4);
6969
}
7070

7171
.swag-migration-result-survey__icon {

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,28 @@
77

88
.swag-migration-dashboard-card__title {
99
font-size: var(--font-size-xl);
10+
font-weight: var(--font-weight-semibold);
11+
color: var(--color-text-primary-default);
1012
}
1113

1214
.swag-migration-dashboard-card__headline {
1315
font-size: var(--font-size-m);
14-
font-weight: var(--font-weight-semibold);
16+
font-weight: var(--font-weight-medium);
1517
margin-bottom: var(--scale-size-10);
1618
}
1719

1820
.swag-migration-dashboard-card__information {
1921
font-size: var(--font-size-2xs);
2022
font-weight: normal;
21-
width: 440px;
22-
margin-bottom: var(--scale-size-26);
23+
width: calc(var(--scale-size-224) * 2);
24+
margin-bottom: var(--scale-size-10);
2325
line-height: var(--font-line-height-xs);
2426
}
2527

2628
.swag-migration-dashboard-card__wrapper {
2729
grid-template-columns: 1fr 1fr;
2830
place-items: stretch;
29-
gap: 0 15px;
31+
gap: 0 var(--scale-size-14);
3032
width: 100%;
3133
display: grid;
3234
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.swag-migration-tab-card {
44
.mt-card {
5-
min-height: 15rem;
5+
min-height: var(--scale-size-256);
66

77
&__tabs {
88
margin: 0 var(--scale-size-16);
@@ -24,9 +24,9 @@
2424
height: var(--scale-size-16);
2525
line-height: var(--font-line-height-2xs);
2626
font-size: var(--font-size-2xs);
27-
text-align: center;
2827
padding: var(--scale-size-2) var(--scale-size-10);
2928
margin-left: var(--scale-size-2);
29+
text-align: center;
3030
}
3131

3232
.sw-tabs-item__error-badge {

‎src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-data/swag-migration-history-detail-data.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
.swag-migration-history-detail-data {
33
.swag-migration-history-detail-data__loading-placeholder {
4-
height: 100px;
4+
height: var(--scale-size-96);
55
}
66

77
.swag-migration-history-detail-data__no-data {

0 commit comments

Comments
 (0)