From 9e7aeb3b0bb3db122b1f88190af0bc596fb46f58 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 14 Jan 2020 10:35:48 +0300 Subject: [PATCH] style(theme-shared): fix table empty row styles --- npm/ng-packs/package.json | 26 +-- .../theme-basic/src/lib/constants/styles.ts | 4 + .../lib/components/table/table.component.html | 2 +- .../lib/components/table/table.component.ts | 4 +- .../src/lib/services/confirmation.service.ts | 2 +- .../tests/sort-order-icon.component.spec.ts | 2 +- npm/ng-packs/yarn.lock | 151 ++++++++---------- 7 files changed, 88 insertions(+), 103 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index fa9799048e..085cbc9d4f 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -21,19 +21,19 @@ "generate:changelog": "conventional-changelog -p angular -i CHANGELOG.md -s" }, "devDependencies": { - "@abp/ng.account": "^1.1.1", - "@abp/ng.account.config": "^1.1.1", - "@abp/ng.core": "^1.1.1", - "@abp/ng.feature-management": "^1.1.1", - "@abp/ng.identity": "^1.1.1", - "@abp/ng.identity.config": "^1.1.1", - "@abp/ng.permission-management": "^1.1.1", - "@abp/ng.setting-management": "^1.1.1", - "@abp/ng.setting-management.config": "^1.1.1", - "@abp/ng.tenant-management": "^1.1.1", - "@abp/ng.tenant-management.config": "^1.1.1", - "@abp/ng.theme.basic": "^1.1.1", - "@abp/ng.theme.shared": "^1.1.1", + "@abp/ng.account": "^2.0.0", + "@abp/ng.account.config": "^2.0.0", + "@abp/ng.core": "^2.0.0", + "@abp/ng.feature-management": "^2.0.0", + "@abp/ng.identity": "^2.0.0", + "@abp/ng.identity.config": "^2.0.0", + "@abp/ng.permission-management": "^2.0.0", + "@abp/ng.setting-management": "^2.0.0", + "@abp/ng.setting-management.config": "^2.0.0", + "@abp/ng.tenant-management": "^2.0.0", + "@abp/ng.tenant-management.config": "^2.0.0", + "@abp/ng.theme.basic": "^2.0.0", + "@abp/ng.theme.shared": "^2.0.0", "@angular-builders/jest": "^8.2.0", "@angular-devkit/build-angular": "~0.803.21", "@angular-devkit/build-ng-packagr": "~0.803.21", diff --git a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts index 24c3e84e42..cacf326031 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts @@ -64,4 +64,8 @@ export default ` .field-validation-error { font-size: 0.8em; } + +.ui-table .ui-table-tbody > tr.empty-row > div.empty-row-content { + border: 1px solid #c8c8c8; + } `; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html index 6898a9964b..11f4250db8 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html @@ -71,7 +71,7 @@ -
+
{{ emptyMessage | abpLocalization }}
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts index 3c9995a388..b4ac7eec5f 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts @@ -25,8 +25,8 @@ import { filter: none; } - .ui-table .ui-table-tbody > tr.empty-row > div { - margin: 10px; + .ui-table .ui-table-tbody > tr.empty-row > div.empty-row-content { + padding: 10px; text-align: center; } `, diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts index 650019392b..f66dfd768d 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/services/confirmation.service.ts @@ -50,7 +50,7 @@ export class ConfirmationService { ): Observable { this.confirmation$.next({ message, - title: title || 'AbpUi:AreYouSure', + title, severity: severity || 'neutral', options, }); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts index d351c39a74..a91f5b76c1 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts @@ -32,7 +32,7 @@ describe('SortOrderIconComponent', () => { component.sort(newKey); expect(component.selectedSortKey).toBe(newKey); expect(component.order).toBe('asc'); - expect(component.icon).toBe(''); + expect(component.icon).toBe('sorting'); }); test('should change order correctly when sort function called', () => { diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index e0af31cd07..01e1a62823 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -2,26 +2,26 @@ # yarn lockfile v1 -"@abp/ng.account.config@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.account.config/-/ng.account.config-1.1.1.tgz#43de54dd12606a6bc10caace9e430bdb136206b6" - integrity sha512-d0Gj/BtB/YtsVMsyFJI+vcX+KE2CCKNpUQ6YC2rmIwPwOkbqV7UtbzMhxgHoG4lTTfh1pxclIOL6WFzQInI4kg== +"@abp/ng.account.config@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.account.config/-/ng.account.config-2.0.0.tgz#ed49d728e6cb5cac5bf562b2db6e65276a2d550c" + integrity sha512-r7n5NLaAg6xtMQK6KCoCwJALsj3+cftqbPU1mTJqoEiZQCejOUFA9Gk85i3t//MRUeD3j/ghzUYUa6b2elQwXQ== dependencies: tslib "^1.9.0" -"@abp/ng.account@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-1.1.1.tgz#eddce66856d1133c4d7c04e861be019cfea6b25e" - integrity sha512-EUG7Hiv21KuOMmVSCxUBjMOlno4oYIUtrOUMNK/A/y42cr8UwUFmsu7HEx5J30Z0KWBn7w4vWvAy6KenqzMclQ== +"@abp/ng.account@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-2.0.0.tgz#ac1ea6b51190d68c647699fb9a6d185ad728ec3e" + integrity sha512-UC/mTFermfrnAmm2Y6ZrsbKi4EyPzoASeRzoZ5LL0usyEIKb4N9l7Z7kxr5ih2+OPVSW9TmDfgw/zwn3HlrrWw== dependencies: - "@abp/ng.account.config" "^1.1.1" - "@abp/ng.theme.shared" "^1.1.1" + "@abp/ng.account.config" "^2.0.0" + "@abp/ng.theme.shared" "^2.0.0" tslib "^1.9.0" -"@abp/ng.core@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-1.1.1.tgz#a08a06fff8fb58a913b619820120d93fa5120a1b" - integrity sha512-oCYQJPmiYr6UjnW6L5Dhd7rl0wvE2ABjWYT70IDLSaFjxHRlQ2exA2kKft4RMkCT0iPNzEfmdHZyqX/8AHCy8Q== +"@abp/ng.core@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-2.0.0.tgz#9da38d0d3a32a5f7239034a37c3f4f14be745f30" + integrity sha512-pp3u+3bYMSygx88+t4929tkp7a5ja8k8IPeoho2SiJgC2ni546ecX10Yt02X1C8DBEhBr7b6Fn7eQI0VTA4zYA== dependencies: "@ngxs/router-plugin" "^3.5.1" "@ngxs/storage-plugin" "^3.5.1" @@ -32,86 +32,86 @@ snq "^1.0.3" tslib "^1.9.0" -"@abp/ng.feature-management@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-1.1.1.tgz#d431a62fd677229421137c83e3ce1beb44f9d92c" - integrity sha512-Pji1vp9jWQacrRawBFRh/ao1zXE3ktbGmj1X+nCQ3o6Q7EnNattC7/KC6osqvonpfFDxpjEZP4cMyb3H1wHRIA== +"@abp/ng.feature-management@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-2.0.0.tgz#a9192bb24ca66d9eb0cf653695da2502ebaa7710" + integrity sha512-7DQapIj28Bh7MtSGKJLLd98i2vWGJgA/4hx3jjQ0WT94NnuyZPKsYwSGcJbVgbTV3PyLWcDCdmhh2NloL2O0lw== dependencies: - "@abp/ng.theme.shared" "^1.1.1" + "@abp/ng.theme.shared" "^2.0.0" tslib "^1.9.0" -"@abp/ng.identity.config@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.identity.config/-/ng.identity.config-1.1.1.tgz#da264272ecebfbce99617443048951de317c23f9" - integrity sha512-d5BJBwfHsBoeEYF6dCHeoNVX/nRy1T7HOF6sjkFQN0Jihhk/XOv/r6CpgxnUKasXF0R2wadHrZZZOme6UL7AIw== +"@abp/ng.identity.config@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.identity.config/-/ng.identity.config-2.0.0.tgz#4912b513e919778356cec45ceda4bc032e0cc9b6" + integrity sha512-LfEwy57+Yx8nZXvzgFn8aYVnZSFrhBxFvD1twrTrddQRKltO+wSXV8p6boem8KRU2KWpbH0NYhnBNOxPYGHF6g== dependencies: tslib "^1.9.0" -"@abp/ng.identity@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-1.1.1.tgz#0776db2a4efe96953a7d46ea697689686c75fbf2" - integrity sha512-Gzz+/kgsDhTTrEMiNqDLSJvjTgk0ATy6Ud7uswoA3RCDlfcksbS5J7kHEsc6TRh6bZ1bC368Zj1F/XS7QAj/iA== +"@abp/ng.identity@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-2.0.0.tgz#33ba9c94042a48c7c004a4df499a669f75997a25" + integrity sha512-qjtiIJy+fpn9JDZjndqtNPnGWPNc1pMQP4cV+UVm8RUG5U3nMI8RfEYyuDKluSGPAF2Qncl3husjpmZjZaEO9w== dependencies: - "@abp/ng.identity.config" "^1.1.1" - "@abp/ng.permission-management" "^1.1.1" - "@abp/ng.theme.shared" "^1.1.1" + "@abp/ng.identity.config" "^2.0.0" + "@abp/ng.permission-management" "^2.0.0" + "@abp/ng.theme.shared" "^2.0.0" tslib "^1.9.0" -"@abp/ng.permission-management@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-1.1.1.tgz#f0184639f9bf37a24c7dc3b18953bac0a521f926" - integrity sha512-3Omhdf/VrYjd4RA9R74ttFP4T+J4Kit8A/PjJIaiwV5j8DJ0WQeBek82P3Q3+EfhuS2ehWuSuz/DYmkcxkt1dw== +"@abp/ng.permission-management@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-2.0.0.tgz#b7956a274945bac9b3bfb16cfcacd70af531d82e" + integrity sha512-ZCuitlFgP1S/Y1Us5nIS9Fw9Jz9Jb7RRboTb6ysbMcLcOkgYJn2d806fnEQh/TkJHpTJDNZYIk27/DlaOQN2xg== dependencies: - "@abp/ng.theme.shared" "^1.1.1" + "@abp/ng.theme.shared" "^2.0.0" tslib "^1.9.0" -"@abp/ng.setting-management.config@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.setting-management.config/-/ng.setting-management.config-1.1.1.tgz#6e19cb5f7894d2b6c5193f2e72abdac5be076356" - integrity sha512-QvWo8r+dL+IcQW0nRC7sPNhMCScSHcYPqJotUY1QCanEpXU56JIfPYkOKOtt3cJTA9U2jE2hBmv7fi8yTEy6Pg== +"@abp/ng.setting-management.config@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.setting-management.config/-/ng.setting-management.config-2.0.0.tgz#4013b5d6bf7a34fc93ab1df3734c50bb60588b0e" + integrity sha512-eVIzsSQHMz1+Y4Pri8dec31NP3pGwqeX9oFN6YdiIlXL7i0Lqvf9o1ZvMvZ6iIX7GJsOilTgd9Rw7ccZnZTaEQ== dependencies: tslib "^1.9.0" -"@abp/ng.setting-management@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-1.1.1.tgz#38cfd7c8b6cc0e29bd3a655e1aecff7e35aca10a" - integrity sha512-kwW9xC7xERo5ZDqGC4TaEXZKiHYZ3lIwGn8wVktX53ulGXrKT9N7BSVP8bBMJnJlIMNg7MpxjOYAR90gXrXdZw== +"@abp/ng.setting-management@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-2.0.0.tgz#9babb94b66aba3d95b44457e9301bbf2d7ea10b5" + integrity sha512-tRYRW/SlS52o9kO3yojJarYf0IFYNigXJaJPBOla1RPWW9fM63irCUq+NAI5bRUkxPHDQPfpE8qJC32DPM6a1Q== dependencies: - "@abp/ng.setting-management.config" "^1.1.1" - "@abp/ng.theme.shared" "^1.1.1" + "@abp/ng.setting-management.config" "^2.0.0" + "@abp/ng.theme.shared" "^2.0.0" tslib "^1.9.0" -"@abp/ng.tenant-management.config@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management.config/-/ng.tenant-management.config-1.1.1.tgz#1aee4705e6ec06954d5d04ad78bb02c636dc36ae" - integrity sha512-KoYPIqsm7a/VrMZumfFKBKYwzZm1zzJeyoWpf84PZ2gvhkuh45gYwvXzMHzQu/HQ6FpJ9+NL7ro/uee1ka+DzQ== +"@abp/ng.tenant-management.config@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management.config/-/ng.tenant-management.config-2.0.0.tgz#ee2357596263019eae9fcbefe8fd927242b81e87" + integrity sha512-HMZh7HBrFcMXLXGvEjwSOF0ncDcZUtUez1J4ll6oMBVbL4xgfJxIggODin9OMMdQOkLjzYY4BGS+Iwjzh5DR2g== dependencies: tslib "^1.9.0" -"@abp/ng.tenant-management@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-1.1.1.tgz#b08a9498957f8dd54a2089d7d4cffafb48753508" - integrity sha512-hjs8U+lRA0y2yVa1tVZgm02kxyQdsmyMtzG8ZB76MFJThmMtf3ogrLHRGZ0etgQHe0bmMjkpdC84wS1VtyK5VA== +"@abp/ng.tenant-management@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-2.0.0.tgz#24dfbaf234e567244bdd4cc882ed6952d873e6b3" + integrity sha512-Qn/JLJcCMYYZ+5IuF5jSHzwB9dprnQqoVv8i8vuXS1dyooBoqIIKNMs0E/GOsNu5MPABYrd24YODGi2Nso/OxA== dependencies: - "@abp/ng.feature-management" "^1.1.1" - "@abp/ng.tenant-management.config" "^1.1.1" - "@abp/ng.theme.shared" "^1.1.1" + "@abp/ng.feature-management" "^2.0.0" + "@abp/ng.tenant-management.config" "^2.0.0" + "@abp/ng.theme.shared" "^2.0.0" tslib "^1.9.0" -"@abp/ng.theme.basic@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-1.1.1.tgz#ee3c3a35f4254a0f727b11bb343ceab3aa975773" - integrity sha512-1z13+H2UhIGDsbsd5uyhuBi3v4lxim1yIECZ3HxFJxIKthHO1wlVb8ka8WrIrxj7JBOl6f9srMCzuCNm2rMGLg== +"@abp/ng.theme.basic@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-2.0.0.tgz#c492bd513bb8a14d4df7b1ed24316543b41cb710" + integrity sha512-WH7DKzF8MkK1fG8uCYGQWJmkJPliyKi2/UwimmFie5UxFsII05rvZZAa+/EILVfMyob+4AkDeU79gZ/EWUJeZg== dependencies: - "@abp/ng.theme.shared" "^1.1.1" + "@abp/ng.theme.shared" "^2.0.0" tslib "^1.9.0" -"@abp/ng.theme.shared@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-1.1.1.tgz#436b9c909a25cc5722c2a639399d05668a241262" - integrity sha512-eQDrznFKwD63cdO/HPSyGMwIFPmGhv4MAEgITyZkUY76g+owYa/tK+GEjpSqsvQsL//qrHqcG+nwuK9RrCBy+A== +"@abp/ng.theme.shared@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-2.0.0.tgz#d241d597d0bb58d50514522d133448f12672708f" + integrity sha512-akTvtNLKkpdWxLko6jMR261FSNEMNcRp1bvvOE2Auged9luXZYneNfaExnoLkBQhRuxmLKBYLPHyyueGRy2v2g== dependencies: - "@abp/ng.core" "^1.1.1" + "@abp/ng.core" "^2.0.0" "@angular/cdk" "^8.2.3" "@fortawesome/fontawesome-free" "^5.11.2" "@ng-bootstrap/ng-bootstrap" "^5.1.4" @@ -119,7 +119,6 @@ bootstrap "^4.3.1" chart.js "^2.9.2" font-awesome "^4.7.0" - ngx-perfect-scrollbar "^8.0.0" primeicons "^2.0.0" primeng "^8.1.1" tslib "^1.9.0" @@ -8488,14 +8487,6 @@ ng-packagr@^5.7.1: terser "^4.1.2" update-notifier "^3.0.0" -ngx-perfect-scrollbar@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-8.0.0.tgz#19c1bbf9b1a36d89b00a68f7834e39427d29182f" - integrity sha512-IXoFbULQnxyJj0gdCcKCLE/6OW9HCP9KARzMCKS1kNxTuzG4DghjM2AaCBRM5/sFwdbn6rqOKMCINtHA8W8YCA== - dependencies: - perfect-scrollbar "^1.4.0" - resize-observer-polyfill "^1.5.0" - ngxs-reset-plugin@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/ngxs-reset-plugin/-/ngxs-reset-plugin-1.2.0.tgz#38dd8363f45cad7410e00ce346a98001241944f8" @@ -9409,11 +9400,6 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -perfect-scrollbar@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz#5d014ef9775e1f43058a1dbae9ed1daf0e7091f1" - integrity sha512-/2Sk/khljhdrsamjJYS5NjrH+GKEHEwh7zFSiYyxROyYKagkE4kSn2zDQDRTOMo8mpT2jikxx6yI1dG7lNP/hw== - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -10251,11 +10237,6 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resize-observer-polyfill@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" - integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== - resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"