Skip to content

Commit d0ac62a

Browse files
pat270pat270
authored
Merge pull request #6152 from pat270/LPD-63668
fix(@clayui/css): LPD-63668 Deprecate and remove styles for paginatio…
2 parents 2d3dcec + 64fed57 commit d0ac62a

File tree

10 files changed

+39
-61
lines changed

10 files changed

+39
-61
lines changed

‎packages/clay-css/src/scss/atlas/variables/_globals.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ $enable-caret: false !default;
4040
$enable-deprecation-messages: true !default;
4141
$enable-gradients: false !default;
4242
$enable-grid-classes: true !default;
43+
$enable-pagination-sizes: false !default;
4344
$enable-pointer-cursor-for-buttons: true !default;
4445
$enable-prefers-reduced-motion-media-query: true !default;
4546
$enable-print-styles: true !default;

‎packages/clay-css/src/scss/atlas/variables/_pagination.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,17 @@ $pagination-items-per-page-link: map-deep-merge(
223223

224224
$pagination-results-color: $pagination-color !default;
225225

226-
// Sizes
226+
// @deprecated Pagination Sizes as of v3.146.0
227+
228+
// .pagination-sm
227229

228230
$pagination-link-border-radius-sm: 0.3125rem !default;
229231
$pagination-font-size-sm: 0.75rem !default; // 12px
230232
$pagination-item-height-sm: 1.5rem !default; // 24px
231233
$pagination-padding-y-sm: 0 !default;
232234

235+
// .pagination-lg
236+
233237
$pagination-link-border-radius-lg: 0.3125rem !default; // 5px
234238
$pagination-font-size-lg: 1.125rem !default; // 18px
235239
$pagination-item-height-lg: 2.75rem !default; //44px

‎packages/clay-css/src/scss/cadmin/components/_pagination.scss‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,14 @@
5858
@include clay-css($cadmin-pagination-results);
5959
}
6060

61-
// Pagination Sizes
61+
// @deprecated Pagination Sizes as of v3.146.0
6262

63-
.pagination-sm {
64-
@include clay-pagination-variant($cadmin-pagination-sm);
65-
}
63+
@if ($cadmin-enable-pagination-sizes) {
64+
.pagination-sm {
65+
@include clay-pagination-variant($cadmin-pagination-sm);
66+
}
6667

67-
.pagination-lg {
68-
@include clay-pagination-variant($cadmin-pagination-lg);
68+
.pagination-lg {
69+
@include clay-pagination-variant($cadmin-pagination-lg);
70+
}
6971
}

‎packages/clay-css/src/scss/cadmin/variables/_globals.scss‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,18 @@ $cadmin-scaling-breakpoint-down: sm !default;
3131
$cadmin-enable-clay-color-functions-process-fallback: true !default;
3232

3333
$cadmin-enable-caret: false !default;
34-
$cadmin-enable-rounded: true !default;
35-
$cadmin-enable-shadows: true !default;
34+
$cadmin-enable-deprecation-messages: true !default;
3635
$cadmin-enable-gradients: false !default;
37-
$cadmin-enable-transitions: true !default;
38-
$cadmin-enable-prefers-reduced-motion-media-query: true !default;
3936
$cadmin-enable-grid-classes: true !default;
37+
$cadmin-enable-pagination-sizes: false !default;
4038
$cadmin-enable-pointer-cursor-for-buttons: true !default;
39+
$cadmin-enable-prefers-reduced-motion-media-query: true !default;
4140
$cadmin-enable-print-styles: true !default;
4241
$cadmin-enable-responsive-font-sizes: false !default;
42+
$cadmin-enable-rounded: true !default;
43+
$cadmin-enable-shadows: true !default;
44+
$cadmin-enable-transitions: true !default;
4345
$cadmin-enable-validation-icons: false !default;
44-
$cadmin-enable-deprecation-messages: true !default;
4546

4647
// Deprecated, no longer affects any compiled CSS
4748

‎packages/clay-css/src/scss/cadmin/variables/_pagination.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,8 @@ $cadmin-pagination-results: map-deep-merge(
486486
$cadmin-pagination-results
487487
);
488488

489+
// @deprecated Pagination Sizes as of v3.146.0
490+
489491
// .pagination-sm
490492

491493
$cadmin-pagination-font-size-sm: 12px !default; // 12px

‎packages/clay-css/src/scss/components/_pagination.scss‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,14 @@
5656
@include clay-css($pagination-results);
5757
}
5858

59-
// Pagination Sizes
59+
/// @deprecated Pagination Sizes as of v3.146.0
6060

61-
.pagination-sm {
62-
@include clay-pagination-variant($pagination-sm);
63-
}
61+
@if ($enable-pagination-sizes) {
62+
.pagination-sm {
63+
@include clay-pagination-variant($pagination-sm);
64+
}
6465

65-
.pagination-lg {
66-
@include clay-pagination-variant($pagination-lg);
66+
.pagination-lg {
67+
@include clay-pagination-variant($pagination-lg);
68+
}
6769
}

‎packages/clay-css/src/scss/variables/_globals.scss‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,18 @@ $scaling-breakpoint-down: sm !default;
4040
$enable-clay-color-functions-process-fallback: false !default;
4141

4242
$enable-caret: false !default;
43-
$enable-rounded: true !default;
44-
$enable-shadows: false !default;
43+
$enable-deprecation-messages: true !default;
4544
$enable-gradients: false !default;
46-
$enable-transitions: true !default;
47-
$enable-prefers-reduced-motion-media-query: true !default;
4845
$enable-grid-classes: true !default;
46+
$enable-pagination-sizes: false !default;
4947
$enable-pointer-cursor-for-buttons: true !default;
48+
$enable-prefers-reduced-motion-media-query: true !default;
5049
$enable-print-styles: true !default;
5150
$enable-responsive-font-sizes: false !default;
51+
$enable-rounded: true !default;
52+
$enable-shadows: false !default;
53+
$enable-transitions: true !default;
5254
$enable-validation-icons: false !default;
53-
$enable-deprecation-messages: true !default;
5455

5556
// Deprecated, no longer affects any compiled CSS
5657

‎packages/clay-css/src/scss/variables/_pagination.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,8 @@ $pagination-results: map-merge(
401401
$pagination-results
402402
);
403403

404+
/// @deprecated Pagination Sizes as of v3.146.0
405+
404406
// .pagination-sm
405407

406408
$pagination-font-size-sm: $font-size-sm !default;

‎packages/clay-pagination/src/Pagination.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {Item} from './Item';
1212
interface IProps extends React.HTMLAttributes<HTMLUListElement> {
1313
/**
1414
* The size of pagination element.
15+
* @deprecated since v3.146.0 with no replacement.
1516
*/
1617
size?: 'lg' | 'sm';
1718
}

‎packages/clay-pagination/stories/Pagination.stories.tsx‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* SPDX-License-Identifier: BSD-3-Clause
44
*/
55

6-
import {number} from '@storybook/addon-knobs';
76
import React from 'react';
87

98
import ClayPagination, {ClayPaginationWithBasicItems} from '../src';
@@ -54,43 +53,6 @@ NoHref.args = {
5453
totalPages: 25,
5554
};
5655

57-
export const Sizes = () => (
58-
<>
59-
<ClayPaginationWithBasicItems
60-
defaultActive={number('Active Page', 8)}
61-
ellipsisBuffer={number('Ellipsis Buffer', 2)}
62-
ellipsisProps={{
63-
'aria-label': 'More {0} through {1}',
64-
title: 'More {0} through {1}',
65-
}}
66-
hrefConstructor={(page) => `#${page}`}
67-
size="sm"
68-
totalPages={25}
69-
/>
70-
<ClayPaginationWithBasicItems
71-
defaultActive={number('Active Page', 8)}
72-
ellipsisBuffer={number('Ellipsis Buffer', 2)}
73-
ellipsisProps={{
74-
'aria-label': 'More {0} through {1}',
75-
title: 'More {0} through {1}',
76-
}}
77-
hrefConstructor={(page) => `#${page}`}
78-
totalPages={25}
79-
/>
80-
<ClayPaginationWithBasicItems
81-
defaultActive={number('Active Page', 8)}
82-
ellipsisBuffer={number('Ellipsis Buffer', 2)}
83-
ellipsisProps={{
84-
'aria-label': 'More {0} through {1}',
85-
title: 'More {0} through {1}',
86-
}}
87-
hrefConstructor={(page) => `#${page}`}
88-
size="lg"
89-
totalPages={25}
90-
/>
91-
</>
92-
);
93-
9456
export const DisabledPages = () => (
9557
<ClayPaginationWithBasicItems
9658
defaultActive={8}

0 commit comments

Comments
 (0)