Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 128 insertions, 98 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 7c02bb9d0..ee48db08a 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4652,6 +4652,32 @@ td.visible-sm {
   display: table-cell !important;
 }
 
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm {
+    display: none !important;
+  }
+  tr.visible-sm {
+    display: none !important;
+  }
+  th.visible-sm,
+  td.visible-sm {
+    display: none !important;
+  }
+}
+
+@media (min-width: 992px) {
+  .visible-sm {
+    display: none !important;
+  }
+  tr.visible-sm {
+    display: none !important;
+  }
+  th.visible-sm,
+  td.visible-sm {
+    display: none !important;
+  }
+}
+
 .visible-md {
   display: none !important;
 }
@@ -4665,6 +4691,32 @@ td.visible-md {
   display: none !important;
 }
 
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-md {
+    display: block !important;
+  }
+  tr.visible-md {
+    display: table-row !important;
+  }
+  th.visible-md,
+  td.visible-md {
+    display: table-cell !important;
+  }
+}
+
+@media (min-width: 992px) {
+  .visible-md {
+    display: none !important;
+  }
+  tr.visible-md {
+    display: none !important;
+  }
+  th.visible-md,
+  td.visible-md {
+    display: none !important;
+  }
+}
+
 .visible-lg {
   display: none !important;
 }
@@ -4678,6 +4730,32 @@ td.visible-lg {
   display: none !important;
 }
 
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-lg {
+    display: none !important;
+  }
+  tr.visible-lg {
+    display: none !important;
+  }
+  th.visible-lg,
+  td.visible-lg {
+    display: none !important;
+  }
+}
+
+@media (min-width: 992px) {
+  .visible-lg {
+    display: block !important;
+  }
+  tr.visible-lg {
+    display: table-row !important;
+  }
+  th.visible-lg,
+  td.visible-lg {
+    display: table-cell !important;
+  }
+}
+
 .hidden-sm {
   display: none !important;
 }
@@ -4691,63 +4769,20 @@ td.hidden-sm {
   display: none !important;
 }
 
-.hidden-md {
-  display: block !important;
-}
-
-tr.hidden-md {
-  display: table-row !important;
-}
-
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-
-.hidden-lg {
-  display: block !important;
-}
-
-tr.hidden-lg {
-  display: table-row !important;
-}
-
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-
 @media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm {
-    display: none !important;
-  }
-  tr.visible-sm {
-    display: none !important;
-  }
-  th.visible-sm,
-  td.visible-sm {
-    display: none !important;
-  }
-  .visible-md {
+  .hidden-sm {
     display: block !important;
   }
-  tr.visible-md {
+  tr.hidden-sm {
     display: table-row !important;
   }
-  th.visible-md,
-  td.visible-md {
+  th.hidden-sm,
+  td.hidden-sm {
     display: table-cell !important;
   }
-  .visible-lg {
-    display: none !important;
-  }
-  tr.visible-lg {
-    display: none !important;
-  }
-  th.visible-lg,
-  td.visible-lg {
-    display: none !important;
-  }
+}
+
+@media (min-width: 992px) {
   .hidden-sm {
     display: block !important;
   }
@@ -4758,6 +4793,22 @@ td.hidden-lg {
   td.hidden-sm {
     display: table-cell !important;
   }
+}
+
+.hidden-md {
+  display: block !important;
+}
+
+tr.hidden-md {
+  display: table-row !important;
+}
+
+th.hidden-md,
+td.hidden-md {
+  display: table-cell !important;
+}
+
+@media (min-width: 768px) and (max-width: 991px) {
   .hidden-md {
     display: none !important;
   }
@@ -4768,69 +4819,48 @@ td.hidden-lg {
   td.hidden-md {
     display: none !important;
   }
-  .hidden-lg {
-    display: block !important;
-  }
-  tr.hidden-lg {
-    display: table-row !important;
-  }
-  th.hidden-lg,
-  td.hidden-lg {
-    display: table-cell !important;
-  }
 }
 
 @media (min-width: 992px) {
-  .visible-sm {
-    display: none !important;
-  }
-  tr.visible-sm {
-    display: none !important;
-  }
-  th.visible-sm,
-  td.visible-sm {
-    display: none !important;
-  }
-  .visible-md {
-    display: none !important;
-  }
-  tr.visible-md {
-    display: none !important;
-  }
-  th.visible-md,
-  td.visible-md {
-    display: none !important;
-  }
-  .visible-lg {
-    display: block !important;
-  }
-  tr.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-lg,
-  td.visible-lg {
-    display: table-cell !important;
-  }
-  .hidden-sm {
+  .hidden-md {
     display: block !important;
   }
-  tr.hidden-sm {
+  tr.hidden-md {
     display: table-row !important;
   }
-  th.hidden-sm,
-  td.hidden-sm {
+  th.hidden-md,
+  td.hidden-md {
     display: table-cell !important;
   }
-  .hidden-md {
+}
+
+.hidden-lg {
+  display: block !important;
+}
+
+tr.hidden-lg {
+  display: table-row !important;
+}
+
+th.hidden-lg,
+td.hidden-lg {
+  display: table-cell !important;
+}
+
+@media (min-width: 768px) and (max-width: 991px) {
+  .hidden-lg {
     display: block !important;
   }
-  tr.hidden-md {
+  tr.hidden-lg {
     display: table-row !important;
   }
-  th.hidden-md,
-  td.hidden-md {
+  th.hidden-lg,
+  td.hidden-lg {
     display: table-cell !important;
   }
+}
+
+@media (min-width: 992px) {
   .hidden-lg {
     display: none !important;
   }