chore(admin-ui): Style tweaks

packages/admin-ui/i18n-coverage.json

@@ -1,70 +1,70 @@
 {
-  "generatedOn": "2023-06-02T20:04:27.753Z",
-  "lastCommit": "c15dd2323377708b52aacf4dcbd332e6128395c2",
+  "generatedOn": "2023-06-04T19:41:40.876Z",
+  "lastCommit": "4a2609b8e17a943077a68447620d46b98c73ea00",
   "translationStatus": {
     "cs": {
-      "tokenCount": 729,
-      "translatedCount": 546,
+      "tokenCount": 730,
+      "translatedCount": 544,
       "percentage": 75
     },
     "de": {
-      "tokenCount": 729,
-      "translatedCount": 529,
-      "percentage": 73
+      "tokenCount": 730,
+      "translatedCount": 527,
+      "percentage": 72
     },
     "en": {
-      "tokenCount": 729,
-      "translatedCount": 728,
+      "tokenCount": 730,
+      "translatedCount": 729,
       "percentage": 100
     },
     "es": {
-      "tokenCount": 729,
-      "translatedCount": 571,
+      "tokenCount": 730,
+      "translatedCount": 569,
       "percentage": 78
     },
     "fr": {
-      "tokenCount": 729,
-      "translatedCount": 566,
-      "percentage": 78
+      "tokenCount": 730,
+      "translatedCount": 564,
+      "percentage": 77
     },
     "it": {
-      "tokenCount": 729,
-      "translatedCount": 570,
+      "tokenCount": 730,
+      "translatedCount": 568,
       "percentage": 78
     },
     "pl": {
-      "tokenCount": 729,
-      "translatedCount": 380,
+      "tokenCount": 730,
+      "translatedCount": 378,
       "percentage": 52
     },
     "pt_BR": {
-      "tokenCount": 729,
-      "translatedCount": 544,
-      "percentage": 75
+      "tokenCount": 730,
+      "translatedCount": 542,
+      "percentage": 74
     },
     "pt_PT": {
-      "tokenCount": 729,
-      "translatedCount": 579,
+      "tokenCount": 730,
+      "translatedCount": 577,
       "percentage": 79
     },
     "ru": {
-      "tokenCount": 729,
-      "translatedCount": 569,
+      "tokenCount": 730,
+      "translatedCount": 567,
       "percentage": 78
     },
     "uk": {
-      "tokenCount": 729,
-      "translatedCount": 569,
+      "tokenCount": 730,
+      "translatedCount": 567,
       "percentage": 78
     },
     "zh_Hans": {
-      "tokenCount": 729,
-      "translatedCount": 515,
-      "percentage": 71
+      "tokenCount": 730,
+      "translatedCount": 513,
+      "percentage": 70
     },
     "zh_Hant": {
-      "tokenCount": 729,
-      "translatedCount": 360,
+      "tokenCount": 730,
+      "translatedCount": 358,
       "percentage": 49
     }
   }

packages/admin-ui/src/lib/catalog/src/catalog.routes.ts

@@ -5,11 +5,9 @@ import {
     CanDeactivateDetailGuard,
     createResolveData,
     DataService,
-    GetProfileDetailDocument,
     PageComponent,
     PageService,
 } from '@vendure/admin-ui/core';
-import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ProductOptionsEditorComponent } from './components/product-options-editor/product-options-editor.component';
 import { ProductVariantsEditorComponent } from './components/product-variants-editor/product-variants-editor.component';
@@ -157,7 +155,7 @@ export function productOptionsEditorBreadcrumb(data: any, params: any) {
             },
             {
                 label: `${entity.name}`,
-                link: ['../', 'inventory', params.id, { tab: 'variants' }],
+                link: ['../', 'inventory', params.id],
             },
             {
                 label: _('breadcrumb.product-options'),

packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.html

@@ -66,7 +66,7 @@
                                     </vdr-chip>
                                 </ng-container>
                             </div>
-                            <button class="button" (click)="assignToChannel()">
+                            <button class="button-small" (click)="assignToChannel()">
                                 <clr-icon shape="layers"></clr-icon>
                                 {{ 'catalog.assign-to-channel' | translate }}
                             </button>
@@ -85,7 +85,7 @@
                     </vdr-chip>
                 </div>
                 <div>
-                    <a [routerLink]="['options']" class="button mt-2" *vdrIfPermissions="updatePermissions">
+                    <a [routerLink]="['options']" class="button-small mt-2" *vdrIfPermissions="updatePermissions">
                         <clr-icon shape="pencil"></clr-icon>
                         {{ 'catalog.edit-options' | translate }}
                     </a>
@@ -102,7 +102,7 @@
                 </div>
                 <div>
                     <button
-                        class="button mt-2"
+                        class="button-small mt-2"
                         *vdrIfPermissions="updatePermissions"
                         (click)="selectProductFacetValue()"
                     >

packages/admin-ui/src/lib/catalog/src/components/product-options-editor/product-options-editor.component.html

@@ -1,126 +1,132 @@
-<vdr-page-block>
-    <vdr-action-bar>
-        <vdr-ab-left>
-            <vdr-language-selector
-                [availableLanguageCodes]="availableLanguages$ | async"
-                [currentLanguageCode]="languageCode$ | async"
-                (languageCodeChange)="setLanguage($event)"
-            ></vdr-language-selector>
-        </vdr-ab-left>
+<vdr-page-header>
+    <vdr-page-title></vdr-page-title>
+    <vdr-page-header-description>{{ 'catalog.page-description-options-editor' | translate }}</vdr-page-header-description>
+</vdr-page-header>
+<vdr-page-body>
+    <vdr-page-block>
+        <vdr-action-bar>
+            <vdr-ab-left>
+                <vdr-language-selector
+                    [availableLanguageCodes]="availableLanguages$ | async"
+                    [currentLanguageCode]="languageCode$ | async"
+                    (languageCodeChange)="setLanguage($event)"
+                ></vdr-language-selector>
+            </vdr-ab-left>
 
-        <vdr-ab-right>
-            <div class="flex center">
-                <div class="mr-2">
-                    <clr-checkbox-wrapper>
-                        <input
-                            clrCheckbox
-                            type="checkbox"
-                            id="auto-update"
-                            [(ngModel)]="autoUpdateVariantNames"
-                        />
-                        <label>{{ 'catalog.auto-update-product-variant-name' | translate }}</label>
-                    </clr-checkbox-wrapper>
-                </div>
-                <button
-                    *vdrIfPermissions="updatePermission"
-                    class="btn btn-primary"
-                    (click)="save()"
-                    [disabled]="detailForm.pristine || detailForm.invalid"
-                >
-                    {{ 'common.update' | translate }}
-                </button>
-            </div>
-        </vdr-ab-right>
-    </vdr-action-bar>
-</vdr-page-block>
-<vdr-page-block>
-    <form class="form" [formGroup]="detailForm" *ngIf="optionGroups$ | async as optionGroups">
-        <div formGroupName="optionGroups">
-            <vdr-card
-                *ngFor="let optionGroup of getOptionGroups(); index as i"
-                [formArrayName]="i"
-                [title]="optionGroup.value.code"
-            >
-                <vdr-page-entity-info [entity]="optionGroup.value"></vdr-page-entity-info>
-                <div class="form-grid">
-                    <vdr-form-field [label]="'common.name' | translate" for="name">
-                        <input
-                            [id]="'name-' + i"
-                            type="text"
-                            formControlName="name"
-                            [readonly]="!(updatePermission | hasPermission)"
-                        />
-                    </vdr-form-field>
-                    <vdr-form-field [label]="'common.code' | translate" for="code">
-                        <input
-                            [id]="'code-' + i"
-                            type="text"
-                            [readonly]="!(updatePermission | hasPermission)"
-                            formControlName="code"
-                        />
-                    </vdr-form-field>
+            <vdr-ab-right>
+                <div class="flex center">
+                    <div class="mr-2">
+                        <clr-checkbox-wrapper>
+                            <input
+                                clrCheckbox
+                                type="checkbox"
+                                id="auto-update"
+                                [(ngModel)]="autoUpdateVariantNames"
+                            />
+                            <label>{{ 'catalog.auto-update-product-variant-name' | translate }}</label>
+                        </clr-checkbox-wrapper>
+                    </div>
+                    <button
+                        *vdrIfPermissions="updatePermission"
+                        class="btn btn-primary"
+                        (click)="save()"
+                        [disabled]="detailForm.pristine || detailForm.invalid"
+                    >
+                        {{ 'common.update' | translate }}
+                    </button>
                 </div>
-                <ng-container formGroupName="customFields" *ngIf="optionGroupCustomFields.length">
-                    <vdr-tabbed-custom-fields
-                        entityName="ProductOptionGroup"
-                        [customFields]="optionGroupCustomFields"
-                        [customFieldsFormGroup]="optionGroup.get('customFields')"
-                        [readonly]="!(updatePermission | hasPermission)"
-                    ></vdr-tabbed-custom-fields>
-                </ng-container>
-
-                <vdr-data-table-2
-                    id="edit-options-list"
-                    *ngIf="getOptions(optionGroup) as options"
-                    [items]="options"
-                    [itemsPerPage]="10"
-                    [totalItems]="options.length"
+            </vdr-ab-right>
+        </vdr-action-bar>
+    </vdr-page-block>
+    <vdr-page-block>
+        <form class="form" [formGroup]="detailForm" *ngIf="optionGroups$ | async as optionGroups">
+            <div formGroupName="optionGroups">
+                <vdr-card
+                    *ngFor="let optionGroup of getOptionGroups(); index as i"
+                    [formArrayName]="i"
+                    [title]="optionGroup.value.code"
                 >
-                    <vdr-dt2-column [heading]="'common.id' | translate" [hiddenByDefault]="true">
-                        <ng-template let-optionControl="item">
-                            {{ optionControl.value.id }}
-                        </ng-template>
-                    </vdr-dt2-column>
-                    <vdr-dt2-column [heading]="'common.created-at' | translate" [hiddenByDefault]="true">
-                        <ng-template let-optionControl="item">
-                            {{ optionControl.value.createdAt | localeDate : 'short' }}
-                        </ng-template>
-                    </vdr-dt2-column>
-                    <vdr-dt2-column [heading]="'common.updated-at' | translate" [hiddenByDefault]="true">
-                        <ng-template let-optionControl="item">
-                            {{ optionControl.value.updatedAt | localeDate : 'short' }}
-                        </ng-template>
-                    </vdr-dt2-column>
-                    <vdr-dt2-column [heading]="'common.name' | translate" [optional]="false">
-                        <ng-template let-optionControl="item">
+                    <vdr-page-entity-info [entity]="optionGroup.value"></vdr-page-entity-info>
+                    <div class="form-grid">
+                        <vdr-form-field [label]="'common.name' | translate" for="name">
                             <input
+                                [id]="'name-' + i"
                                 type="text"
-                                [formControl]="optionControl.get('name')"
+                                formControlName="name"
                                 [readonly]="!(updatePermission | hasPermission)"
                             />
-                        </ng-template>
-                    </vdr-dt2-column>
-                    <vdr-dt2-column [heading]="'common.code' | translate" [optional]="false">
-                        <ng-template let-optionControl="item">
-                            <input type="text" [formControl]="optionControl.get('code')" />
-                        </ng-template>
-                    </vdr-dt2-column>
-                    <vdr-dt2-column
-                        [heading]="'common.custom-fields' | translate"
-                        [hiddenByDefault]="optionCustomFields.length === 0"
-                    >
-                        <ng-template let-optionControl="item">
-                            <vdr-tabbed-custom-fields
-                                entityName="ProductOption"
-                                [customFields]="optionCustomFields"
-                                [compact]="true"
-                                [customFieldsFormGroup]="optionControl.get('customFields')"
+                        </vdr-form-field>
+                        <vdr-form-field [label]="'common.code' | translate" for="code">
+                            <input
+                                [id]="'code-' + i"
+                                type="text"
                                 [readonly]="!(updatePermission | hasPermission)"
-                            ></vdr-tabbed-custom-fields>
-                        </ng-template>
-                    </vdr-dt2-column>
-                </vdr-data-table-2>
-            </vdr-card>
-        </div>
-    </form>
-</vdr-page-block>
+                                formControlName="code"
+                            />
+                        </vdr-form-field>
+                    </div>
+                    <ng-container formGroupName="customFields" *ngIf="optionGroupCustomFields.length">
+                        <vdr-tabbed-custom-fields
+                            entityName="ProductOptionGroup"
+                            [customFields]="optionGroupCustomFields"
+                            [customFieldsFormGroup]="optionGroup.get('customFields')"
+                            [readonly]="!(updatePermission | hasPermission)"
+                        ></vdr-tabbed-custom-fields>
+                    </ng-container>
+
+                    <vdr-data-table-2
+                        id="edit-options-list"
+                        *ngIf="getOptions(optionGroup) as options"
+                        [items]="options"
+                        [itemsPerPage]="10"
+                        [totalItems]="options.length"
+                    >
+                        <vdr-dt2-column [heading]="'common.id' | translate" [hiddenByDefault]="true">
+                            <ng-template let-optionControl="item">
+                                {{ optionControl.value.id }}
+                            </ng-template>
+                        </vdr-dt2-column>
+                        <vdr-dt2-column [heading]="'common.created-at' | translate" [hiddenByDefault]="true">
+                            <ng-template let-optionControl="item">
+                                {{ optionControl.value.createdAt | localeDate : 'short' }}
+                            </ng-template>
+                        </vdr-dt2-column>
+                        <vdr-dt2-column [heading]="'common.updated-at' | translate" [hiddenByDefault]="true">
+                            <ng-template let-optionControl="item">
+                                {{ optionControl.value.updatedAt | localeDate : 'short' }}
+                            </ng-template>
+                        </vdr-dt2-column>
+                        <vdr-dt2-column [heading]="'common.name' | translate" [optional]="false">
+                            <ng-template let-optionControl="item">
+                                <input
+                                    type="text"
+                                    [formControl]="optionControl.get('name')"
+                                    [readonly]="!(updatePermission | hasPermission)"
+                                />
+                            </ng-template>
+                        </vdr-dt2-column>
+                        <vdr-dt2-column [heading]="'common.code' | translate" [optional]="false">
+                            <ng-template let-optionControl="item">
+                                <input type="text" [formControl]="optionControl.get('code')" />
+                            </ng-template>
+                        </vdr-dt2-column>
+                        <vdr-dt2-column
+                            [heading]="'common.custom-fields' | translate"
+                            [hiddenByDefault]="optionCustomFields.length === 0"
+                        >
+                            <ng-template let-optionControl="item">
+                                <vdr-tabbed-custom-fields
+                                    entityName="ProductOption"
+                                    [customFields]="optionCustomFields"
+                                    [compact]="true"
+                                    [customFieldsFormGroup]="optionControl.get('customFields')"
+                                    [readonly]="!(updatePermission | hasPermission)"
+                                ></vdr-tabbed-custom-fields>
+                            </ng-template>
+                        </vdr-dt2-column>
+                    </vdr-data-table-2>
+                </vdr-card>
+            </div>
+        </form>
+    </vdr-page-block>
+</vdr-page-body>

packages/admin-ui/src/lib/catalog/src/components/product-variant-detail/product-variant-detail.component.html

@@ -62,7 +62,7 @@
                 <div>
                     <a
                         [routerLink]="['../../', 'options']"
-                        class="button mt-2"
+                        class="button-small mt-2"
                         *vdrIfPermissions="updatePermissions"
                     >
                         <clr-icon shape="pencil"></clr-icon>
@@ -81,7 +81,7 @@
                 </div>
                 <div>
                     <button
-                        class="button mt-2"
+                        class="button-small mt-2"
                         *vdrIfPermissions="updatePermissions"
                         (click)="selectFacetValue()"
                     >

packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.html

@@ -12,7 +12,7 @@
                     <clr-icon shape="arrow right"></clr-icon>
                 </a>
             </div>
-            <vdr-form-field *ngIf="editable" [label]="'common.name' | translate">
+            <vdr-form-field *ngIf="editable" [label]="'common.name' | translate" class="mb-2">
                 <input
                     type="text"
                     [formControl]="form.get('name')"
@@ -44,9 +44,9 @@
                     {{ fpy | number : '1.2-2' }}</span
                 >
                 <span *ngIf="!fpx">{{ 'common.not-set' | translate }}</span>
-                <div class="flex">
+                <div class="flex mt-1">
                     <button
-                        class="button-small"
+                        class="button-small mr-1"
                         [disabled]="settingFocalPoint"
                         (click)="setFocalPointStart()"
                     >
@@ -66,7 +66,7 @@
             <vdr-labeled-data [label]="'common.tags' | translate">
                 <ng-container *ngIf="editable">
                     <vdr-tag-selector [formControl]="form.get('tags')"></vdr-tag-selector>
-                    <button class="button-ghost" (click)="manageTags()">
+                    <button class="button-small mt-1" (click)="manageTags()">
                         <clr-icon shape="tags"></clr-icon>
                         {{ 'common.manage-tags' | translate }}
                     </button>

packages/admin-ui/src/lib/core/src/shared/components/entity-info/entity-info.component.html

@@ -1,5 +1,5 @@
 <vdr-dropdown *ngIf="entity.id">
-    <button class="btn btn-icon btn-link info-button" [class.btn-sm]="small" vdrDropdownTrigger>
+    <button class="button-small" [class.btn-sm]="small" vdrDropdownTrigger>
         <clr-icon shape="info-standard"></clr-icon>
     </button>
     <vdr-dropdown-menu>

packages/admin-ui/src/lib/core/src/shared/components/rich-text-editor/rich-text-editor.component.scss

@@ -33,6 +33,7 @@ label.rich-text-label {
     background: var(--color-form-input-bg);
     color: var(--color-text-100);
     min-height: 128px;
+    max-height: 600px;
     min-width: 200px;
     border: 1px solid var(--color-component-border-200);
     border-radius: 0 0 var(--border-radius-input) var(--border-radius-input);

packages/admin-ui/src/lib/customer/src/components/customer-detail/customer-detail.component.html

@@ -57,7 +57,7 @@
             </ng-template>
             <div>
                 <button
-                    class="button mt-1"
+                    class="button-small mt-1"
                     (click)="addToGroup()"
                     *vdrIfPermissions="'UpdateCustomerGroup'"
                 >
@@ -154,7 +154,7 @@
                     (setAsDefaultShipping)="setDefaultShippingAddressId($event)"
                     (deleteAddress)="toggleDeleteAddress($event)"
                 ></vdr-address-card>
-                <button class="btn btn-secondary" (click)="addAddress()" *vdrIfPermissions="'UpdateCustomer'">
+                <button class="btn btn-secondary mt-2" (click)="addAddress()" *vdrIfPermissions="'UpdateCustomer'">
                     <clr-icon shape="plus"></clr-icon>
                     {{ 'customer.create-new-address' | translate }}
                 </button>

packages/admin-ui/src/lib/customer/src/components/customer-history/customer-history.component.scss

@@ -1,8 +1,6 @@
 
 .entry-list {
-    margin-top: 24px;
-    margin-left: 24px;
-    margin-right: 12px;
+    margin: 24px 12px 24px 24px;
 }
 
 .note-entry {

packages/admin-ui/src/lib/order/src/components/order-detail/order-detail.component.html

@@ -5,7 +5,7 @@
         <vdr-ab-right>
             <vdr-action-bar-items locationId="order-detail"></vdr-action-bar-items>
             <button
-                class="btn btn-primary"
+                class="button primary mr-1"
                 *ngIf="
                     order.type !== 'Aggregate' &&
                     (order.state === 'ArrangingPayment' || order.state === 'ArrangingAdditionalPayment') &&
@@ -17,7 +17,7 @@
                 ({{ outstandingPaymentAmount(order) | localeCurrency : order.currencyCode }})
             </button>
             <button
-                class="btn btn-primary"
+                class="button primary mr-1"
                 *ngIf="
                     order.type !== 'Aggregate' &&
                     order.active === false &&
@@ -31,7 +31,7 @@
             </button>
             <button
                 *ngIf="order.type !== 'Aggregate'"
-                class="btn btn-primary"
+                class="button primary mr-1"
                 (click)="fulfillOrder()"
                 [disabled]="!canAddFulfillment(order)"
             >
@@ -108,6 +108,7 @@
         <vdr-card [title]="'order.customer' | translate">
             <vdr-customer-label [customer]="order.customer"></vdr-customer-label>
             <vdr-labeled-data
+                class="mt-2"
                 [label]="'order.shipping-address' | translate"
                 *ngIf="getOrderAddressLines(order.shippingAddress).length"
             >

packages/admin-ui/src/lib/settings/src/components/admin-detail/admin-detail.component.html

@@ -113,7 +113,7 @@
                 bindLabel="description"
             ></ng-select>
 
-            <ul class="nav" role="tablist">
+            <ul class="nav mt-2" role="tablist">
                 <li role="presentation" class="nav-item" *ngFor="let channel of getAvailableChannels()">
                     <button
                         [id]="channel.channelId"

packages/admin-ui/src/lib/settings/src/components/permission-grid/permission-grid.component.scss

@@ -1,4 +1,6 @@
-
+:host {
+    display: block;
+}
 td.permission-group {
     max-width: 300px;
     background-color: var(--color-component-bg-200);

packages/admin-ui/src/lib/settings/src/components/role-detail/role-detail.component.html

@@ -60,7 +60,7 @@
             </vdr-card>
         </vdr-page-block>
     </vdr-page-detail-layout>
-    <vdr-page-block>
+    <vdr-page-block class="mt-2">
         <vdr-card [title]="'settings.permissions' | translate">
             <vdr-form-field [label]="'settings.channel' | translate">
                 <vdr-channel-assignment-control
@@ -69,6 +69,7 @@
                 ></vdr-channel-assignment-control>
             </vdr-form-field>
             <vdr-permission-grid
+                class="mt-2"
                 [permissionDefinitions]="permissionDefinitions"
                 [activePermissions]="detailForm.get('permissions')?.value"
                 (permissionChange)="setPermission($event)"

packages/admin-ui/src/lib/static/i18n-messages/cs.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "Smazat {count} {count, plural, one {médium} few {média} other {médií}}?",
-    "confirm-delete-collection": "Smazat kolekci?",
-    "confirm-delete-collection-and-children-body": "Deleting this collection will also delete all child collections",
     "confirm-delete-facet-value": "Smazat hodnotu atributu?",
     "confirm-delete-product": "Smazat produkt?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Přetáhněte soubory k nahrávání",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Hodnoty volby",
     "out-of-stock-threshold": "Prahová hodnota pro vyprodání zásob",
     "out-of-stock-threshold-tooltip": "Nastaví hodnotu skladu, při které je tato varianta považována za vyprodanou. Použití záporné hodnoty umožňuje objednávat \"na objednávku\".",
+    "page-description-options-editor": "",
     "price": "Cena",
     "price-and-tax": "",
     "price-conversion-factor": "Přepočítávací koeficient ceny",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Zpracováno",
     "customer": "Zákazník",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Upravit fakturační adresu",
     "edit-shipping-address": "Upravit dodací adresu",
     "error-message": "",

packages/admin-ui/src/lib/static/i18n-messages/de.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "{count} {count, plural, one {Asset} other {Assets}} löschen?",
-    "confirm-delete-collection": "Sammlung löschen?",
-    "confirm-delete-collection-and-children-body": "Wenn Sie diese Sammlung löschen, werden auch alle untergeordneten Sammlungen gelöscht.",
     "confirm-delete-facet-value": "Facettenwert löschen?",
     "confirm-delete-product": "Produkt löschen?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Dateien zum Hochladen ablegen",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Optionswerte",
     "out-of-stock-threshold": "Ausverkauft-Grenze",
     "out-of-stock-threshold-tooltip": "Legt fest, ab welcher Untergrenze ein Produkt als ausverkauft angezeigt wird. Ein negativer Wert kann verwendet werden, um mit einer Fehlmenge zu arbeiten.",
+    "page-description-options-editor": "",
     "price": "Preis",
     "price-and-tax": "",
     "price-conversion-factor": "Preisumwandlungsfaktor",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Auftrag ausgeführt",
     "customer": "Kunde",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Rechnungsadresse bearbeiten",
     "edit-shipping-address": "Versandadresse bearbeiten",
     "error-message": "",

packages/admin-ui/src/lib/static/i18n-messages/en.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "Delete {count} products?",
     "confirm-cancel": "Cancel?",
     "confirm-delete-assets": "Delete {count} {count, plural, one {asset} other {assets}}?",
-    "confirm-delete-collection": "Delete collection?",
-    "confirm-delete-collection-and-children-body": "Deleting this collection will also delete all child collections",
     "confirm-delete-facet-value": "Delete facet value?",
     "confirm-delete-product": "Delete product?",
     "confirm-delete-product-option": "Delete product option \"{name}\"?",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "Create new stock location",
     "create-product-option-group": "Create product option group",
     "create-product-variant": "Create product variant",
+    "default-currency": "Default currency",
     "do-not-inherit-filters": "Do not inherit filters",
     "drop-files-to-upload": "Drop files to upload",
     "edit-facet-values": "Edit facet values",
@@ -131,6 +130,7 @@
     "option-values": "Option values",
     "out-of-stock-threshold": "Out-of-stock threshold",
     "out-of-stock-threshold-tooltip": "Sets the stock level at which this variant is considered to be out of stock. Using a negative value enables backorder support.",
+    "page-description-options-editor": "Edit the names & codes of the options for this product. To add or remove options, use the \"manage variants\" button below the product variant list.",
     "price": "Price",
     "price-and-tax": "Price and tax",
     "price-conversion-factor": "Price conversion factor",
@@ -517,7 +517,6 @@
     "amount": "Amount",
     "arrange-additional-payment": "Arrange additional payment",
     "billing-address": "Billing address",
-    "draft-order": "Draft order",
     "cancel": "Cancel",
     "cancel-entire-order": "Cancel entire order",
     "cancel-fulfillment": "Cancel fulfillment",
@@ -537,6 +536,7 @@
     "create-fulfillment-success": "Created fulfillment",
     "customer": "Customer",
     "delete-draft-order": "Delete draft",
+    "draft-order": "Draft order",
     "edit-billing-address": "Edit billing address",
     "edit-shipping-address": "Edit shipping address",
     "error-message": "Error message",

packages/admin-ui/src/lib/static/i18n-messages/es.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "¿Eliminar recurso?",
-    "confirm-delete-collection": "¿Eliminar colección?",
-    "confirm-delete-collection-and-children-body": "Eliminar esta colección también eliminará las sub-colecciones",
     "confirm-delete-facet-value": "¿Eliminar valor de faceta?",
     "confirm-delete-product": "¿Eliminar producto?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Arrastra recursos para subirlos",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Valores de la opción",
     "out-of-stock-threshold": "Límite de agotamiento de existencias",
     "out-of-stock-threshold-tooltip": "Fija el nivel de existencias a partir del cual se considera que esta variante está agotada. El uso de un valor negativo activa el soporte de pedidos pendientes.",
+    "page-description-options-editor": "",
     "price": "Precio",
     "price-and-tax": "",
     "price-conversion-factor": "Factor de conversión de precio",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Fulfillment creado",
     "customer": "Cliente",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Editar dirección de facturación",
     "edit-shipping-address": "Editar dirección de envío",
     "error-message": "Mensaje de error",

packages/admin-ui/src/lib/static/i18n-messages/fr.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "Supprimer {count} {count, plural, one {fichier} other {fichiers}} ?",
-    "confirm-delete-collection": "Supprimer collection ?",
-    "confirm-delete-collection-and-children-body": "Supprimer cette collection va aussi supprimer toutes les collections enfants",
     "confirm-delete-facet-value": "Supprimer valeur du composant ?",
     "confirm-delete-product": "Supprimer produit ?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Déposer des fichiers pour téléverser",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Valeurs de l'option",
     "out-of-stock-threshold": "Limite de la rupture de stock",
     "out-of-stock-threshold-tooltip": "Régler le niveau de stock à partir duquel la variante est considéré en rupture de stock. Renseigner une valeur négative permet d'accepter des commandes en attente.",
+    "page-description-options-editor": "",
     "price": "Prix",
     "price-and-tax": "",
     "price-conversion-factor": "Facteur de conversion du prix",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Préparation créée",
     "customer": "Client",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Modifier l'adresse de facturation",
     "edit-shipping-address": "Modifier l'adresse de livraison",
     "error-message": "Message d'erreur",

packages/admin-ui/src/lib/static/i18n-messages/it.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "Eliminare {count} {count, plural, one {media} other {media}}?",
-    "confirm-delete-collection": "Eliminare la collezione?",
-    "confirm-delete-collection-and-children-body": "Eliminare questa collezione rimuoverà anche le sue sotto-collezioni",
     "confirm-delete-facet-value": "Eliminare il valore attributo?",
     "confirm-delete-product": "Eliminare il prodotto?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Trascina file da caricare",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Valori opzione",
     "out-of-stock-threshold": "Soglia prodotto esaurito",
     "out-of-stock-threshold-tooltip": "Imposta la soglia di scorte alla quale il prodotto è considerato non disponibile alla vendita. Utilizzando un valore negativo si abilitano gli ordini anche fuori scorta.",
+    "page-description-options-editor": "",
     "price": "Prezzo",
     "price-and-tax": "",
     "price-conversion-factor": "Fattore di conversione del prezzo",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Consegna creata",
     "customer": "Cliente",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Modifica indirizzo di fatturazione",
     "edit-shipping-address": "Modifica indirizzo di spedizione",
     "error-message": "Messaggio di errore",

packages/admin-ui/src/lib/static/i18n-messages/pl.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "",
-    "confirm-delete-collection": "Usunąć kolekcje?",
-    "confirm-delete-collection-and-children-body": "Usunięcie tej kolekcji spowoduje usunięcie także podkategorii",
     "confirm-delete-facet-value": "Usunąć wartość faseta?",
     "confirm-delete-product": "Usunąć produkt?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Upuść pliki do uploadu",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Wartość opcji",
     "out-of-stock-threshold": "",
     "out-of-stock-threshold-tooltip": "",
+    "page-description-options-editor": "",
     "price": "Cena",
     "price-and-tax": "",
     "price-conversion-factor": "Przelicznik cen",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Utworzono wypełnienie pomyślnie",
     "customer": "Klient",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "",
     "edit-shipping-address": "",
     "error-message": "",

packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "Excluir {count} {count, plural, one {asset} other {assets}}?",
-    "confirm-delete-collection": "Excluir categorias?",
-    "confirm-delete-collection-and-children-body": "A exclusão desta categoria também excluirá todas as categorias filho",
     "confirm-delete-facet-value": "Excluir valor da etiqueta?",
     "confirm-delete-product": "Excluir produto?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Soltar arquivos para envio",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Valor da opção",
     "out-of-stock-threshold": "Limite reserva de fora de estoque",
     "out-of-stock-threshold-tooltip": "Define o nível de estoque no qual essa variação é considerada sem estoque. Usar um valor negativo ativa o suporte a pedidos em espera.",
+    "page-description-options-editor": "",
     "price": "Preço",
     "price-and-tax": "",
     "price-conversion-factor": "Fator de conversão de preço",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Execução criada",
     "customer": "Cliente",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Editar endereço de fatura",
     "edit-shipping-address": "Editar endereço de envio",
     "error-message": "",

packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "Eliminar {count} {count, plural, one {imagem} other {imagens}}?",
-    "confirm-delete-collection": "Eliminar categorias?",
-    "confirm-delete-collection-and-children-body": "Ao eliminar a categoria, todas as categorias filho serão eliminadas",
     "confirm-delete-facet-value": "Eliminar valor da etiqueta?",
     "confirm-delete-product": "Eliminar produto?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Colocar ficheiros para enviar",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Valor da opção",
     "out-of-stock-threshold": "Limite para fora de estoque",
     "out-of-stock-threshold-tooltip": "Define o limite para a variante ser considerada sem estoque. Usar um valor negativo activa o suporte a pedidos pendentes.",
+    "page-description-options-editor": "",
     "price": "Preço",
     "price-and-tax": "",
     "price-conversion-factor": "Factor de conversão de preço",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "O processo entrega foi criado com sucesso",
     "customer": "Cliente",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Editar morada de faturação",
     "edit-shipping-address": "Editar morada de entrega",
     "error-message": "Mensagem de erro",

packages/admin-ui/src/lib/static/i18n-messages/ru.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "Удалить {count} {count, plural, one {медиа-объект} other {медиа-объектов}}?",
-    "confirm-delete-collection": "Удалить коллекцию?",
-    "confirm-delete-collection-and-children-body": "Удаление этой коллекции также приведет к удалению всех дочерних коллекций.",
     "confirm-delete-facet-value": "Удалить значение тега?",
     "confirm-delete-product": "Удалить товар?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Перетащите файлы для загрузки",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Значение опции",
     "out-of-stock-threshold": "Порог «нет в наличии»",
     "out-of-stock-threshold-tooltip": "Установите порог остатков на складе, после которого будет считаться, что варианта товара нет в наличии. При использовании отрицательного значения порога, включается поддержка предзаказа.",
+    "page-description-options-editor": "",
     "price": "Цена",
     "price-and-tax": "",
     "price-conversion-factor": "Коэффициент пересчета цены",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Созданное выполнение",
     "customer": "Клиент",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Изменить платежный адрес",
     "edit-shipping-address": "Изменить адрес доставки",
     "error-message": "Сообщение об ошибке",

packages/admin-ui/src/lib/static/i18n-messages/uk.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "Видалити {count} {count, plural, one {медіа-об'єкт} other {медіа-об'єктів}}?",
-    "confirm-delete-collection": "Видалити колекцію?",
-    "confirm-delete-collection-and-children-body": "Видалення цієї колекції також призведе до видалення всіх дочірніх колекцій.",
     "confirm-delete-facet-value": "Видалити значення тегу?",
     "confirm-delete-product": "Видалити товар?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "Перетягніть файли для завантаження",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "Значення опції",
     "out-of-stock-threshold": "Поріг «немає в наявності»",
     "out-of-stock-threshold-tooltip": "Встановіть поріг залишків на складі, після якого буде вважатися, що варіанту товару немає в наявності. При використанні від'ємного значення порога, включається підтримка попереднього замовлення.",
+    "page-description-options-editor": "",
     "price": "Ціна",
     "price-and-tax": "",
     "price-conversion-factor": "Коефіцієнт перерахунку ціни",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "Створене виконання",
     "customer": "Клієнт",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "Змінити платіжну адресу",
     "edit-shipping-address": "Змінити адресу доставки",
     "error-message": "Повідомлення про помилку",

packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "确认删除{count}个资源吗？",
-    "confirm-delete-collection": "确认删除商品系列吗?",
-    "confirm-delete-collection-and-children-body": "删除这个系列会删除它所包含的子系列，确认删除码?",
     "confirm-delete-facet-value": "确认删除特征值?",
     "confirm-delete-product": "确认删除商品?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "拖拽文件上传",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "规格列表（按回车键添加）",
     "out-of-stock-threshold": "售空限制",
     "out-of-stock-threshold-tooltip": "当此规格产品库存值低于此限制时，产品将为售空状态。设置为负数设置此规格产品为缺货状态。",
+    "page-description-options-editor": "",
     "price": "价格",
     "price-and-tax": "",
     "price-conversion-factor": "价格换算因数",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "确认配货成功",
     "customer": "客户",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "编辑账单地址",
     "edit-shipping-address": "编辑邮寄地址",
     "error-message": "错误消息",

packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json

@@ -78,8 +78,6 @@
     "confirm-bulk-delete-products": "",
     "confirm-cancel": "",
     "confirm-delete-assets": "",
-    "confirm-delete-collection": "確認移除商品系列吗?",
-    "confirm-delete-collection-and-children-body": "移除這個系列會移除它所包含的子系列，確認移除嗎?",
     "confirm-delete-facet-value": "確認移除特徵值?",
     "confirm-delete-product": "確認移除商品?",
     "confirm-delete-product-option": "",
@@ -95,6 +93,7 @@
     "create-new-stock-location": "",
     "create-product-option-group": "",
     "create-product-variant": "",
+    "default-currency": "",
     "do-not-inherit-filters": "",
     "drop-files-to-upload": "拖拽文件上傳",
     "edit-facet-values": "",
@@ -131,6 +130,7 @@
     "option-values": "規格列表（按輸入鍵新增）",
     "out-of-stock-threshold": "",
     "out-of-stock-threshold-tooltip": "",
+    "page-description-options-editor": "",
     "price": "價格",
     "price-and-tax": "",
     "price-conversion-factor": "價格轉換係數",
@@ -536,6 +536,7 @@
     "create-fulfillment-success": "確認配貨成功",
     "customer": "客户",
     "delete-draft-order": "",
+    "draft-order": "",
     "edit-billing-address": "",
     "edit-shipping-address": "",
     "error-message": "",

packages/admin-ui/src/lib/static/styles/global/_buttons.scss

@@ -15,7 +15,8 @@
         0px 2px 6px rgba(0, 0, 0, 0.03), 0px 2px 11px rgba(0, 0, 0, 0.04);
     background-color: var(--color-button-bg);
     color: var(--color-weight-700);
-    &:link, &:visited {
+    &:link,
+    &:visited {
         color: var(--color-weight-700);
     }
     &:disabled {
@@ -83,7 +84,7 @@ a.button-ghost:hover {
 }
 
 .button-small {
-    display: flex;
+    display: inline-flex;
     white-space: nowrap;
     flex-direction: row;
     justify-content: flex-end;
@@ -97,15 +98,8 @@ a.button-ghost:hover {
     border: none;
     border-radius: var(--border-radius-lg);
     cursor: pointer;
-    &.primary {
-        &:not(:disabled) {
-            background-color: var(--color-primary-700);
-            color: white;
-            &:hover {
-                background-color: var(--color-primary-800);
-                color: white;
-            }
-        }
+    &:not(:disabled):hover {
+        background-color: var(--color-button-small-hover-bg);
     }
 }
 a.button-small:link,

packages/admin-ui/src/lib/static/styles/theme/dark.scss

@@ -76,6 +76,7 @@
     --color-button-ghost-hover-text: var(--color-primary-100);
     --color-button-ghost-hover-bg: var(--color-weight-200);
     --color-button-small-bg: var(--color-weight-150);
+    --color-button-small-hover-bg: var(--color-weight-200);
     --color-button-small-text: var(--color-weight-700);
 
     --color-channel-switcher-bg: var(--color-weight-125);

packages/admin-ui/src/lib/static/styles/theme/default.scss

@@ -144,6 +144,7 @@
     --color-button-ghost-hover-text: var(--color-primary-700);
     --color-button-ghost-hover-bg: var(--color-primary-100);
     --color-button-small-bg: var(--color-weight-150);
+    --color-button-small-hover-bg: var(--color-weight-200);
     --color-button-small-text: var(--color-weight-700);
 
     --color-channel-switcher-bg: var(--color-weight-150);