aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-03 16:50:08 -0700
committerMark Otto <[email protected]>2013-08-03 16:50:08 -0700
commit4582eb704f39f0de0fb969ab8c16e5f4c0b5504a (patch)
treec678864c237e2e241c52d1b0e119bb39cea6b054
parent5fb0d69ee2ce2513c9a2d7d4c5ce470e8386d6fe (diff)
parente06b6ba7bafcd1391b8b592b9cabeeab17669f22 (diff)
downloadbootstrap-4582eb704f39f0de0fb969ab8c16e5f4c0b5504a.tar.xz
bootstrap-4582eb704f39f0de0fb969ab8c16e5f4c0b5504a.zip
Merge pull request #9036 from eratzlaff/3.0.0-wip
Change value with variables for btn-large, btn-small and pagination
-rw-r--r--less/buttons.less4
-rw-r--r--less/pagination.less2
2 files changed, 3 insertions, 3 deletions
diff --git a/less/buttons.less b/less/buttons.less
index 8905ffa4a..e53b0132f 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -123,14 +123,14 @@
.btn-large {
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
- line-height: 1.33; // ensure even-numbered height of button next to large input
+ line-height: @line-height-large; // ensure even-numbered height of button next to large input
border-radius: @border-radius-large;
}
.btn-small,
.btn-mini {
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
- line-height: 1.5; // ensure proper height of button next to small input
+ line-height: @line-height-small; // ensure proper height of button next to small input
border-radius: @border-radius-small;
}
.btn-mini {
diff --git a/less/pagination.less b/less/pagination.less
index 6720c6898..3441106c9 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -12,7 +12,7 @@
> a,
> span {
float: left; // Collapse white-space
- padding: 4px 12px;
+ padding: @padding-base-vertical @padding-base-horizontal;
line-height: @line-height-base;
text-decoration: none;
background-color: @pagination-bg;