Skip to content

Commit

Permalink
slate: match pagination padding to buttons and inputs, fixes #1290
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomaspark
thomaspark committed Jan 4, 2024
1 parent 6d67bf7 commit 7ca0f32
Show file tree
Hide file tree
Showing 16 changed files with 70 additions and 24 deletions.
2 changes: 2 additions & 0 deletions dist/slate/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
$navbar-padding-y: 0 !default;

// Pagination
$pagination-padding-y: $input-btn-padding-y !default;
$pagination-padding-x: $input-btn-padding-x !default;

$pagination-color: $white !default;
$pagination-bg: transparent !default;
Expand Down
6 changes: 3 additions & 3 deletions dist/slate/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*!
* Bootswatch v5.3.2 (https://bootswatch.com)
* Theme: slate
* Copyright 2012-2023 Thomas Park
* Copyright 2012-2024 Thomas Park
* Licensed under MIT
* Based on Bootstrap
*/
Expand Down Expand Up @@ -4744,8 +4744,8 @@ textarea.form-control-lg {
}

.pagination {
--bs-pagination-padding-x: 0.75rem;
--bs-pagination-padding-y: 0.375rem;
--bs-pagination-padding-x: 1rem;
--bs-pagination-padding-y: 0.75rem;
--bs-pagination-font-size: 1rem;
--bs-pagination-color: #fff;
--bs-pagination-bg: transparent;
Expand Down
4 changes: 2 additions & 2 deletions dist/slate/bootstrap.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/slate/bootstrap.min.css.map
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/slate/bootstrap.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*!
* Bootswatch v5.3.2 (https://bootswatch.com)
* Theme: slate
* Copyright 2012-2023 Thomas Park
* Copyright 2012-2024 Thomas Park
* Licensed under MIT
* Based on Bootstrap
*/
Expand Down Expand Up @@ -4742,8 +4742,8 @@ textarea.form-control-lg {
}

.pagination {
--bs-pagination-padding-x: 0.75rem;
--bs-pagination-padding-y: 0.375rem;
--bs-pagination-padding-x: 1rem;
--bs-pagination-padding-y: 0.75rem;
--bs-pagination-font-size: 1rem;
--bs-pagination-color: #fff;
--bs-pagination-bg: transparent;
Expand Down
4 changes: 2 additions & 2 deletions dist/slate/bootstrap.rtl.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/slate/bootstrap.rtl.min.css.map
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/5/slate/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ $nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
$navbar-padding-y: 0 !default;

// Pagination
$pagination-padding-y: $input-btn-padding-y !default;
$pagination-padding-x: $input-btn-padding-x !default;

$pagination-color: $white !default;
$pagination-bg: transparent !default;
Expand Down
6 changes: 3 additions & 3 deletions docs/5/slate/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*!
* Bootswatch v5.3.2 (https://bootswatch.com)
* Theme: slate
* Copyright 2012-2023 Thomas Park
* Copyright 2012-2024 Thomas Park
* Licensed under MIT
* Based on Bootstrap
*/
Expand Down Expand Up @@ -4744,8 +4744,8 @@ textarea.form-control-lg {
}

.pagination {
--bs-pagination-padding-x: 0.75rem;
--bs-pagination-padding-y: 0.375rem;
--bs-pagination-padding-x: 1rem;
--bs-pagination-padding-y: 0.75rem;
--bs-pagination-font-size: 1rem;
--bs-pagination-color: #fff;
--bs-pagination-bg: transparent;
Expand Down
4 changes: 2 additions & 2 deletions docs/5/slate/bootstrap.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/5/slate/bootstrap.min.css.map
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/5/slate/bootstrap.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*!
* Bootswatch v5.3.2 (https://bootswatch.com)
* Theme: slate
* Copyright 2012-2023 Thomas Park
* Copyright 2012-2024 Thomas Park
* Licensed under MIT
* Based on Bootstrap
*/
Expand Down Expand Up @@ -4742,8 +4742,8 @@ textarea.form-control-lg {
}

.pagination {
--bs-pagination-padding-x: 0.75rem;
--bs-pagination-padding-y: 0.375rem;
--bs-pagination-padding-x: 1rem;
--bs-pagination-padding-y: 0.75rem;
--bs-pagination-font-size: 1rem;
--bs-pagination-color: #fff;
--bs-pagination-bg: transparent;
Expand Down
4 changes: 2 additions & 2 deletions docs/5/slate/bootstrap.rtl.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/5/slate/bootstrap.rtl.min.css.map
View file

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions docs/default/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,27 @@ <h1>Default</h1>
</div>
</div>

<ul class="pagination">
<li class="paginate_button page-item first disabled" id="mvtstock_first">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="first" tabindex="0" class="page-link">Premier</a>
</li>
<li class="paginate_button page-item previous disabled" id="mvtstock_previous">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="previous" tabindex="0" class="page-link">Précédent</a>
</li>
<li class="paginate_button page-item " id="mvtstock_input">
<div class="input-group">
<input style="width: 3.5em; margin-left: -1px;" disabled="" class="form-control rounded-0" type="number" min="1" max="1">
<span class="input-group-text rounded-0" id="basic-addon2"> sur 1</span>
</div>
</li>
<li class="paginate_button page-item next disabled" id="mvtstock_next">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="next" tabindex="0" class="page-link">Suivant</a>
</li>
<li class="paginate_button page-item last disabled" id="mvtstock_last">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="last" tabindex="0" class="page-link">Dernier</a>
</li>
</ul>

<!-- Navbar
================================================== -->
<div class="bs-docs-section clearfix">
Expand Down
21 changes: 21 additions & 0 deletions docs/slate/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,27 @@ <h1>Slate</h1>
</div>
</div>

<ul class="pagination">
<li class="paginate_button page-item first disabled" id="mvtstock_first">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="first" tabindex="0" class="page-link">Premier</a>
</li>
<li class="paginate_button page-item previous disabled" id="mvtstock_previous">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="previous" tabindex="0" class="page-link">Précédent</a>
</li>
<li class="paginate_button page-item " id="mvtstock_input">
<div class="input-group">
<input style="width: 3.5em; margin-left: -1px;" disabled="" class="form-control rounded-0" type="number" min="1" max="1">
<span class="input-group-text rounded-0" id="basic-addon2"> sur 1</span>
</div>
</li>
<li class="paginate_button page-item next disabled" id="mvtstock_next">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="next" tabindex="0" class="page-link">Suivant</a>
</li>
<li class="paginate_button page-item last disabled" id="mvtstock_last">
<a aria-controls="mvtstock" aria-disabled="true" role="link" data-dt-idx="last" tabindex="0" class="page-link">Dernier</a>
</li>
</ul>

<!-- Navbar
================================================== -->
<div class="bs-docs-section clearfix">
Expand Down

0 comments on commit 7ca0f32

Please sign in to comment.