Просмотр исходного кода

feat(admin-ui): Update Clarity to v3.rc

Michael Bromley 5 лет назад
Родитель
Сommit
f8b94b2da4

+ 7 - 5
packages/admin-ui/package.json

@@ -11,7 +11,8 @@
     "test": "ng test --watch=false --browsers=ChromeHeadlessCI --progress=false",
     "lint": "tslint --fix",
     "reset-extensions": "rimraf ./src/app/extensions/modules && rimraf ./src/app/extensions/*.generated && rimraf ./src/app/extensions/*.temp",
-    "extract-translations": "ngx-translate-extract --input ./src --output ./src/i18n-messages/en.json --clean --sort --format namespaced-json --format-indentation \"  \" -m _"
+    "extract-translations": "ngx-translate-extract --input ./src --output ./src/i18n-messages/en.json --clean --sort --format namespaced-json --format-indentation \"  \" -m _",
+    "postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
   },
   "publishConfig": {
     "access": "public"
@@ -30,9 +31,10 @@
     "@angular/platform-browser": "^9.0.2",
     "@angular/platform-browser-dynamic": "^9.0.2",
     "@angular/router": "^9.0.2",
-    "@clr/angular": "^2.1.0",
-    "@clr/icons": "^2.1.0",
-    "@clr/ui": "^2.1.0",
+    "@clr/angular": "^3.0.0-rc.1",
+    "@clr/core": "^3.0.0-rc.1",
+    "@clr/icons": "^3.0.0-rc.1",
+    "@clr/ui": "^3.0.0-rc.1",
     "@ng-select/ng-select": "^3.7.2",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
@@ -79,4 +81,4 @@
     "rimraf": "^3.0.0",
     "tslint": "^5.12.1"
   }
-}
+}

+ 1 - 0
packages/admin-ui/src/app/catalog/components/collection-tree/collection-tree-node.component.scss

@@ -5,6 +5,7 @@
 }
 .collection {
     background-color: white;
+    font-size: 0.65rem;
     color: rgba(0, 0, 0, 0.87);
     transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
     margin-bottom: 2px;

+ 0 - 5
packages/admin-ui/src/app/core/components/app-shell/app-shell.component.html

@@ -1,9 +1,4 @@
 <clr-main-container>
-    <!--
-        <div class="error error-app-level">
-            ALERT
-        </div>
-    -->
     <clr-header>
         <div class="branding">
             <a [routerLink]="['/']"><img src="assets/cube-logo-75px.png" class="logo" /></a>

+ 1 - 1
packages/admin-ui/src/app/core/components/app-shell/app-shell.component.scss

@@ -8,7 +8,7 @@
 }
 vdr-breadcrumb {
     @media screen and (min-width: $breakpoint-small){
-        margin-left: 9rem;
+        margin-left: 10.8rem;
     }
 }
 .content-area {

+ 2 - 2
packages/admin-ui/src/app/core/components/main-nav/main-nav.component.scss

@@ -1,14 +1,14 @@
 @import "variables";
 
 :host {
-    flex: 0 0 auto;
+    // flex: 0 0 auto;
     order: -1;
     background-color: $color-grey-200;
 }
 
 nav.sidenav {
     height: 100%;
-    width: auto;
+    width: 10.8rem;
 }
 
 .nav-list clr-icon {

+ 1 - 1
packages/admin-ui/src/styles/theme/_forms.scss

@@ -14,7 +14,7 @@
     position: relative;
     padding-left: 9.5rem;
     margin-bottom: .5rem;
-    font-size: .541667rem;
+    font-size: .65rem;
     letter-spacing: normal;
     line-height: 1rem;
 

+ 1 - 1
packages/admin-ui/tsconfig.json

@@ -13,7 +13,7 @@
     "strict": true,
     "noImplicitAny": false,
     "strictPropertyInitialization": false,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "typeRoots": [
       "node_modules/@types",

+ 70 - 14
yarn.lock

@@ -1072,22 +1072,41 @@
     typescript "^3.6.3"
     yargs "^14.0.0"
 
-"@clr/angular@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@clr/angular/-/angular-2.2.0.tgz#c6d03a1c629a6aea497d5f0cb0ee8bd26a658e61"
-  integrity sha512-+E93SBFlOZVQgZTD3lDsmdaSrv9ylE1r2siTDZeTqRtFz5W/NI055wFqVKAj3U3+/5kUYApeUEmfvSgE0cs80A==
-  dependencies:
-    tslib "^1.9.0"
+"@clr/angular@^3.0.0-rc.1":
+  version "3.0.0-rc.1"
+  resolved "https://registry.npmjs.org/@clr/angular/-/angular-3.0.0-rc.1.tgz#bdfcf6d6ffd667b0804ff9247dca493e03b1b955"
+  integrity sha512-Jsd6xz4HoVsQeo5RMQ9am53xod/c5rzMvx/EGWkromcGfITypbq1YtYvW9PeUUy3aE4oddh/ac2pP93y0QhKUQ==
 
-"@clr/icons@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@clr/icons/-/icons-2.2.0.tgz#cb52e05a8a8dc889c9c87505606c7fe4d8442455"
-  integrity sha512-6qh9ahGJqEpw5Mv/JvN5KMjb8A4puSgT4RkSSYJMhlk0sN/OVBz6b0I8o9KPhXYEJrZLQeK1H9PaeSdeVXb6mA==
+"@clr/city@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/@clr/city/-/city-1.1.0.tgz#4a444cd12c626d66ffadab27e9d09bb3c8eca352"
+  integrity sha512-R+C4uywmXoTD01LINOt3O0cBRviQdbAVNxdVvOyuO3+rM9bvFroF7UZY0R1ue/xvKXlqJrEkNKZQODeKjzaAhA==
+
+"@clr/core@^3.0.0-rc.1":
+  version "3.0.0-rc.1"
+  resolved "https://registry.npmjs.org/@clr/core/-/core-3.0.0-rc.1.tgz#592f77f097c0d9108a936c74d4989ff7cc9e68b6"
+  integrity sha512-duqg2mb2VGya1gTNPYCZ4Fqvcu4Dj7iAJ/m0hOZXJCoz718RNED++kg6y8qKi5jfrHAHqnmPdG/aYtW9/d3SJQ==
+  dependencies:
+    css-vars-ponyfill "^2.1.2"
+    lit-element "^2.2.1"
+    lit-html "^1.1.2"
+    ramda "^0.26.1"
+    tslib "^1.10.0"
+  optionalDependencies:
+    "@clr/city" "^1.0.0"
+    "@webcomponents/custom-elements" "^1.3.1"
+    "@webcomponents/shadycss" "^1.9.3"
+    "@webcomponents/webcomponentsjs" "^2.4.0"
 
-"@clr/ui@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@clr/ui/-/ui-2.2.0.tgz#d6d3730d94cf8b57e26c989dc91a80d966088eec"
-  integrity sha512-nJ7eVnvAcSy+3O0HsVB482xq4lh51cjw7qRsMIehnX8VVLtdq7Stq+Av/nsrL1b1NxlsRo4DCnNOd3C024jT/Q==
+"@clr/icons@^3.0.0-rc.1":
+  version "3.0.0-rc.1"
+  resolved "https://registry.npmjs.org/@clr/icons/-/icons-3.0.0-rc.1.tgz#151917834753bd1b1b0f70e5eb6671be9c6336ff"
+  integrity sha512-lhsk7z+gOgTk8GViwNtiNrZippGNBCM7oEJFz59oWaWJzOpK9Y86ixog8k+7BjZnGrxy4w+FEjisYipGvQYkRQ==
+
+"@clr/ui@^3.0.0-rc.1":
+  version "3.0.0-rc.1"
+  resolved "https://registry.npmjs.org/@clr/ui/-/ui-3.0.0-rc.1.tgz#1aaa73af65d22c674fe2da4d9a3d633874229951"
+  integrity sha512-Mlzyo0SRX1+44/B8upUs0CIr4wBJ+x+Qe9dgApKTmg8ztfq49omJEPtmEMqfvnzCvLzKk2W3fIJskZz+vPlFoA==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
@@ -3349,6 +3368,21 @@
   resolved "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.2.4.tgz#7074543155396114617722724d6f6cb7b3800a14"
   integrity sha512-WiTlgz6/kuwajYIcgyq64rSlCtb2AvbxwwrExP3wr6rKbJ72I3hi/sb4KdGUumfC+isDn2F0btZGk4MnWpyO1Q==
 
+"@webcomponents/custom-elements@^1.3.1":
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.3.2.tgz#22187e3c1b0a18ff1552c489fef423d86972cba3"
+  integrity sha512-0HtVxwE+PLPCIFL2i8/d+vjlrj8fgafmzZvIblZMyMcww9upicXTdfQT7K0Tg7tDlSoWxjmP2xKYP09A2YMocQ==
+
+"@webcomponents/shadycss@^1.9.3":
+  version "1.9.4"
+  resolved "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.4.tgz#4f9d8ea1526bab084c60b53d4854dc39fdb2bb48"
+  integrity sha512-tgNcVEaKssyeZPbUBjVQf4aryO5Fi7fxRvOxV982ZJuRVDcefmIblBh0SXAbcvAAlQ2zpNEP4SuQUnr8uApIpw==
+
+"@webcomponents/webcomponentsjs@^2.4.0":
+  version "2.4.1"
+  resolved "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.4.1.tgz#7baadec56ed2fd79b94ddfd509132d8c0c295c5c"
+  integrity sha512-7jxBb+KoWncKb/JGFyTY40PjV4yRx2zd35ZLuvRP+6WndJDL7X32ZIZ7bN3sSQIl+NzJkCo7chfXJyzn+6WZaQ==
+
 "@wry/context@^0.4.0":
   version "0.4.4"
   resolved "https://registry.npmjs.org/@wry/context/-/context-0.4.4.tgz#e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8"
@@ -6078,6 +6112,11 @@ css-tree@1.0.0-alpha.37:
     mdn-data "2.0.4"
     source-map "^0.6.1"
 
+css-vars-ponyfill@^2.1.2:
+  version "2.2.1"
+  resolved "https://registry.npmjs.org/css-vars-ponyfill/-/css-vars-ponyfill-2.2.1.tgz#c97dcfb3efc93b479661af58afa04cb0ef5b97e6"
+  integrity sha512-bFdKEQbCtwoDl4/iPaqjGDMZRgnVn6k7c6XUlOrW+OzMIweWV6b5YbajR99dUiAsB1WpfbGGiiE9T1cnSh2pgA==
+
 css-what@2.1:
   version "2.1.3"
   resolved "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
@@ -10729,6 +10768,18 @@ listr@0.14.3, listr@^0.14.3:
     p-map "^2.0.0"
     rxjs "^6.3.3"
 
+lit-element@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.npmjs.org/lit-element/-/lit-element-2.2.1.tgz#79c94d8cfdc2d73b245656e37991bd1e4811d96f"
+  integrity sha512-ipDcgQ1EpW6Va2Z6dWm79jYdimVepO5GL0eYkZrFvdr0OD/1N260Q9DH+K5HXHFrRoC7dOg+ZpED2XE0TgGdXw==
+  dependencies:
+    lit-html "^1.0.0"
+
+lit-html@^1.0.0, lit-html@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/lit-html/-/lit-html-1.1.2.tgz#2e3560a7075210243649c888ad738eaf0daa8374"
+  integrity sha512-FFlUMKHKi+qG1x1iHNZ1hrtc/zHmfYTyrSvs3/wBTvaNtpZjOZGWzU7efGYVpgp6KvWeKF6ql9/KsCq6Z/mEDA==
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -14040,6 +14091,11 @@ quick-lru@^1.0.0:
   resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
   integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
+ramda@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
+  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
   resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"