Merge branch 'master' into restore_grid_mixins

Conflicts: dist/css/bootstrap.min.css
2026-05-27 14:46:01 +03:00 · 2013-10-13 18:59:40 -07:00
parent 265fda7903 6351c30782
commit bf73f1f9d3
6 changed files with 30 additions and 29 deletions
@@ -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
 // -------------------------