aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-16 22:00:39 -0700
committerMark Otto <[email protected]>2013-09-16 22:00:39 -0700
commitf2750dd6bcb27648977d2c2de2931d945c5492a8 (patch)
tree65ec9383fa1d7e73b24a7628e620b2bfb54ce50e
parent21486ffad80913bdec8d087be50c39359721e4a9 (diff)
parent2381ab088bda18b4fa3fa041cc3f42ae4c959502 (diff)
downloadbootstrap-f2750dd6bcb27648977d2c2de2931d945c5492a8.tar.xz
bootstrap-f2750dd6bcb27648977d2c2de2931d945c5492a8.zip
Merge pull request #10626 from buob/variablize-nav-pill-border-radius
Variablize nav pill border radius
-rw-r--r--dist/css/bootstrap.css2
-rw-r--r--less/navs.less2
-rw-r--r--less/variables.less1
3 files changed, 3 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 836b74107..c6490a40d 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3951,7 +3951,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav-pills > li > a {
- border-radius: 5px;
+ border-radius: 4px;
}
.nav-pills > li + li {
diff --git a/less/navs.less b/less/navs.less
index bdab92606..e60f9f8f0 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -120,7 +120,7 @@
// Links rendered as pills
> a {
- border-radius: 5px;
+ border-radius: @nav-pills-border-radius;
}
+ li {
margin-left: 2px;
diff --git a/less/variables.less b/less/variables.less
index b84584395..1a998b946 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -336,6 +336,7 @@
@nav-tabs-justified-active-link-border-color: @body-bg;
// Pills
+@nav-pills-border-radius: @border-radius-base;
@nav-pills-active-link-hover-bg: @component-active-bg;
@nav-pills-active-link-hover-color: @component-active-color;