sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-11-06 00:04:43 -05:00
Code Issues Projects Releases Wiki Activity

fixes #4027: same margins on .pager and .pagination

Browse Source
This commit is contained in:
Mark Otto 2012-07-09 00:42:38 -07:00
parent 50a945e084
commit 07f80e6fd8
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/assets/css/bootstrap.css vendored
View File

@ -2755,9 +2755,9 @@ button.close {
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false); filter: progid:dximagetransform.microsoft.gradient(enabled=false);
*zoom: 1; *zoom: 1;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
} }
.btn:hover, .btn:hover,
@ -2804,9 +2804,9 @@ button.close {
background-color: #d9d9d9 \9; background-color: #d9d9d9 \9;
background-image: none; background-image: none;
outline: 0; outline: 0;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
} }
.btn.disabled, .btn.disabled,
@ -4387,8 +4387,7 @@ input[type="submit"].btn.btn-mini {
} }
.pager { .pager {
margin-bottom: 20px; margin: 20px 0;
margin-left: 0;
text-align: center; text-align: center;
list-style: none; list-style: none;
*zoom: 1; *zoom: 1;

3
less/pager.less
View File

@ -4,8 +4,7 @@
.pager { .pager {
margin-left: 0; margin: @baseLineHeight 0;
margin-bottom: @baseLineHeight;
list-style: none; list-style: none;
text-align: center; text-align: center;
.clearfix(); .clearfix();