Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎹 Pager: Rename to Pagination (Styles) #28233

Merged
merged 11 commits into from
Oct 25, 2024
Merged

🎹 Pager: Rename to Pagination (Styles) #28233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c6c8e0b
Rename CSS class variables
Raushen Oct 23, 2024
7b64112
Merge branch '24_2' of github.com:DevExpress/DevExtreme into Rename_P…
Raushen Oct 23, 2024
434e736
Rename SCSS variables
Raushen Oct 23, 2024
cbfffd2
Merge branch '24_2' of github.com:DevExpress/DevExtreme into Rename_P…
Raushen Oct 23, 2024
9a28818
Move styles from dx-datagrid-pager
Raushen Oct 23, 2024
a12dfc7
lint fix
Raushen Oct 23, 2024
50aa8b0
Create .dx-pagination root css class
Raushen Oct 23, 2024
ca7d150
Rename files, folder and update imports
Raushen Oct 23, 2024
6ec55f2
Rollback
Raushen Oct 23, 2024
bc1cce3
Merge branch '24_2' of github.com:DevExpress/DevExtreme into Rename_P…
Raushen Oct 24, 2024
f5f61bd
fix tests
Raushen Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/devextreme-scss/scss/widgets/base/_gridBase.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
border-top: 0;
}

> .dx-#{$widget-name}-pager {
margin-top: -1px;
}

> .dx-#{$widget-name}-header-panel {
border-bottom: 0;
}

> .dx-pager {
margin-top: -1px;
}

> .dx-#{$widget-name}-rowsview.dx-last-row-border {
tbody:last-child > .dx-data-row:nth-last-child(2) {
&,
Expand Down
21 changes: 12 additions & 9 deletions ...xtreme-scss/scss/widgets/base/_pager.scss → ...e-scss/scss/widgets/base/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
// adduse


$pager-paddings: 8px;
$pager-info-paddings: 9px;
$pagination-paddings: 8px;
$pagination-info-paddings: 9px;

.dx-pager {
.dx-pager,
.dx-pagination {
overflow: hidden;
width: 100%;
padding-top: $pager-paddings;
padding-bottom: $pager-paddings;
padding-top: $pagination-paddings;
padding-bottom: $pagination-paddings;
line-height: normal;

@include user-select(none);
Expand Down Expand Up @@ -39,7 +40,7 @@ $pager-info-paddings: 9px;

.dx-info {
display: inline-block;
margin-right: $pager-info-paddings;
margin-right: $pagination-info-paddings;
opacity: 0.7;
}

Expand All @@ -49,7 +50,7 @@ $pager-info-paddings: 9px;
cursor: pointer;
display: inline-block;
vertical-align: top;
padding: $pager-paddings - 1px 13px;
padding: $pagination-paddings - 1px 13px;
box-sizing: content-box;

&.dx-button-disable {
Expand Down Expand Up @@ -117,7 +118,9 @@ $pager-info-paddings: 9px;
}

.dx-rtl .dx-pager,
.dx-pager.dx-rtl {
.dx-pager.dx-rtl,
.dx-rtl .dx-pagination,
.dx-pagination.dx-rtl {
.dx-pages {
float: left;
direction: ltr;
Expand All @@ -132,7 +135,7 @@ $pager-info-paddings: 9px;

.dx-info {
direction: rtl;
margin-left: $pager-info-paddings;
margin-left: $pagination-info-paddings;
margin-right: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-scss/scss/widgets/fluent/gridBase/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// adduse
@use "../scrollable";
@use "../overlay";
@use "../pager";
@use "../pagination";

$fluent-grid-base-border-hidden: 1px solid transparent;
$fluent-grid-base-row-border: 1px solid transparent;
Expand Down
26 changes: 0 additions & 26 deletions packages/devextreme-scss/scss/widgets/fluent/pager/_sizes.scss
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...ss/scss/widgets/fluent/pager/_colors.scss → ...ss/widgets/fluent/pagination/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
* $name 180. Pager selected item text color
* $type color
*/
$pager-page-selected-color: $base-inverted-text-color !default;
$pager-page-hovered-bg: $base-hover-bg !default;
$pagination-page-selected-color: $base-inverted-text-color !default;
$pagination-page-hovered-bg: $base-hover-bg !default;

/**
* $name 190. Pager selected item background color
* $type color
*/
$pager-page-selected-bg: $base-accent !default;
$pagination-page-selected-bg: $base-accent !default;
37 changes: 19 additions & 18 deletions ...css/scss/widgets/fluent/pager/_index.scss → ...css/widgets/fluent/pagination/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@
@use "sizes" as *;
@use "../sizes" as *;
@use "../../base/icons" as *;
@use "../../base/pager";
@use "../../base/pagination";
@use "../gridBase/sizes" as *;

// adduse


.dx-pager {
padding: $fluent-pager-paddings $fluent-grid-base-cell-horizontal-padding;
.dx-pager,
.dx-pagination {
padding: $fluent-pagination-paddings $fluent-grid-base-cell-horizontal-padding;

&.dx-light-mode {
.dx-page-sizes {
min-width: $fluent-pager-light-pagesizes-min-width;
min-width: $fluent-pagination-light-pagesizes-min-width;
}

.dx-page-index {
min-width: $fluent-pager-light-pageindex-min-width;
min-width: $fluent-pagination-light-pageindex-min-width;
}

.dx-pages {
Expand All @@ -36,19 +37,19 @@

.dx-pages {
.dx-page {
padding: $fluent-pager-page-padding;
line-height: $fluent-pager-page-line-height;
padding: $fluent-pagination-page-padding;
line-height: $fluent-pagination-page-line-height;
}

.dx-separator {
padding-left: $fluent-pager-separator-paddings;
padding-right: $fluent-pager-separator-paddings;
padding-left: $fluent-pagination-separator-paddings;
padding-right: $fluent-pagination-separator-paddings;
}

.dx-navigate-button {
width: 9px;
height: $fluent-pager-navbutton-height;
padding: $fluent-pager-navbutton-paddings;
height: $fluent-pagination-navbutton-height;
padding: $fluent-pagination-navbutton-paddings;
}

.dx-prev-button {
Expand All @@ -61,16 +62,16 @@

.dx-prev-button,
.dx-next-button {
@include dx-icon-font-centered-sizing($fluent-pager-navbutton-icon-size);
@include dx-icon-font-centered-sizing($fluent-pagination-navbutton-icon-size);
}
}

.dx-page,
.dx-page-size {
font-size: $fluent-pager-page-font-size;
font-size: $fluent-pagination-page-font-size;

&:hover {
background-color: $pager-page-hovered-bg;
background-color: $pagination-page-hovered-bg;
}

border-radius: 20px;
Expand All @@ -82,16 +83,16 @@
margin-left: 0;
}

padding: $fluent-pager-page-padding;
line-height: $fluent-pager-page-line-height;
padding: $fluent-pagination-page-padding;
line-height: $fluent-pagination-page-line-height;
}

.dx-pages,
.dx-page-sizes {
.dx-selection {
font-weight: 500;
background-color: $pager-page-selected-bg;
color: $pager-page-selected-color;
background-color: $pagination-page-selected-bg;
color: $pagination-page-selected-color;
}
}
}
26 changes: 26 additions & 0 deletions packages/devextreme-scss/scss/widgets/fluent/pagination/_sizes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
@use "../sizes" as *;

// adduse

$fluent-pagination-paddings: 13px !default;
$fluent-pagination-separator-paddings: 8px !default;
$fluent-pagination-page-padding: 9px 12px !default;
$fluent-pagination-page-line-height: 12px !default;
$fluent-pagination-page-font-size: 12px !default;
$fluent-pagination-navbutton-paddings: $fluent-pagination-page-padding !default;
$fluent-pagination-navbutton-height: 12px !default;
$fluent-pagination-navbutton-icon-size: null !default;
$fluent-pagination-light-pagesizes-min-width: null !default;
$fluent-pagination-light-pageindex-min-width: null !default;

@if $size == "default" {
$fluent-pagination-navbutton-icon-size: 21px !default;
$fluent-pagination-light-pagesizes-min-width: 62px !default;
$fluent-pagination-light-pageindex-min-width: 32px !default;
}

@else if $size == "compact" {
$fluent-pagination-navbutton-icon-size: 16px !default;
$fluent-pagination-light-pagesizes-min-width: 42px !default;
$fluent-pagination-light-pageindex-min-width: 27px !default;
}
21 changes: 1 addition & 20 deletions packages/devextreme-scss/scss/widgets/generic/gridBase/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// adduse
@use "../scrollable";
@use "../overlay";
@use "../pager";
@use "../pagination";

$generic-grid-base-border-hidden: 1px solid transparent;
$generic-grid-base-row-border: 1px solid transparent;
Expand Down Expand Up @@ -964,25 +964,6 @@ $generic-grid-base-group-panel-message-line-height: $generic-button-text-line-he
background-color: $datagrid-base-background-color;
}

.dx-#{$widget-name}-pager {
border-top: 1px solid $datagrid-border-color;

.dx-page,
.dx-page-size,
.dx-navigate-button {
outline: none;
}

&.dx-state-focused {
.dx-page:focus,
.dx-page-size:focus,
.dx-navigate-button:focus {
outline: 2px solid $datagrid-focused-border-color;
outline-offset: -2px;
}
}
}

.dx-#{$widget-name}-summary-item {
color: $datagrid-summary-color;
}
Expand Down
67 changes: 0 additions & 67 deletions packages/devextreme-scss/scss/widgets/generic/pager/_colors.scss
View file
Open in desktop

This file was deleted.

Loading
Loading