aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-26 21:40:15 -0800
committerMark Otto <[email protected]>2013-12-26 21:40:15 -0800
commit5b02dbd97a0a480b0f800cb1011089dab9980300 (patch)
tree7eb7ffdc3bf67d303b95ab2ab05bfbf3f76503d1 /less
parent12980e7ea47057d7e17c3606604c79c6450b272e (diff)
parent201088cb5f9ab4af062b62ac3a10a2e8f07a6ec5 (diff)
downloadbootstrap-5b02dbd97a0a480b0f800cb1011089dab9980300.tar.xz
bootstrap-5b02dbd97a0a480b0f800cb1011089dab9980300.zip
Merge branch 'master' into docs_derp
Conflicts: _config.yml
Diffstat (limited to 'less')
-rw-r--r--less/panels.less27
-rw-r--r--less/variables.less2
2 files changed, 15 insertions, 14 deletions
diff --git a/less/panels.less b/less/panels.less
index ef8786867..8de915c7e 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -59,6 +59,20 @@
> .table,
> .table-responsive > .table {
margin-bottom: 0;
+
+ > tbody:last-child,
+ > tfoot:last-child {
+ > tr:last-child {
+ td:first-child,
+ th:first-child {
+ border-bottom-left-radius: (@panel-border-radius - 1);
+ }
+ td:last-child,
+ th:last-child {
+ border-bottom-right-radius: (@panel-border-radius - 1);
+ }
+ }
+ }
}
> .panel-body + .table,
> .panel-body + .table-responsive {
@@ -95,19 +109,6 @@
border: 0;
margin-bottom: 0;
}
- > .table-striped,
- > .table-responsive > .table-striped {
- > tbody > tr:last-child {
- td:first-child,
- th:first-child {
- border-bottom-left-radius: (@panel-border-radius - 1);
- }
- td:last-child,
- th:last-child {
- border-bottom-left-radius: (@panel-border-radius - 1);
- }
- }
- }
}
diff --git a/less/variables.less b/less/variables.less
index b849cb400..8e1a702ea 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -189,7 +189,7 @@
@dropdown-header-color: @gray-light;
-// Note: Deprecated @dropdown-caret-color as of v3.1.0
+// Note: Deprecated @dropdown-caret-color as of v3.1
@dropdown-caret-color: #000;