diff --git a/package-lock.json b/package-lock.json index 145d0f1e4..04bd52e3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -698,9 +698,9 @@ } }, "@angular/flex-layout": { - "version": "7.0.0-beta.23", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-7.0.0-beta.23.tgz", - "integrity": "sha512-jH2i3i/M7SbK6scVlj2urVL5OhzwavbQ7KwvUjyc/UwccKnnzuOuWEGCINLja/aoaUO3I35LluCLv6a6VN0olA==", + "version": "7.0.0-beta.24", + "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-7.0.0-beta.24.tgz", + "integrity": "sha512-ll6sK0nLGxqI/f5+z4jbd+pve1QITzgehv2AuGvfSDgIjPMeqUDB5YZqQmIGM/dQRk/vIio5KCW5LQPJWzMMYQ==", "requires": { "tslib": "^1.7.1" } @@ -4959,8 +4959,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -4981,14 +4980,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5003,20 +5000,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5133,8 +5127,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5146,7 +5139,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5161,7 +5153,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5169,14 +5160,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5195,7 +5184,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5276,8 +5264,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5289,7 +5276,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5375,8 +5361,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5412,7 +5397,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5432,7 +5416,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5476,14 +5459,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/package.json b/package.json index 665027247..97c38c02c 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@angular/common": "7.2.12", "@angular/compiler": "7.2.12", "@angular/core": "7.2.12", - "@angular/flex-layout": "^7.0.0-beta.23", + "@angular/flex-layout": "^7.0.0-beta.24", "@angular/forms": "7.2.12", "@angular/http": "7.2.12", "@angular/material": "^7.3.7", diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 50fda09a2..8d9c2b8e8 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -18,7 +18,6 @@ @import './overrides/adf-search-filter.theme'; @import './overrides/adf-info-drawer.theme'; @import './overrides/adf-upload-dialog.theme'; -@import './overrides/adf-pagination.theme'; @import './overrides/adf-sidenav-layout.theme'; @import './overrides/adf-document-list.theme'; @import './overrides/adf-upload-drag-area.theme'; @@ -66,12 +65,12 @@ $custom-theme-primary: mat-palette($grey-scale, A400); $custom-theme-accent: mat-palette($alfresco-accent-orange); $custom-theme-warn: mat-palette($alfresco-warn); $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent); +$foreground: map-get($custom-theme, foreground); @mixin custom-theme($theme) { @include adf-toolbar-theme($theme); @include adf-search-filter-theme($theme); @include adf-info-drawer-theme($theme); - @include adf-pagination-theme($theme); @include adf-sidenav-layout-theme($theme); @include adf-document-list-theme($theme); @include adf-upload-drag-area-theme($theme); @@ -97,3 +96,6 @@ $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent); $document-list-selection-color: mat-color($alfresco-ecm-blue, 500); $document-list-background: white; $document-list-thumbnail-width: 35px; + +$adf-pagination--border: 1px solid mat-color($foreground, text, 0.07); +$adf-pagination__empty--height: 0; diff --git a/src/app/ui/overrides/adf-pagination.theme.scss b/src/app/ui/overrides/adf-pagination.theme.scss deleted file mode 100644 index 401f21671..000000000 --- a/src/app/ui/overrides/adf-pagination.theme.scss +++ /dev/null @@ -1,22 +0,0 @@ -@mixin adf-pagination-theme($theme) { - .adf-pagination { - &.adf-pagination__empty { - display: none; - } - } - - @media screen and (max-width: 599px) { - .adf-pagination { - padding: 0; - - &__range-block, - &__perpage-block { - display: none; - } - - &__actualinfo-block { - border-right: none; - } - } - } -}