Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
e0d1b83e
Commit
e0d1b83e
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #8412 from cvrebert/pagination-nesting
use nesting more in pagination.less
parents
46378c7b
6bda16f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+13
-13
docs/assets/css/bootstrap.css
less/pagination.less
+50
-40
less/pagination.less
with
63 additions
and
53 deletions
+63
-53
docs/assets/css/bootstrap.css
+
13
-
13
View file @
e0d1b83e
...
@@ -3323,6 +3323,19 @@ button.close {
...
@@ -3323,6 +3323,19 @@ button.close {
border-left-width
:
0
;
border-left-width
:
0
;
}
}
.pagination
>
li
:first-child
>
a
,
.pagination
>
li
:first-child
>
span
{
border-left-width
:
1px
;
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
>
a
:hover
,
.pagination
>
li
>
a
:focus
,
.pagination
>
li
>
a
:focus
,
.pagination
>
.active
>
a
,
.pagination
>
.active
>
a
,
...
@@ -3345,19 +3358,6 @@ button.close {
...
@@ -3345,19 +3358,6 @@ button.close {
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.pagination
>
li
:first-child
>
a
,
.pagination
>
li
:first-child
>
span
{
border-left-width
:
1px
;
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-large
>
li
>
a
,
.pagination-large
>
li
>
a
,
.pagination-large
>
li
>
span
{
.pagination-large
>
li
>
span
{
padding
:
14px
16px
;
padding
:
14px
16px
;
...
...
This diff is collapsed.
Click to expand it.
less/pagination.less
+
50
-
40
View file @
e0d1b83e
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
> li {
> li {
display: inline; // Remove list-style and block-level defaults
display: inline; // Remove list-style and block-level defaults
> a,
> a,
> span
,
{
> span
{
float: left; // Collapse white-space
float: left; // Collapse white-space
padding: 4px 12px;
padding: 4px 12px;
line-height: @line-height-base;
line-height: @line-height-base;
...
@@ -19,6 +19,19 @@
...
@@ -19,6 +19,19 @@
border: 1px solid @pagination-border;
border: 1px solid @pagination-border;
border-left-width: 0;
border-left-width: 0;
}
}
&:first-child {
> a,
> span {
border-left-width: 1px;
.border-left-radius(@border-radius-base);
}
}
&:last-child {
> a,
> span {
.border-right-radius(@border-radius-base);
}
}
}
}
> li > a:hover,
> li > a:hover,
...
@@ -43,21 +56,6 @@
...
@@ -43,21 +56,6 @@
cursor: default;
cursor: default;
}
}
}
}
> li:first-child {
> a,
> span {
border-left-width: 1px;
.border-left-radius(@border-radius-base);
}
}
> li:last-child {
> a,
> span {
.border-right-radius(@border-radius-base);
}
}
}
}
// Sizing
// Sizing
...
@@ -65,34 +63,46 @@
...
@@ -65,34 +63,46 @@
// Large
// Large
.pagination-large {
.pagination-large {
> li > a,
> li {
> li > span {
> a,
padding: @padding-large-vertical @padding-large-horizontal;
> span {
font-size: @font-size-large;
padding: @padding-large-vertical @padding-large-horizontal;
}
font-size: @font-size-large;
> li:first-child > a,
}
> li:first-child > span {
&:first-child {
.border-left-radius(@border-radius-large);
> a,
}
> span {
> li:last-child > a,
.border-left-radius(@border-radius-large);
> li:last-child > span {
}
.border-right-radius(@border-radius-large);
}
&:last-child {
> a,
> span {
.border-right-radius(@border-radius-large);
}
}
}
}
}
}
// Small
// Small
.pagination-small {
.pagination-small {
> li > a,
> li {
> li > span {
> a,
padding: @padding-small-vertical @padding-small-horizontal;
> span {
font-size: @font-size-small;
padding: @padding-small-vertical @padding-small-horizontal;
}
font-size: @font-size-small;
> li:first-child > a,
}
> li:first-child > span {
&:first-child {
.border-left-radius(@border-radius-small);
> a,
}
> span {
> li:last-child > a,
.border-left-radius(@border-radius-small);
> li:last-child > span {
}
.border-right-radius(@border-radius-small);
}
&:last-child {
> a,
> span {
.border-right-radius(@border-radius-small);
}
}
}
}
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment