aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-26 17:37:52 -0700
committerMark Otto <[email protected]>2013-08-26 17:37:52 -0700
commit4d23aa4ef50ac16fec9fbc12832ad99f362ac703 (patch)
treef1049da589b1ad29939401edbe7c74242dbcc4db /dist/css/bootstrap.css
parent8f83a6010a05e673c3e0dcfbd97e8b8ddc3d9135 (diff)
downloadbootstrap-4d23aa4ef50ac16fec9fbc12832ad99f362ac703.tar.xz
bootstrap-4d23aa4ef50ac16fec9fbc12832ad99f362ac703.zip
Address #9873 and fix #9774
* Update styling of justified nav links to be more mobile friendly (with all four rounded corners and some margin between items) * Add note to docs to callout bogus WebKit rendering on component and example
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css48
1 files changed, 42 insertions, 6 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index e365a9201..0921d2a1c 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3899,6 +3899,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav-tabs.nav-justified > li > a {
+ margin-bottom: 5px;
text-align: center;
}
@@ -3907,15 +3908,32 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: table-cell;
width: 1%;
}
+ .nav-tabs.nav-justified > li > a {
+ margin-bottom: 0;
+ }
}
.nav-tabs.nav-justified > li > a {
margin-right: 0;
- border-bottom: 1px solid #dddddd;
+ border-radius: 4px;
}
-.nav-tabs.nav-justified > .active > a {
- border-bottom-color: #ffffff;
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover,
+.nav-tabs.nav-justified > .active > a:focus {
+ border: 1px solid #dddddd;
+}
+
+@media (min-width: 768px) {
+ .nav-tabs.nav-justified > li > a {
+ border-bottom: 1px solid #dddddd;
+ border-radius: 4px 4px 0 0;
+ }
+ .nav-tabs.nav-justified > .active > a,
+ .nav-tabs.nav-justified > .active > a:hover,
+ .nav-tabs.nav-justified > .active > a:focus {
+ border-bottom-color: #ffffff;
+ }
}
.nav-pills > li {
@@ -3955,6 +3973,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav-justified > li > a {
+ margin-bottom: 5px;
text-align: center;
}
@@ -3963,6 +3982,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: table-cell;
width: 1%;
}
+ .nav-justified > li > a {
+ margin-bottom: 0;
+ }
}
.nav-tabs-justified {
@@ -3971,11 +3993,25 @@ textarea.input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified > li > a {
margin-right: 0;
- border-bottom: 1px solid #dddddd;
+ border-radius: 4px;
}
-.nav-tabs-justified > .active > a {
- border-bottom-color: #ffffff;
+.nav-tabs-justified > .active > a,
+.nav-tabs-justified > .active > a:hover,
+.nav-tabs-justified > .active > a:focus {
+ border: 1px solid #dddddd;
+}
+
+@media (min-width: 768px) {
+ .nav-tabs-justified > li > a {
+ border-bottom: 1px solid #dddddd;
+ border-radius: 4px 4px 0 0;
+ }
+ .nav-tabs-justified > .active > a,
+ .nav-tabs-justified > .active > a:hover,
+ .nav-tabs-justified > .active > a:focus {
+ border-bottom-color: #ffffff;
+ }
}
.tabbable:before,