rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into restore_grid_mixins

Browse source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-10-13 18:59:40 -07:00
commit bf73f1f9d3
6 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dist/css/bootstrap.css vendored
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;
}