Skip to content

Pagination / Pager code review and better customizing #11684

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

Closed
tlindig wants to merge 13 commits into from
Closed

Pagination / Pager code review and better customizing #11684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
12cb428
Make pagination more consistent and customizable by supporting variab…
tlindig Dec 3, 2013
2bb826a
removed confusing z-index setting in pagination state hover
tlindig Dec 3, 2013
c67acf9
pagination: using mixin ".pagination-size" for base size too.
tlindig Dec 3, 2013
b8c623c
pagination: rewritten rule for state "disabled" to look like the others
tlindig Dec 3, 2013
9dce9de
pager: add for span elements full support for state "hover", "focus" …
tlindig Dec 3, 2013
98f4403
add dist files.
tlindig Dec 3, 2013
fb2ac7a
Pager: readd lost child selector.
tlindig Dec 3, 2013
48236ba
Pager, Pagination: readded removed/renamed variables and add deprecat…
tlindig Dec 3, 2013
417cf1e
normalized line feed char to '\n'
tlindig Dec 3, 2013
18580af
readd z-index setting for active element.
tlindig Dec 5, 2013
2b3178e
pager: add for span elements full support for state "hover", "focus" …
tlindig Dec 3, 2013
ac564fc
Pager, Pagination: fixed the backward-compatibility issues by
tlindig Dec 3, 2013
f0ad966
Merge branch 'pagination_customizing' of https://github.com/tlindig/b…
tlindig Dec 6, 2013
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
54 changes: 37 additions & 17 deletions dist/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4930,7 +4930,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: inline-block;
padding-left: 0;
margin: 20px 0;
border-radius: 4px;
}

.pagination > li {
Expand All @@ -4941,9 +4940,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
.pagination > li > span {
position: relative;
float: left;
padding: 6px 12px;
margin-left: -1px;
line-height: 1.428571429;
color: #428bca;
text-decoration: none;
background-color: #ffffff;
border: 1px solid #dddddd;
Expand All @@ -4952,21 +4951,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
.pagination > li:first-child > a,
.pagination > li:first-child > span {
margin-left: 0;
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}

.pagination > li:last-child > a,
.pagination > li:last-child > span {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}

.pagination > li > a:hover,
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus {
color: #2a6496;
background-color: #eeeeee;
border-color: #dddddd;
}

.pagination > .active > a,
Expand All @@ -4982,18 +4975,36 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-color: #428bca;
}

.pagination > .disabled > span,
.pagination > .disabled > span:hover,
.pagination > .disabled > span:focus,
.pagination > .disabled > a,
.pagination > .disabled > span,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
.pagination > .disabled > span:hover,
.pagination > .disabled > a:focus,
.pagination > .disabled > span:focus {
color: #999999;
cursor: not-allowed;
background-color: #ffffff;
border-color: #dddddd;
}

.pagination > li > a,
.pagination > li > span {
padding: 6px 12px;
font-size: 14px;
}

.pagination > li:first-child > a,
.pagination > li:first-child > span {
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}

.pagination > li:last-child > a,
.pagination > li:last-child > span {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}

.pagination-lg > li > a,
.pagination-lg > li > span {
padding: 10px 16px;
Expand Down Expand Up @@ -5065,15 +5076,20 @@ textarea.input-group-sm > .input-group-btn > .btn {
.pager li > span {
display: inline-block;
padding: 5px 14px;
color: #428bca;
background-color: #ffffff;
border: 1px solid #dddddd;
border-radius: 15px;
}

.pager li > a:hover,
.pager li > a:focus {
.pager li > span:hover,
.pager li > a:focus,
.pager li > span:focus {
color: #2a6496;
text-decoration: none;
background-color: #eeeeee;
border-color: #dddddd;
}

.pager .next > a,
Expand All @@ -5087,12 +5103,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
}

.pager .disabled > a,
.pager .disabled > span,
.pager .disabled > a:hover,
.pager .disabled > span:hover,
.pager .disabled > a:focus,
.pager .disabled > span {
.pager .disabled > span:focus {
color: #999999;
cursor: not-allowed;
background-color: #ffffff;
border-color: #dddddd;
}

.label {
Expand Down Expand Up @@ -5274,7 +5293,8 @@ a.list-group-item.active > .badge,
transition: all 0.2s ease-in-out;
}

.thumbnail > img {
.thumbnail > img,
.thumbnail a > img {
display: block;
height: auto;
max-width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 20 additions & 11 deletions less/pager.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,21 @@
> span {
display: inline-block;
padding: 5px 14px;
background-color: @pagination-bg;
border: 1px solid @pagination-border;
color: @pagination-default-color;
background-color: @pagination-default-bg;
border: 1px solid @pagination-default-border-color;
border-radius: @pager-border-radius;
}

> a:hover,
> a:focus {
text-decoration: none;
background-color: @pagination-hover-bg;
> a,
> span {
&:hover,
&:focus {
text-decoration: none;
color: @pagination-hover-color;
background-color: @pagination-hover-bg;
border-color: @pagination-hover-border-color;
}
}
}

Expand All @@ -43,12 +49,15 @@

.disabled {
> a,
> a:hover,
> a:focus,
> span {
color: @pager-disabled-color;
background-color: @pagination-bg;
cursor: not-allowed;
&,
&:hover,
&:focus {
color: @pagination-disabled-color;
background-color: @pagination-disabled-bg;
border-color: @pagination-disabled-border-color;
cursor: not-allowed;
}
}
}

Expand Down
39 changes: 18 additions & 21 deletions less/pagination.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,24 @@
display: inline-block;
padding-left: 0;
margin: @line-height-computed 0;
border-radius: @border-radius-base;

> li {
display: inline; // Remove list-style and block-level defaults
> a,
> span {
position: relative;
float: left; // Collapse white-space
padding: @padding-base-vertical @padding-base-horizontal;
line-height: @line-height-base;
text-decoration: none;
background-color: @pagination-bg;
border: 1px solid @pagination-border;
color: @pagination-default-color;
background-color: @pagination-default-bg;
border: 1px solid @pagination-default-border-color;
margin-left: -1px;
}
&:first-child {
> a,
> span {
margin-left: 0;
.border-left-radius(@border-radius-base);
}
}
&:last-child {
> a,
> span {
.border-right-radius(@border-radius-base);
}
}
}
Expand All @@ -39,7 +31,9 @@
> li > span {
&:hover,
&:focus {

@tlindig tlindig Dec 3, 2013

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now done by the mixin ".pagination-size" at bottom of this file. I was not sure if it better to add this mixin here or in the "sizing" block.

color: @pagination-hover-color;
background-color: @pagination-hover-bg;
border-color: @pagination-hover-border-color;
}
}

Expand All @@ -51,21 +45,19 @@
z-index: 2;
color: @pagination-active-color;
background-color: @pagination-active-bg;
border-color: @pagination-active-bg;
border-color: @pagination-active-border-color;
cursor: default;
}
}

> .disabled {
> span,
> span:hover,
> span:focus,
> a,
> a:hover,
> a:focus {
> .disabled > a,
> .disabled > span {
&,
&:hover,
&:focus {
color: @pagination-disabled-color;
background-color: @pagination-bg;
border-color: @pagination-border;
background-color: @pagination-disabled-bg;
border-color: @pagination-disabled-border-color;
cursor: not-allowed;
}
}
Expand All @@ -74,6 +66,11 @@
// Sizing
// --------------------------------------------------

// Base
.pagination {
.pagination-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @border-radius-base);
}

// Large
.pagination-lg {
.pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);
Expand Down
25 changes: 18 additions & 7 deletions less/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,23 +341,34 @@
// Pagination
// -------------------------

@pagination-bg: #fff;
@pagination-border: #ddd;
@pagination-default-color: @link-color;
@pagination-default-bg: #fff;
@pagination-default-border-color: #ddd;

@pagination-hover-bg: @gray-lighter;
@pagination-hover-color: @link-hover-color;
@pagination-hover-bg: @gray-lighter;
@pagination-hover-border-color: #ddd;

@pagination-active-bg: @brand-primary;
@pagination-active-color: #fff;
@pagination-active-color: #fff;
@pagination-active-bg: @brand-primary;
@pagination-active-border-color: @brand-primary;

@pagination-disabled-color: @gray-light;
@pagination-disabled-color: @gray-light;
@pagination-disabled-bg: #fff;
@pagination-disabled-border-color: #ddd;

// deprecated, not naming scheme conform
@pagination-bg: @pagination-default-bg;
// deprecated, not naming scheme conform
@pagination-border: @pagination-default-border-color;

// Pager
// -------------------------

@pager-border-radius: 15px;
@pager-disabled-color: @gray-light;

// deprecated, Pager use instead colors of Pagination
@pager-disabled-color: @pagination-disabled-color;

// Jumbotron
// -------------------------
Expand Down