diff --git a/app/src/app/ui/custom-theme.scss b/app/src/app/ui/custom-theme.scss index 035473f72..51e4d4bae 100644 --- a/app/src/app/ui/custom-theme.scss +++ b/app/src/app/ui/custom-theme.scss @@ -1,5 +1,6 @@ @use '@angular/material' as mat; @import './overrides/adf-style-fixes.theme'; +@import './overrides/adf-pagination.theme'; @import './colors'; $mat-primary-palette: mat.define-palette($aca-primary-blue, A100); @@ -18,4 +19,5 @@ $custom-theme: mat.define-light-theme( @include mat.all-component-themes($theme); @include adf-core-theme($theme); @include adf-style-fixes($theme); + @include adf-pagination-theme($theme); } diff --git a/app/src/app/ui/dynamic-theme/custom-theme.scss.tpl b/app/src/app/ui/dynamic-theme/custom-theme.scss.tpl index 2aebf7373..223e061ef 100644 --- a/app/src/app/ui/dynamic-theme/custom-theme.scss.tpl +++ b/app/src/app/ui/dynamic-theme/custom-theme.scss.tpl @@ -1,5 +1,6 @@ @import '@angular/material/theming'; @import './overrides/adf-style-fixes.theme'; +@import './overrides/adf-pagination.theme'; @import "./dynamic-theme/theme-configuration"; @import "./dynamic-theme/typography"; @import "./dynamic-theme/custom-theme-palettes"; @@ -53,4 +54,5 @@ $custom-theme: mat-light-theme( } @include adf-style-fixes($theme); + @include adf-pagination-theme($theme); } diff --git a/app/src/app/ui/overrides/adf-pagination.theme.scss b/app/src/app/ui/overrides/adf-pagination.theme.scss new file mode 100644 index 000000000..81b46b594 --- /dev/null +++ b/app/src/app/ui/overrides/adf-pagination.theme.scss @@ -0,0 +1,48 @@ +@mixin adf-pagination-theme($theme) { + + .adf-pagination__block { + flex: none !important; + padding: 0 !important; + font-weight: 400; + font-size: 14px; + line-height: 24px; + letter-spacing: 0.25px; + } + + .adf-pagination { + height: 32px !important; + line-height: 24px !important; + padding: 16px 0; + background: var(--theme-pagination-background-color); + } + + .adf-pagination__range-block { + padding: 0 24px !important; + } + + .adf-pagination__perpage-block { + flex: auto !important; + padding-right: 24px !important; + } + + .adf-pagination__actualinfo-block { + padding-right: 12px !important; + + .mat-menu-trigger { + display: none !important; + } + } + + .adf-pagination__previous-button { + margin: 0 12px 0 0 !important; + } + + .adf-pagination__next-button { + margin: 0 !important; + } + + .adf-pagination__controls-block { + padding-right: 24px !important; + } + +} diff --git a/app/src/app/ui/variables/variables.scss b/app/src/app/ui/variables/variables.scss index c25174bd9..72da2f6a4 100644 --- a/app/src/app/ui/variables/variables.scss +++ b/app/src/app/ui/variables/variables.scss @@ -40,6 +40,7 @@ $blue-save-button-background: #1F74DB; $black-heading: #4e4c4c; $grey-dropdown-background: #eee; $grey-divider: rgba(0,0,0,.22); +$pagination-background-color: #ffffff; $defaults: ( --theme-primary-color: mat.get-color-from-palette($primary), @@ -68,6 +69,7 @@ $defaults: ( --theme-heading-color: $black-heading, --theme-dropdown-color: $grey-dropdown-background, --theme-grey-divider-color: $grey-divider, + --theme-pagination-background-color: $pagination-background-color, ); // propagates SCSS variables into the CSS variables scope