1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 00:29:52 +02:00

Merge branch 'master' into restore_grid_mixins

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-10-13 18:59:40 -07:00
6 changed files with 30 additions and 29 deletions

View File

@@ -4221,26 +4221,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
}
.tabbable:before,
.tabbable:after {
display: table;
content: " ";
}
.tabbable:after {
clear: both;
}
.tabbable:before,
.tabbable:after {
display: table;
content: " ";
}
.tabbable:after {
clear: both;
}
.tab-content > .tab-pane {
display: none;
}