feat(admin-ui): Enable theming by use of css custom properties

Relates to #391
vendure-ecommerce · Jan 7, 2021 · 68107d2 · 68107d2
1 parent 165cac3
commit 68107d2
Show file tree

Hide file tree

Showing 110 changed files with 920 additions and 316 deletions.
diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json
@@ -29,10 +29,10 @@
     "@angular/router": "10.1.4",
     "@apollo/client": "^3.0.0",
     "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-    "@clr/angular": "^4.0.3",
-    "@clr/core": "^4.0.3",
-    "@clr/icons": "^4.0.3",
-    "@clr/ui": "^4.0.3",
+    "@clr/angular": "^4.0.8",
+    "@clr/core": "^4.0.8",
+    "@clr/icons": "^4.0.8",
+    "@clr/ui": "^4.0.8",
     "@ng-select/ng-select": "^5.0.3",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",

diff --git a/packages/admin-ui/scripts/compile-styles.js b/packages/admin-ui/scripts/compile-styles.js
@@ -6,7 +6,7 @@ const sass = require('sass');
 // non-Angular ui extensions.
 const outFile = path.join(__dirname, '../package/static/theme.min.css');
 const result = sass.renderSync({
-    file: path.join(__dirname, '../src/lib/static/styles/theme.scss'),
+    file: path.join(__dirname, '../src/lib/static/styles/ui-extension-theme.scss'),
     importer,
     includePaths: [path.join(__dirname, '../src/lib/static/styles')],
     outputStyle: 'compressed',
@@ -15,7 +15,6 @@ const result = sass.renderSync({
 
 fs.writeFileSync(outFile, result.css, 'utf8');
 
-
 function importer(url, prev, done) {
     let file = url;
     // Handle the imports prefixed with ~

diff --git a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.html b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.html
@@ -5,7 +5,7 @@
             name="searchTerm"
             [formControl]="searchTerm"
             [placeholder]="'asset.search-asset-name' | translate"
-            class="search-input"
+            class="search-input ml3"
         />
     </vdr-ab-left>
     <vdr-ab-right>

diff --git a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.scss b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 :host {
     display: flex;
@@ -12,7 +11,7 @@ vdr-asset-gallery {
 
 .paging-controls {
     padding-top: 6px;
-    border-top: 1px solid var(--color-grey-200);
+    border-top: 1px solid var(--color-component-border-100);
     display: flex;
     justify-content: space-between;
 }

diff --git a/...onents/assign-products-to-channel-dialog/assign-products-to-channel-dialog.component.scss b/...onents/assign-products-to-channel-dialog/assign-products-to-channel-dialog.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 vdr-channel-assignment-control {
     min-width: 200px;

diff --git a/...-ui/src/lib/catalog/src/components/collection-contents/collection-contents.component.scss b/...-ui/src/lib/catalog/src/components/collection-contents/collection-contents.component.scss
@@ -1,12 +1,11 @@
-@import "variables";
 
 .contents-header {
-    background-color: var(--color-grey-100);
+    background-color: var(--color-component-bg-100);
     position: sticky;
     top: 0;
     padding: 6px;
     z-index: 1;
-    border-bottom: 1px solid var(--color-grey-300);
+    border-bottom: 1px solid var(--color-component-border-200);
 
     .header-title-row {
         display: flex;

diff --git a/...es/admin-ui/src/lib/catalog/src/components/collection-list/collection-list.component.html b/...es/admin-ui/src/lib/catalog/src/components/collection-list/collection-list.component.html
@@ -1,6 +1,6 @@
 <vdr-action-bar>
     <vdr-ab-left>
-        <clr-checkbox-wrapper class="expand-all-toggle">
+        <clr-checkbox-wrapper class="expand-all-toggle ml3">
             <input type="checkbox" clrCheckbox [(ngModel)]="expandAll" />
             <label>{{ 'catalog.expand-all-collections' | translate }}</label>
         </clr-checkbox-wrapper>

diff --git a/...es/admin-ui/src/lib/catalog/src/components/collection-list/collection-list.component.scss b/...es/admin-ui/src/lib/catalog/src/components/collection-list/collection-list.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 :host {
     height: 100%;
@@ -48,7 +47,7 @@
 
 .paging-controls {
     padding-top: 6px;
-    border-top: 1px solid var(--color-grey-200);
+    border-top: 1px solid var(--color-component-border-100);
     display: flex;
     justify-content: space-between;
 }
diff --git a/...min-ui/src/lib/catalog/src/components/collection-tree/collection-tree-node.component.scss b/...min-ui/src/lib/catalog/src/components/collection-tree/collection-tree-node.component.scss
@@ -1,30 +1,28 @@
-@import "variables";
 
 :host {
     display: block;
 }
 .collection {
-    background-color: white;
+    background-color: var(--color-component-bg-100);
     font-size: 0.65rem;
-    color: rgba(0, 0, 0, 0.87);
     transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
     margin-bottom: 2px;
     border-left: 2px solid transparent;
     transition: border-left-color 0.2s;
 
     &.private {
-        background-color: var(--color-grey-200);
+        background-color: var(--color-component-bg-200);
     }
 
     .collection-detail {
         padding: 6px 12px;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        border-bottom: 1px solid var(--color-grey-200);
+        border-bottom: 1px solid var(--color-component-border-100);
 
         &.active {
-            background-color: var(--color-grey-200);
+            background-color: var(--clr-global-selection-color);
         }
 
         &.depth-1 { padding-left: 12px + 24px; }
@@ -41,7 +39,7 @@
 
 .tree-node {
     display: block;
-    background: white;
+    background: var(--color-component-bg-100);
     overflow: hidden;
     &.cdk-drop-list-dragging {
         > .collection {
@@ -52,7 +50,7 @@
 
 .drag-placeholder {
     min-height: 120px;
-    background-color: var(--color-grey-300);
+    background-color: var(--color-component-bg-300);
     transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
 }
 

diff --git a/packages/admin-ui/src/lib/catalog/src/components/facet-detail/facet-detail.component.scss b/packages/admin-ui/src/lib/catalog/src/components/facet-detail/facet-detail.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 .visible-toggle {
     margin-top: -3px !important;

diff --git a/packages/admin-ui/src/lib/catalog/src/components/facet-list/facet-list.component.scss b/packages/admin-ui/src/lib/catalog/src/components/facet-list/facet-list.component.scss
@@ -1,7 +1,6 @@
-@import "variables";
 
 td {
     &.private {
-        background-color: var(--color-grey-200);
+        background-color: var(--color-component-bg-200);
     }
 }
diff --git a/...catalog/src/components/generate-product-variants/generate-product-variants.component.scss b/...catalog/src/components/generate-product-variants/generate-product-variants.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 :host {
     display: block;
@@ -21,7 +20,7 @@
 .variants-preview {
     tr.disabled {
         td {
-            background-color: var(--color-grey-100);
+            background-color: var(--color-component-bg-100);
             color: var(--color-grey-400);
         }
     }

diff --git a/...in-ui/src/lib/catalog/src/components/option-value-input/option-value-input.component.scss b/...in-ui/src/lib/catalog/src/components/option-value-input/option-value-input.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 .input-wrapper {
     background-color: white;
@@ -25,7 +24,7 @@
             outline: none;
         }
         &:disabled {
-            background-color: var(--color-grey-100);
+            background-color: var(--color-component-bg-100);
         }
     }
 }

diff --git a/...ages/admin-ui/src/lib/catalog/src/components/product-assets/product-assets.component.scss b/...ages/admin-ui/src/lib/catalog/src/components/product-assets/product-assets.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 :host {
     width: 340px;
@@ -15,7 +14,7 @@
 
 .featured-asset {
     text-align: center;
-    background: var(--color-grey-200);
+    background: var(--color-component-bg-200);
     padding: 6px;
     cursor: pointer;
 
@@ -42,7 +41,7 @@
     .asset-thumb {
         margin: 3px;
         padding: 0;
-        border: 2px solid var(--color-grey-200);
+        border: 2px solid var(--color-component-border-100);
         cursor: pointer;
 
         &.featured {
@@ -67,7 +66,7 @@
     align-items: center;
     justify-content: center;
     width: 50px;
-    background-color: var(--color-grey-100);
+    background-color: var(--color-component-bg-100);
     opacity: 0.9;
     box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
     0 8px 10px 1px rgba(0, 0, 0, 0.14),
@@ -79,7 +78,7 @@
     width: 60px;
     height: 50px;
     .asset-thumb {
-        background-color: var(--color-grey-300);
+        background-color: var(--color-component-bg-300);
         height: 100%;
         width: 54px;
     }

diff --git a/...ages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.scss b/...ages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 :host {
     ::ng-deep {
@@ -21,7 +20,8 @@ vdr-action-bar clr-toggle-wrapper {
         border-radius: 3px 0 0 3px !important;
     }
     .icon-button {
-        border: 1px solid var(--color-grey-300);
+        border: 1px solid var(--color-component-border-300);
+        background-color: var(--color-component-bg-100);
         border-radius: 0 3px 3px 0;
         border-left: none;
     }

diff --git a/packages/admin-ui/src/lib/catalog/src/components/product-list/product-list.component.html b/packages/admin-ui/src/lib/catalog/src/components/product-list/product-list.component.html
@@ -7,7 +7,7 @@
                 (searchTermChange)="setSearchTerm($event)"
                 (facetValueChange)="setFacetValueIds($event)"
             ></vdr-product-search-input>
-            <vdr-dropdown class="search-settings-menu">
+            <vdr-dropdown class="search-settings-menu mr3">
                 <button type="button" class="icon-button" vdrDropdownTrigger>
                     <clr-icon shape="cog"></clr-icon>
                 </button>

diff --git a/packages/admin-ui/src/lib/catalog/src/components/product-list/product-list.component.scss b/packages/admin-ui/src/lib/catalog/src/components/product-list/product-list.component.scss
@@ -3,7 +3,7 @@
 .image-placeholder {
     width: 50px;
     height: 50px;
-    background-color: var(--color-grey-200);
+    background-color: var(--color-component-bg-200);
     .placeholder {
         text-align: center;
         color: var(--color-grey-300);
@@ -25,5 +25,5 @@
     margin: 0 12px;
 }
 td.disabled {
-    background-color: var(--color-grey-200);
+    background-color: var(--color-component-bg-200);
 }
diff --git a/...i/src/lib/catalog/src/components/product-search-input/product-search-input.component.scss b/...i/src/lib/catalog/src/components/product-search-input/product-search-input.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 @import "mixins";
 
 :host {
@@ -19,10 +18,10 @@ ng-select {
 
 .search-header {
     padding: 8px 10px;
-    border-bottom: 1px solid var(--color-grey-200);
+    border-bottom: 1px solid var(--color-component-border-100);
     cursor: pointer;
 
     &.selected, &:hover {
-        background-color: var(--color-grey-200);
+        background-color: var(--color-component-bg-200);
     }
 }
diff --git a/...lib/catalog/src/components/product-variants-editor/product-variants-editor.component.scss b/...lib/catalog/src/components/product-variants-editor/product-variants-editor.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 .option-groups {
     display: flex;
@@ -15,7 +14,7 @@
 .variants-preview {
     tr.disabled {
         td {
-            background-color: var(--color-grey-100);
+            background-color: var(--color-component-bg-100);
             color: var(--color-grey-400);
         }
     }

diff --git a/...src/lib/catalog/src/components/product-variants-list/product-variants-list.component.scss b/...src/lib/catalog/src/components/product-variants-list/product-variants-list.component.scss
@@ -4,7 +4,7 @@
     display: flex;
     min-height: 52px;
     align-items: center;
-    border: 1px solid var(--color-grey-200);
+    border: 1px solid var(--color-component-border-100);
     border-radius: 3px;
     padding: 6px 18px;
 
@@ -21,7 +21,7 @@
     transition: background-color 0.2s;
     min-height: 330px;
     &.disabled {
-        background-color: var(--color-grey-200);
+        background-color: var(--color-component-bg-200);
     }
     .header-row {
         display: flex;
@@ -118,7 +118,7 @@
     }
 
     .option-group-name {
-        color: var(--color-grey-400);
+        color: var(--color-text-200);
         text-transform: uppercase;
         font-size: 10px;
         margin-right: 3px;

diff --git a/...c/lib/catalog/src/components/product-variants-table/product-variants-table.component.scss b/...c/lib/catalog/src/components/product-variants-table/product-variants-table.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 .placeholder {
     color: var(--color-grey-300);
@@ -13,6 +12,6 @@
 td {
     transition: background-color 0.2s;
     &.disabled {
-        background-color: var(--color-grey-200);
+        background-color: var(--color-component-bg-200);
     }
 }
diff --git a/packages/admin-ui/src/lib/core/src/app.component.scss b/packages/admin-ui/src/lib/core/src/app.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 .progress {
     position: absolute;
     overflow: hidden;

diff --git a/packages/admin-ui/src/lib/core/src/common/utilities/string-to-color.ts b/packages/admin-ui/src/lib/core/src/common/utilities/string-to-color.ts
@@ -3,32 +3,22 @@
  */
 export function stringToColor(input: string): string {
     if (!input || input === '') {
-        return '#fff';
+        return 'var(--color-component-bg-100)';
     }
     const safeColors = [
-        // '#FF4343',
-        // '#9A0089',
-        // '#881798',
         '#10893E',
         '#107C10',
         '#7E735F',
         '#2F5646',
-        // '#D13438',
-        // '#C239B3',
-        // '#B146C2',
         '#498205',
         '#847545',
-        // '#EF6950',
-        // '#BF0077',
         '#744DA9',
         '#018574',
         '#486860',
         '#525E54',
         '#647C64',
         '#567C73',
-        // '#DA3B01',
         '#8764B8',
-        // '#C30052',
         '#515C6B',
         '#4A5459',
         '#69797E',

diff --git a/packages/admin-ui/src/lib/core/src/components/breadcrumb/breadcrumb.component.scss b/packages/admin-ui/src/lib/core/src/components/breadcrumb/breadcrumb.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 :host {
     display: block;

diff --git a/...ges/admin-ui/src/lib/core/src/components/channel-switcher/channel-switcher.component.scss b/...ges/admin-ui/src/lib/core/src/components/channel-switcher/channel-switcher.component.scss
@@ -1,4 +1,3 @@
-@import "variables";
 
 :host {
     display: flex;