Browse Source

chore(admin-ui): Update to v1.0 of Clarity

Closes #37
Michael Bromley 7 years ago
parent
commit
558408b2bf

+ 3 - 3
admin-ui/package.json

@@ -22,9 +22,9 @@
     "@angular/platform-browser": "^7.0.4",
     "@angular/platform-browser-dynamic": "^7.0.4",
     "@angular/router": "^7.0.4",
-    "@clr/angular": "^0.13.3",
-    "@clr/icons": "^0.13.3",
-    "@clr/ui": "^0.13.3",
+    "@clr/angular": "^1.0.0",
+    "@clr/icons": "^1.0.0",
+    "@clr/ui": "^1.0.0",
     "@ng-select/ng-select": "^2.12.1",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",

+ 1 - 1
admin-ui/src/app/shared/components/form-field/form-field.component.html

@@ -1,5 +1,5 @@
 <div class="form-group" [class.no-label]="!label">
-    <label *ngIf="label" [for]="for">
+    <label *ngIf="label" [for]="for" class="clr-control-label">
         {{ label }}
         <clr-tooltip *ngIf="tooltip">
             <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>

+ 1 - 1
admin-ui/src/app/shared/components/rich-text-editor/rich-text-editor.component.html

@@ -1,2 +1,2 @@
-<label (click)="trixEditor.focus()">{{ label }}</label>
+<label (click)="trixEditor.focus()" class="clr-control-label">{{ label }}</label>
 <trix-editor #trixEditor></trix-editor>

+ 1 - 2
admin-ui/src/app/shared/shared.module.ts

@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import { ClarityModule, ClrFormsNextModule } from '@clr/angular';
+import { ClarityModule } from '@clr/angular';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgxPaginationModule } from 'ngx-pagination';
@@ -41,7 +41,6 @@ import { ModalService } from './providers/modal/modal.service';
 
 const IMPORTS = [
     ClarityModule,
-    ClrFormsNextModule,
     CommonModule,
     FormsModule,
     ReactiveFormsModule,

+ 12 - 26
admin-ui/yarn.lock

@@ -315,21 +315,22 @@
     typescript "2.4.1"
     yargs "8.0.2"
 
-"@clr/angular@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@clr/angular/-/angular-0.13.3.tgz#a36d4aae796a1721f6fa331726b06bd47f7dc24a"
+"@clr/angular@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@clr/angular/-/angular-1.0.0.tgz#c40978b3090d300b97fc241e6e55d1b899733b99"
+  integrity sha512-Wt0bCeKt59aSGbJ24r/fWwMhjLz526LUKfhvnek95+KyxOUc44BWyBiIcvSkAx3qfgtwc4FL8FUNmv8VhkhvWw==
   dependencies:
     tslib "^1.9.0"
 
-"@clr/icons@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@clr/icons/-/icons-0.13.3.tgz#2b9881dfa6b716755b19296eaf0bb9a4b7988cba"
+"@clr/icons@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@clr/icons/-/icons-1.0.0.tgz#f6c379eeac02acbf6b107c071e7c63ce580d1698"
+  integrity sha512-EGdFtSGJWgocDyz8d/dLFudJVpx5r5AUa46eHoZMvUdeV5HRKKnqQsw3f4i++WAPUqE5GN3vzvDWTsHnpQnWCw==
 
-"@clr/ui@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-0.13.3.tgz#3f8f41ee3f9c3c1f1b427b32e596bd232bd97152"
-  optionalDependencies:
-    bootstrap "4.0.0-alpha.5"
+"@clr/ui@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-1.0.0.tgz#b3f7f2f83b822087d731c333f614cd509ce6fa04"
+  integrity sha512-7g3Jt5FQCy3AiuZn33fTPWeA5OKkttGgDMjo+nUOgDsUc8y8VY/opXai0I6ViUFFia1weCVDZ4LeiZtsNOjakg==
 
 "@ng-select/ng-select@^2.12.1":
   version "2.12.1"
@@ -1204,13 +1205,6 @@ boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
-bootstrap@4.0.0-alpha.5:
-  version "4.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.5.tgz#a126b648c3bd2f52b8fad4bbc5e2d0ad2abf7064"
-  dependencies:
-    jquery "1.9.1 - 3"
-    tether "^1.3.7"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3839,10 +3833,6 @@ jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
 
-"jquery@1.9.1 - 3":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-
 js-base64@^2.1.8:
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.8.tgz#57a9b130888f956834aa40c5b165ba59c758f033"
@@ -6548,10 +6538,6 @@ terser@^3.8.1:
     source-map "~0.6.1"
     source-map-support "~0.5.6"
 
-tether@^1.3.7:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.5.tgz#8efd7b35572767ba502259ba9b1cc167fcf6f2c1"
-
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"