Skip to content

Commit

Permalink
Merge pull request #121 from ConductionNL/revert-118-feature/OP-57/pa…
Browse files Browse the repository at this point in the history
…gination

Revert "feature/OP-57/pagination"
  • Loading branch information
remko48 authored Oct 16, 2023
2 parents f492e7e + 66c8723 commit 9c5d9df
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 43 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

- **Version 2.2 (breaking changes from 2.1.x)**

- 2.2.15: Added more NLDS options to Pagination.
- 2.2.13/2.2.14:
- Updated Textarea and all Input components to allow aria-label.
- Updated Select components.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@conduction/components",
"version": "2.2.15",
"version": "2.2.14",
"description": "React (Gatsby) components used within the Conduction Skeleton Application (and its implementations)",
"main": "lib/index.js",
"scripts": {
Expand Down
46 changes: 5 additions & 41 deletions src/components/Pagination/Pagination.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,13 @@
--conduction-pagination-item-border-style: unset;
--conduction-pagination-item-border-color: unset;

/* --conduction-pagination-navigation-button-background-color: #4376fc; */
/* --conduction-pagination-navigation-button-color: #ffffff; */
/* --conduction-pagination-navigation-button-border-width: 1px; */
/* --conduction-pagination-navigation-button-border-style: solid; */
/* --conduction-pagination-navigation-button-border-color: #4376fc; */
/* --conduction-pagination-navigation-button-border-radius: 1px; */
--conduction-pagination-navigation-button-padding-inline-start: 8px;
--conduction-pagination-navigation-button-padding-inline-end: 8px;
--conduction-pagination-navigation-button-padding-block-start: 0px;
--conduction-pagination-navigation-button-padding-block-end: 0px;

--conduction-pagination-navigation-button-disabled-color: #d1d1d1;
--conduction-pagination-navigation-button-disabled-background-color: #fefefe;
/* --conduction-pagination-navigation-button-disabled-border-width: 1px; */
/* --conduction-pagination-navigation-button-disabled-border-style: solid; */
/* --conduction-pagination-navigation-button-disabled-border-color: #4376fc; */
/* --conduction-pagination-navigation-button-disabled-border-radius: 1px; */

--conduction-pagination-navigation-button-hover-color: #d1d1d1;
--conduction-pagination-navigation-button-hover-background-color: #fefefe;
/* --conduction-pagination-navigation-button-hover-border-width: 1px; */
/* --conduction-pagination-navigation-button-hover-border-style: solid; */
/* --conduction-pagination-navigation-button-hover-border-color: #4376fc; */
/* --conduction-pagination-navigation-button-hover-border-radius: 1px; */
--conduction-pagination-disabled-color: #d1d1d1;
--conduction-pagination-disabled-background-color: #fefefe;

--conduction-pagination-current-page-background-color: #4376fc;
--conduction-pagination-current-page-color: #ffffff;
Expand Down Expand Up @@ -114,22 +97,9 @@
cursor: not-allowed;
}

.container > li.disabled > a > .button {
color: var(--conduction-pagination-navigation-button-disabled-color) !important;
background-color: var(--conduction-pagination-navigation-button-disabled-background-color) !important;
border-width: var(--conduction-pagination-navigation-button-disabled-border-width, var(--utrecht-button-border-width));
border-style: var(--conduction-pagination-navigation-button-disabled-border-style, var(--utrecht-button-border-style));
border-color: var(--conduction-pagination-navigation-button-disabled-border-color, var(--utrecht-button-border-color));
border-radius: var(--conduction-pagination-navigation-button-disabled-border-radius, var(--utrecht-button-border-radius));
}

.container > li:hover:not(.disabled) > a > .button {
color: var(--conduction-pagination-navigation-button-hover-color) !important;
background-color: var(--conduction-pagination-navigation-button-hover-background-color) !important;
border-width: var(--conduction-pagination-navigation-button-hover-border-width, var(--utrecht-button-border-width));
border-style: var(--conduction-pagination-navigation-button-hover-border-style, var(--utrecht-button-border-style));
border-color: var(--conduction-pagination-navigation-button-hover-border-color, var(--utrecht-button-border-color));
border-radius: var(--conduction-pagination-navigation-button-hover-border-radius, var(--utrecht-button-border-radius));
.container > li.disabled > a {
color: var(--conduction-pagination-disabled-color);
background-color: var(--conduction-pagination-disabled-background-color);
}

.container > li:hover:not(.disabled):not(.currentPage) {
Expand All @@ -145,12 +115,6 @@
}

.button {
background-color: var(--conduction-pagination-navigation-button-background-color, var(--utrecht-button-background-color)) !important;
color: var(--conduction-pagination-navigation-button-color, var(--utrecht-button-color)) !important;
border-width: var(--conduction-pagination-navigation-button-border-width, var(--utrecht-button-border-width));
border-style: var(--conduction-pagination-navigation-button-border-style, var(--utrecht-button-border-style));
border-color: var(--conduction-pagination-navigation-button-border-color, var(--utrecht-button-border-color));
border-radius: var(--conduction-pagination-navigation-button-border-radius, var(--utrecht-button-border-radius));
padding-inline-start: var(--conduction-pagination-navigation-button-padding-inline-start) !important;
padding-inline-end: var(--conduction-pagination-navigation-button-padding-inline-end) !important;
padding-block-start: var(--conduction-pagination-navigation-button-padding-block-start) !important;
Expand Down

0 comments on commit 9c5d9df

Please sign in to comment.