Skip to content

Commit

Permalink
Merge branch 'admin-ui-rtl' into minor
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbromley committed Aug 7, 2023
2 parents ccba590 + 056d205 commit e197bc1
Show file tree
Hide file tree
Showing 72 changed files with 378 additions and 232 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* **core** Improved CockroachDB compatibility for DefaultSearchPlugin ([b8d8dec](https://github.com/vendure-ecommerce/vendure/commit/b8d8dec))
* **core** Publish AccountRegistrationEvent when creating Customer via admin ([e0bd036](https://github.com/vendure-ecommerce/vendure/commit/e0bd036))
* **core** Use MoneyStrategy in Surcharges (#2294) ([efee8ec](https://github.com/vendure-ecommerce/vendure/commit/efee8ec)), closes [#2294](https://github.com/vendure-ecommerce/vendure/issues/2294)
* **payments-plugin**: Only find payment methods in the current channel ([bbea69](https://github.com/vendure-ecommerce/vendure/commit/bbea69)), closes [#2308](https://github.com/vendure-ecommerce/vendure/issues/2308)

#### Features

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import 'variables';

.bulk-actions {
margin-left: calc(var(--space-unit) * 6);
margin-inline-start: calc(var(--space-unit) * 6);
@media screen and (min-width: $breakpoint-medium) {
margin-left: calc(var(--space-unit) * 9.5);
margin-inline-start: calc(var(--space-unit) * 9.5);
}
@media screen and (min-width: $breakpoint-large) {
margin-left: calc(var(--space-unit) * 11.5);
margin-inline-start: calc(var(--space-unit) * 11.5);
}
background-color: var(--color-surface-bg);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ clr-checkbox-wrapper {
li {
font-size: 0.65rem;
display: inline-block;
margin-right: 10px;
margin-inline-end: 10px;
}
li:not(:last-child)::after {
content: '';
top: 0;
color: var(--color-grey-400);
margin-left: 10px;
margin-inline-start: 10px;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
--indent-spacing: 18px;
}
.indent-1 {
padding-left: var(--indent-spacing);
padding-inline-start: var(--indent-spacing);
}
.indent-2 {
padding-left: calc(var(--indent-spacing) * 2);
padding-inline-start: calc(var(--indent-spacing) * 2);
}
.indent-3 {
padding-left: calc(var(--indent-spacing) * 3);
padding-inline-start: calc(var(--indent-spacing) * 3);
}
.indent-4, .indent-5, .indent-6, .indent-7, .indent-8, .indent-9 {
padding-left: calc(var(--indent-spacing) * 4);
padding-inline-start: calc(var(--indent-spacing) * 4);
}
.child-arrow {
margin: 1px 6px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
font-size: 0.65rem;
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
margin-bottom: 2px;
border-left: 2px solid transparent;
border-inline-start: 2px solid transparent;
transition: border-left-color 0.2s;

&.private {
Expand All @@ -26,10 +26,10 @@
background-color: var(--clr-global-selection-color);
}

&.depth-1 { padding-left: 12px + 24px; }
&.depth-2 { padding-left: 12px + 48px; }
&.depth-3 { padding-left: 12px + 72px; }
&.depth-4 { padding-left: 12px + 96px; }
&.depth-1 { padding-inline-start: 12px + 24px; }
&.depth-2 { padding-inline-start: 12px + 48px; }
&.depth-3 { padding-inline-start: 12px + 72px; }
&.depth-4 { padding-inline-start: 12px + 96px; }

.folder-button-spacer {
display: inline-block;
Expand Down Expand Up @@ -83,7 +83,7 @@

.move-icon {
flex: none;
margin-right: 3px;
margin-inline-end: 3px;
}
.path {
line-height: 18px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ vdr-action-bar clr-toggle-wrapper {
border: 1px solid var(--color-component-border-300);
background-color: var(--color-component-bg-100);
border-radius: 0 3px 3px 0;
border-left: none;
border-inline-start: none;
}
}

.group-name {
padding-right: 6px;
padding-inline-end: 6px;
}

.view-mode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ td.disabled {
}
}
.edit-button {
margin-right: 24px;
margin-inline-end: 24px;
}
.sku {
color: var(--color-text-300);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

vdr-product-variant-quick-jump {
flex: 1;
margin-right: calc(var(--space-unit) * 2);
margin-inline-end: calc(var(--space-unit) * 2);
}
.stock-levels, .prices {
margin-top: calc(var(--space-unit) * 2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ td.disabled {
}
}
.edit-button {
margin-right: 24px;
margin-inline-end: 24px;
}
.sku {
color: var(--color-text-300);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
flex-direction: column;
overflow: hidden;
height: 100%;
border-right: 1px solid var(--color-weight-150);
border-inline-end: 1px solid var(--color-weight-150);
z-index: 2;
width: var(--left-nav-width);
max-width: var(--left-nav-width);
Expand Down Expand Up @@ -87,7 +87,7 @@

.wordmark {
font-weight: bold;
margin-left: 12px;
margin-inline-start: 12px;
font-size: 24px;
color: var(--color-primary-500);
@media screen and (max-width: $breakpoint-medium) {
Expand Down Expand Up @@ -115,7 +115,7 @@
justify-content: space-between;
min-width: 0;
padding: calc(var(--space-unit) * 2) calc(var(--space-unit) * 4);
padding-right: calc(var(--space-unit) * 1.5);
padding-inline-end: calc(var(--space-unit) * 1.5);
@media screen and (min-width: $breakpoint-medium) {
padding: calc(var(--space-unit) * 4);
}
Expand All @@ -130,7 +130,7 @@
background-color: var(--color-page-header);
@media screen and (min-width: $breakpoint-medium) {
padding: calc(var(--space-unit) * 4);
padding-left: var(--surface-margin-left);
padding-inline-start: var(--surface-margin-left);
}
}

Expand All @@ -140,7 +140,7 @@

.content-area {
position: relative;
margin-right: auto;
margin-inline-end: auto;
flex: 1;
display: block;
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ nav.main-nav {
display: flex;
align-items: flex-start;
justify-content: space-between;
padding-right: calc(var(--space-unit) * 4);
padding-inline-end: calc(var(--space-unit) * 4);
}
.nav-group-header {
display: block;
Expand All @@ -44,7 +44,7 @@ nav.main-nav {
display: flex;
align-items: center;
line-height: 100%;
border-right: 2px solid transparent;
border-inline-end: 2px solid transparent;
font-size: var(--font-size-sm);
padding: var(--space-unit) 0;
transition: border 0.1s, color 0.1s;
Expand Down Expand Up @@ -72,7 +72,7 @@ nav.main-nav {

.nav-list clr-icon {
flex-shrink: 0;
margin-right: var(--space-unit);
margin-inline-end: var(--space-unit);
}

.nav-group {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

clr-icon {
margin-right: 6px;
margin-inline-end: 6px;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
:host {
display: flex;
justify-content: center;
justify-content: start;
align-items: center;
}

button.theme-toggle {
position: relative;
padding-left: 20px;
padding-inline-start: 20px;
border: none;
background: transparent;
color: var(--clr-dropdown-item-color);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
width: 100%;
padding: var(--space-unit);
padding-left: 0;
padding-inline-start: 0;
vdr-dropdown {
width: 100%;
}
Expand Down Expand Up @@ -49,9 +49,9 @@
background-image: linear-gradient(135deg, var(--color-primary-500) 0%, var(--color-primary-700) 100%);
width: 24px;
height: 24px;
margin-right: 6px;
margin-inline-end: 6px;
@media screen and (max-width: $breakpoint-medium) {
margin-right: 0;
margin-inline-end: 0;
}

clr-icon {
Expand All @@ -60,7 +60,7 @@
}

.user-name {
margin-right: var(--space-unit);
margin-inline-end: var(--space-unit);
overflow: hidden;
max-width: 100px;
text-overflow: ellipsis;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

::ng-deep vdr-ab-right > *:last-child {
margin-right: 0px;
margin-inline-end: 0px;
}

@media screen and (min-width: $breakpoint-small) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
.prefix {
order: -1;
border-radius: 3px 0 0 3px;
border-right: none;
border-inline-end: none;
}

::ng-deep .has-suffix > {
Expand All @@ -42,5 +42,5 @@

.suffix {
border-radius: 0 3px 3px 0;
border-left: none;
border-inline-start: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ vdr-select-toggle {
transition: opacity 0.3s, visibility 0s;
}
ul {
text-align: left;
text-align: start;
list-style-type: none;
margin-left: 12px;
margin-inline-start: 12px;
li {
font-size: 12px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
.controls {
display: flex;
flex-direction: column;
margin-left: 12px;
margin-inline-start: 12px;
min-width: 15vw;
max-width: 25vw;
transition: opacity 0.3s;
Expand Down Expand Up @@ -85,7 +85,7 @@
display: flex;
align-items: center;
clr-select-container {
margin-right: 12px;
margin-inline-end: 12px;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05);

&.padding-x {
padding-left: var(--card-padding);
padding-right: var(--card-padding);
padding-inline-start: var(--card-padding);
padding-inline-end: var(--card-padding);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
}
}
::ng-deep .ng-value > vdr-channel-badge {
margin-left: 6px;
margin-inline-start: 6px;
}

.channel-label {
margin-right: 6px;
margin-inline-end: 6px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

clr-icon {
@media screen and (max-width: $breakpoint-medium) {
margin-right: 0;
margin-inline-end: 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}

.chip-icon {
border-left: 1px solid var(--color-component-border-200);
border-inline-start: 1px solid var(--color-component-border-200);
padding: 0 3px;
line-height: 1em;
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
flex-wrap: wrap;
align-items: center;
label {
margin-right: 6px;
margin-inline-end: 6px;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
}

clr-icon {
margin-right: 6px;
margin-inline-end: 6px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
color: var(--color-weight-600);
}
> input {
padding-left: 32px !important;
padding-inline-start: 32px !important;
width: 100%;
}
}
Loading

0 comments on commit e197bc1

Please sign in to comment.