diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/_variables.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/_variables.scss index 89c030bdf..c2efd7063 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/_variables.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/_variables.scss @@ -6,7 +6,7 @@ $color-brand-bright: lighten($color-brand, 10%); $color-brand-brighter: lighten($color-brand, 20%); $color-secondary: #83D01B; -$color-secondary-dark: darken($color-secondary, 10%); +$color-secondary-dark: darken($color-secondary, 5%); $color-secondary-darker: darken($color-secondary, 20%); $color-secondary-bright: lighten($color-secondary, 10%); $color-secondary-brighter: lighten($color-secondary, 20%); diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html index 91585e941..efd95e7cb 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.html @@ -21,7 +21,7 @@
- +
- +
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.html index ce352ef08..1b0a77c94 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.html +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.html @@ -1,31 +1,25 @@ -
-
+
+
-
-
Showing {{model?.items}} of {{model?.totalItems}} products - Page {{model?.actualPage + 1}} - {{model?.totalPages}}
-
- -
+
\ No newline at end of file diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss index 10699926e..162de8c9d 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss @@ -1,30 +1,30 @@ -.pager { - margin-bottom: 20px; - margin-top: 20px; - margin-left: 0px; - margin-right: -30px; +@import "../../../variables"; - &-previous { - position: absolute; - left: 0; - top: 0; - cursor: pointer; - } +.esh-pager { - &-text { - color: #83d01b; + &-wrapper { + padding-top: 1rem; + text-align: center; } - &-next { - position: absolute; - right: 15px; - top: 0; - cursor: pointer; - } + &-item { + $margin: 8vw; + margin: 0 $margin; + + &--navigable { + cursor: pointer; + + &:hover { + color: $color-secondary; + } + } + + @media screen and (max-width: $media-screen-l) { + font-size: $font-size-s; + } - &-isDisabled { - cursor: not-allowed; - opacity: .5; - pointer-events: none; + @media screen and (max-width: $media-screen-m) { + margin: 0 $margin / 2; + } } -} +} \ No newline at end of file diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.ts index 8b4727401..cb0a961f5 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.ts +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.ts @@ -3,7 +3,7 @@ import { Component, OnInit, OnChanges, Output, Input, EventEmitter } from '@angu import { IPager } from '../../models/pager.model'; @Component({ - selector: 'esh-pager', + selector: 'esh-pager .esh-pager', templateUrl: './pager.html', styleUrls: ['./pager.scss'] })