Skip to content

refactor: use meteor tokens #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larskemper merged 2 commits into from
Sep 23, 2025
Merged

refactor: use meteor tokens #58

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f19ad6c
refactor: use meteor tokens
larskemper Sep 22, 2025
e2acdb6
refactor: use meteor scale tokens
larskemper Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions .gitlab/Dockerfile
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions .gitlab/install_test_data.php
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .gitlab/post_install_migration_assistant.sh
View file
Open in desktop

This file was deleted.

12 changes: 8 additions & 4 deletions ...dule/swag-migration/component/card/swag-migration-assistant/swag-migration-assistant.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

.swag-migration-assistant {
h4.swag-migration-assistant__headline {
font-size: 32px;
color: var(--color-text-primary-default);
font-size: var(--font-size-2xl);
font-weight: var(--font-weight-medium);
padding-top: var(--scale-size-10);
text-align: center;
margin: 0;
padding-top: var(--scale-size-10);
}

.swag-migration-assistant__paragraph {
Expand All @@ -32,15 +34,17 @@
h5.swag-migration-assistant__title {
font-weight: var(--font-weight-semibold);
margin-bottom: var(--scale-size-8);
color: var(--color-text-primary-default);
}

.swag-migration-assistant__content {
white-space: pre-line;
color: var(--color-text-secondary-default);
}

.swag-migration-assistant__content,
.swag-migration-assistant__link a.link {
font-size: $font-size-xxs;
line-height: 22px;
font-size: var(--font-size-xs);
line-height: var(--font-line-height-xs);
}
}
11 changes: 6 additions & 5 deletions ...gration/component/card/swag-migration-confirm-warning/swag-migration-confirm-warning.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,30 @@
.swag-migration-confirm-warning {
.swag-migration-confirm-warning__card {
text-align: center;
font-size: 14px;
font-size: var(--font-size-xs);
}

.swag-migration-confirm-warning__bubble {
margin: var(--scale-size-12) auto var(--scale-size-20) auto;
width: var(--scale-size-72);
height: var(--scale-size-72);
border-radius: var(--border-radius-round);
background-color: $color-pumpkin-spice-50;
background-color: var(--color-background-attention-default);
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
}

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

h5.swag-migration-confirm-warning__title {
font-size: 18px;
font-size: var(--font-size-m);
font-weight: var(--font-weight-semibold);
line-height: 25px;
line-height: var(--font-line-height-s);
color: var(--color-text-primary-default);
}

.swag-migration-confirm-warning__alert {
Expand Down
43 changes: 25 additions & 18 deletions ...le/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,56 @@
.swag-migration-premapping {
.swag-migration-premapping__success-card {
text-align: center;
font-size: 14px;
font-size: var(--font-size-xs);

.mt-card__content {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 15rem;
}
}

.swag-migration-premapping__success-bubble {
margin: var(--scale-size-12) auto var(--scale-size-20) auto;
margin: 0 auto var(--scale-size-20) auto;
width: var(--scale-size-72);
height: var(--scale-size-72);
border-radius: var(--border-radius-round);
background-color: $color-emerald-50;
background-color: var(--color-background-positive-default);
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
}

.swag-migration-premapping__success-icon {
color: $color-emerald-500;
color: var(--color-icon-positive-default);
}

.swag-migration-premapping__success-title {
font-size: 18px;
font-size: var(--font-size-m);
font-weight: var(--font-weight-semibold);
margin-bottom: 5px;
}

.swag-migration-premapping__success-caption {
color: $color-gray-500;
margin-bottom: 45px;
color: var(--color-text-secondary-default);
}

.swag-migration-premapping__loading-card {
text-align: center;
font-size: 14px;
font-size: var(--font-size-xs);
}

.swag-migration-premapping__loading-title {
font-size: 18px;
font-size: var(--font-size-m);
font-weight: var(--font-weight-semibold);
margin-bottom: 5px;
}

.swag-migration-premapping__loading-caption {
color: $color-gray-500;
color: var(--color-text-secondary-default);
margin-bottom: 45px;
}

Expand All @@ -59,7 +66,7 @@
}

.swag-migration-premapping__alert {
max-width: 800px;
max-width: 60rem;
margin-left: auto;
margin-right: auto;

Expand All @@ -75,30 +82,30 @@
.swag-migration-premapping__unfilled-card {
margin-top: var(--scale-size-40);
text-align: center;
font-size: 14px;
font-size: var(--font-size-xs);
}

.swag-migration-premapping__unfilled-title {
font-size: 18px;
font-size: var(--font-size-m);
font-weight: var(--font-weight-semibold);
margin-top: var(--scale-size-10);
margin-bottom: 5px;
}

.swag-migration-premapping__unfilled-caption {
color: $color-gray-500;
color: var(--color-text-secondary-default);
margin-bottom: var(--scale-size-10);
}

.swag-migration-premapping__tab-card {
font-size: 14px;
font-size: var(--font-size-xs);
}

.swag-migration-premapping__tab-card-item {
font-size: 14px;
font-size: var(--font-size-xs);
}

.sw-grid__cell-label {
font-size: 14px;
font-size: var(--font-size-xs);
}
}
}
16 changes: 8 additions & 8 deletions ...wag-migration/component/card/swag-migration-progress-bar/swag-migration-progress-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

.swag-migration-progress-bar__point {
position: absolute;
display:flex;
display: flex;
flex-direction: column;
align-items: center;
top: var(--scale-size-30);
font-size: 14px;
font-size: var(--font-size-xs);
font-weight: var(--font-weight-semibold);
}

Expand All @@ -51,27 +51,27 @@
}

.swag-migration-progress-bar__bubble--active {
background-color: $color-shopware-brand-50;
color: $color-shopware-brand-500;
background-color: var(--color-background-brand-default);
color: var(--color-icon-brand-default);
}

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

.swag-migration-progress-bar__icon {
color: $color-gray-300;
color: var(--color-icon-secondary-default);
}
}

.swag-migration-progress-bar__caption {
margin-top: var(--scale-size-12);
font-size: 14px;
font-size: var(--font-size-xs);
text-align: center;
}

.swag-migration-progress-bar__heading {
margin-bottom: 5px;
font-size: 14px;
font-size: var(--font-size-xs);
text-align: center;
font-weight: var(--font-weight-semibold);
}
Expand Down
10 changes: 5 additions & 5 deletions .../component/card/swag-migration-shop-information/swag-migration-shop-information.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,13 @@

{% block swag_migration_shop_information_reset_migration_confirm_modal %}
<sw-modal v-if="showResetMigrationConfirmModal"
class="swag-migration-shop-information__reset-confirm-modal"
class="swag-migration-shop-information__confirm-modal"
:title="$tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.title')"
:is-loading="confirmModalIsLoading"
@modal-close="onCloseResetModal">

{% block swag_migration_shop_information_reset_migration_confirm_modal_icon %}
<div class="swag-migration-shop-information__reset-confirm-modal-icon-wrapper">
<div class="swag-migration-shop-information__confirm-modal-icon-wrapper">
<mt-icon class="swag-migration-shop-information__confirm-modal-icon"
name="regular-trophy"
color="#37D046"
Expand All @@ -337,19 +337,19 @@
{% endblock %}

{% block swag_migration_shop_information_reset_migration_confirm_modal_header %}
<p class="swag-migration-shop-information__reset-confirm-modal-header"
<p class="swag-migration-shop-information__confirm-modal-header"
v-html="$tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.header')">
</p>
{% endblock %}

{% block swag_migration_shop_information_reset_migration_confirm_modal_content %}
<p class="swag-migration-shop-information__reset-confirm-modal-content"
<p class="swag-migration-shop-information__confirm-modal-content"
v-html="$tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.content')">
</p>
{% endblock %}

{% block swag_migration_shop_information_reset_migration_confirm_modal_content_hint %}
<p class="swag-migration-shop-information__reset-confirm-modal-content-hint">
<p class="swag-migration-shop-information__confirm-modal-content-hint">
{{ $tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.contentHint') }}
</p>
{% endblock %}
Expand Down
Loading
Loading