Skip to content
GitLab
Commit 07f80e6f authored by Mark Otto's avatar Mark Otto
Browse files

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

parent 50a945e0
7 merge requests!4427Use variable for desktop media query,!4258Aria,!4248Amended mentions of 'javascript' to the correct 'JavaScript',!4235Patch 1,!4232Fixing the modal z-index issue + make modal stacking possible,!42132.1.0 wip,!4165Patch 2
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 10 deletions
+8 -10
docs/assets/css/bootstrap.css
+ 7
- 8
View file @ 07f80e6f
...@@ -2755,9 +2755,9 @@ button.close { ...@@ -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 { ...@@ -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 { ...@@ -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;
......
less/pager.less
+ 1
- 2
View file @ 07f80e6f
...@@ -4,8 +4,7 @@ ...@@ -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();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment