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 /less | |
| 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 'less')
| -rw-r--r-- | less/navs.less | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/less/navs.less b/less/navs.less index b1d4fcd23..bebb63311 100644 --- a/less/navs.less +++ b/less/navs.less @@ -190,6 +190,8 @@ } // Move borders to anchors instead of bottom of list +// +// Mixin for adding on top the shared `.nav-justified` styles for our tabs .nav-tabs-justified { border-bottom: 0; @@ -222,11 +224,6 @@ // Tabbable tabs // ------------------------- -// Clear any floats -.tabbable { - .clearfix(); -} - // Hide tabbable panes to start, show them when `.active` .tab-content { > .tab-pane { @@ -238,7 +235,6 @@ } - // Dropdowns // ------------------------- |