aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-23 23:56:13 -0700
committerMark Otto <[email protected]>2012-07-23 23:56:13 -0700
commitcd441e082f25836be85ecc14f0bed4d8e74965b2 (patch)
tree2f668aed3f42fb561e9401754b6717fa155e3364
parent6245886b269cdba7e8006ebf59165d7558492ec3 (diff)
downloadbootstrap-cd441e082f25836be85ecc14f0bed4d8e74965b2.tar.xz
bootstrap-cd441e082f25836be85ecc14f0bed4d8e74965b2.zip
fixes #4156: don't override border radius if stacked nav has one child
-rw-r--r--docs/assets/css/bootstrap.css18
-rw-r--r--less/navs.less4
2 files changed, 14 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index df389af9c..5525614d6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3686,15 +3686,21 @@ input[type="submit"].btn.btn-mini {
}
.nav-tabs.nav-stacked > li:first-child > a {
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-topright: 4px;
+ -moz-border-radius-topleft: 4px;
}
.nav-tabs.nav-stacked > li:last-child > a {
- -webkit-border-radius: 0 0 4px 4px;
- -moz-border-radius: 0 0 4px 4px;
- border-radius: 0 0 4px 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -moz-border-radius-bottomright: 4px;
+ -moz-border-radius-bottomleft: 4px;
}
.nav-tabs.nav-stacked > li > a:hover {
diff --git a/less/navs.less b/less/navs.less
index 96723ffc9..4c38f7dbf 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -171,10 +171,10 @@
.border-radius(0);
}
.nav-tabs.nav-stacked > li:first-child > a {
- .border-radius(4px 4px 0 0);
+ .border-top-radius(4px);
}
.nav-tabs.nav-stacked > li:last-child > a {
- .border-radius(0 0 4px 4px);
+ .border-bottom-radius(4px);
}
.nav-tabs.nav-stacked > li > a:hover {
border-color: #ddd;