diff options
| author | Mark Otto <[email protected]> | 2013-10-13 18:59:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 18:59:40 -0700 |
| commit | bf73f1f9d3ccb4e3753066b2d697e99b94a0f155 (patch) | |
| tree | fa33f487db14527a2cb69e73ef59ef181ec58584 /dist/css/bootstrap.css | |
| parent | 265fda7903e189ee0d2d7201cc92bf384fc53043 (diff) | |
| parent | 6351c30782a87fe03d5c27e75f2287cc657ba06d (diff) | |
| download | bootstrap-bf73f1f9d3ccb4e3753066b2d697e99b94a0f155.tar.xz bootstrap-bf73f1f9d3ccb4e3753066b2d697e99b94a0f155.zip | |
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4cefadc05..4d73dcb02 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -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; } |