diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 06e55c0b45b2..a117ee5af187 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -57,21 +57,6 @@
   display: none !important;
 }
 
-@media (max-width: 767px) {
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-}
-
 @media (min-width: 768px) and (max-width: 979px) {
   .visible-tablet {
     display: inherit !important;
@@ -87,120 +72,24 @@
   }
 }
 
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 18px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .modal {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    left: 10px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
 @media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
+  .visible-phone {
+    display: inherit !important;
   }
-  [class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: auto;
-    margin-left: 0;
+  .hidden-phone {
+    display: none !important;
   }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 28px;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-        -ms-box-sizing: border-box;
-            box-sizing: border-box;
+  .hidden-desktop {
+    display: inherit !important;
   }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
+  .visible-desktop {
+    display: none !important;
   }
 }
 
-@media (min-width: 768px) and (max-width: 979px) {
+@media (min-width: 1200px) {
   .row {
-    margin-left: -20px;
+    margin-left: -30px;
     *zoom: 1;
   }
   .row:before,
@@ -213,84 +102,84 @@
   }
   [class*="span"] {
     float: left;
-    margin-left: 20px;
+    margin-left: 30px;
   }
   .container,
   .navbar-fixed-top .container,
   .navbar-fixed-bottom .container {
-    width: 724px;
+    width: 1170px;
   }
   .span12 {
-    width: 724px;
+    width: 1170px;
   }
   .span11 {
-    width: 662px;
+    width: 1070px;
   }
   .span10 {
-    width: 600px;
+    width: 970px;
   }
   .span9 {
-    width: 538px;
+    width: 870px;
   }
   .span8 {
-    width: 476px;
+    width: 770px;
   }
   .span7 {
-    width: 414px;
+    width: 670px;
   }
   .span6 {
-    width: 352px;
+    width: 570px;
   }
   .span5 {
-    width: 290px;
+    width: 470px;
   }
   .span4 {
-    width: 228px;
+    width: 370px;
   }
   .span3 {
-    width: 166px;
+    width: 270px;
   }
   .span2 {
-    width: 104px;
+    width: 170px;
   }
   .span1 {
-    width: 42px;
+    width: 70px;
   }
   .offset12 {
-    margin-left: 764px;
+    margin-left: 1230px;
   }
   .offset11 {
-    margin-left: 702px;
+    margin-left: 1130px;
   }
   .offset10 {
-    margin-left: 640px;
+    margin-left: 1030px;
   }
   .offset9 {
-    margin-left: 578px;
+    margin-left: 930px;
   }
   .offset8 {
-    margin-left: 516px;
+    margin-left: 830px;
   }
   .offset7 {
-    margin-left: 454px;
+    margin-left: 730px;
   }
   .offset6 {
-    margin-left: 392px;
+    margin-left: 630px;
   }
   .offset5 {
-    margin-left: 330px;
+    margin-left: 530px;
   }
   .offset4 {
-    margin-left: 268px;
+    margin-left: 430px;
   }
   .offset3 {
-    margin-left: 206px;
+    margin-left: 330px;
   }
   .offset2 {
-    margin-left: 144px;
+    margin-left: 230px;
   }
   .offset1 {
-    margin-left: 82px;
+    margin-left: 130px;
   }
   .row-fluid {
     width: 100%;
@@ -309,8 +198,8 @@
     float: left;
     width: 100%;
     min-height: 28px;
-    margin-left: 2.762430939%;
-    *margin-left: 2.709239449638298%;
+    margin-left: 2.564102564%;
+    *margin-left: 2.510911074638298%;
     -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;
         -ms-box-sizing: border-box;
@@ -320,52 +209,52 @@
     margin-left: 0;
   }
   .row-fluid .span12 {
-    width: 99.999999993%;
-    *width: 99.9468085036383%;
+    width: 100%;
+    *width: 99.94680851063829%;
   }
   .row-fluid .span11 {
-    width: 91.436464082%;
-    *width: 91.38327259263829%;
+    width: 91.45299145300001%;
+    *width: 91.3997999636383%;
   }
   .row-fluid .span10 {
-    width: 82.87292817100001%;
-    *width: 82.8197366816383%;
+    width: 82.905982906%;
+    *width: 82.8527914166383%;
   }
   .row-fluid .span9 {
-    width: 74.30939226%;
-    *width: 74.25620077063829%;
+    width: 74.358974359%;
+    *width: 74.30578286963829%;
   }
   .row-fluid .span8 {
-    width: 65.74585634900001%;
-    *width: 65.6926648596383%;
+    width: 65.81196581200001%;
+    *width: 65.7587743226383%;
   }
   .row-fluid .span7 {
-    width: 57.182320438000005%;
-    *width: 57.129128948638304%;
+    width: 57.264957265%;
+    *width: 57.2117657756383%;
   }
   .row-fluid .span6 {
-    width: 48.618784527%;
-    *width: 48.5655930376383%;
+    width: 48.717948718%;
+    *width: 48.6647572286383%;
   }
   .row-fluid .span5 {
-    width: 40.055248616%;
-    *width: 40.0020571266383%;
+    width: 40.170940171000005%;
+    *width: 40.117748681638304%;
   }
   .row-fluid .span4 {
-    width: 31.491712705%;
-    *width: 31.4385212156383%;
+    width: 31.623931624%;
+    *width: 31.5707401346383%;
   }
   .row-fluid .span3 {
-    width: 22.928176794%;
-    *width: 22.874985304638297%;
+    width: 23.076923077%;
+    *width: 23.0237315876383%;
   }
   .row-fluid .span2 {
-    width: 14.364640883%;
-    *width: 14.311449393638298%;
+    width: 14.529914530000001%;
+    *width: 14.4767230406383%;
   }
   .row-fluid .span1 {
-    width: 5.801104972%;
-    *width: 5.747913482638298%;
+    width: 5.982905983%;
+    *width: 5.929714493638298%;
   }
   input,
   textarea,
@@ -375,68 +264,77 @@
   input.span12,
   textarea.span12,
   .uneditable-input.span12 {
-    width: 714px;
+    width: 1160px;
   }
   input.span11,
   textarea.span11,
   .uneditable-input.span11 {
-    width: 652px;
+    width: 1060px;
   }
   input.span10,
   textarea.span10,
   .uneditable-input.span10 {
-    width: 590px;
+    width: 960px;
   }
   input.span9,
   textarea.span9,
   .uneditable-input.span9 {
-    width: 528px;
+    width: 860px;
   }
   input.span8,
   textarea.span8,
   .uneditable-input.span8 {
-    width: 466px;
+    width: 760px;
   }
   input.span7,
   textarea.span7,
   .uneditable-input.span7 {
-    width: 404px;
+    width: 660px;
   }
   input.span6,
   textarea.span6,
   .uneditable-input.span6 {
-    width: 342px;
+    width: 560px;
   }
   input.span5,
   textarea.span5,
   .uneditable-input.span5 {
-    width: 280px;
+    width: 460px;
   }
   input.span4,
   textarea.span4,
   .uneditable-input.span4 {
-    width: 218px;
+    width: 360px;
   }
   input.span3,
   textarea.span3,
   .uneditable-input.span3 {
-    width: 156px;
+    width: 260px;
   }
   input.span2,
   textarea.span2,
   .uneditable-input.span2 {
-    width: 94px;
+    width: 160px;
   }
   input.span1,
   textarea.span1,
   .uneditable-input.span1 {
-    width: 32px;
+    width: 60px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
   }
 }
 
-@media (min-width: 1200px) {
+@media (min-width: 768px) and (max-width: 979px) {
   .row {
-    margin-left: -30px;
+    margin-left: -20px;
     *zoom: 1;
   }
   .row:before,
@@ -449,84 +347,84 @@
   }
   [class*="span"] {
     float: left;
-    margin-left: 30px;
+    margin-left: 20px;
   }
   .container,
   .navbar-fixed-top .container,
   .navbar-fixed-bottom .container {
-    width: 1170px;
+    width: 724px;
   }
   .span12 {
-    width: 1170px;
+    width: 724px;
   }
   .span11 {
-    width: 1070px;
+    width: 662px;
   }
   .span10 {
-    width: 970px;
+    width: 600px;
   }
   .span9 {
-    width: 870px;
+    width: 538px;
   }
   .span8 {
-    width: 770px;
+    width: 476px;
   }
   .span7 {
-    width: 670px;
+    width: 414px;
   }
   .span6 {
-    width: 570px;
+    width: 352px;
   }
   .span5 {
-    width: 470px;
+    width: 290px;
   }
   .span4 {
-    width: 370px;
+    width: 228px;
   }
   .span3 {
-    width: 270px;
+    width: 166px;
   }
   .span2 {
-    width: 170px;
+    width: 104px;
   }
   .span1 {
-    width: 70px;
+    width: 42px;
   }
   .offset12 {
-    margin-left: 1230px;
+    margin-left: 764px;
   }
   .offset11 {
-    margin-left: 1130px;
+    margin-left: 702px;
   }
   .offset10 {
-    margin-left: 1030px;
+    margin-left: 640px;
   }
   .offset9 {
-    margin-left: 930px;
+    margin-left: 578px;
   }
   .offset8 {
-    margin-left: 830px;
+    margin-left: 516px;
   }
   .offset7 {
-    margin-left: 730px;
+    margin-left: 454px;
   }
   .offset6 {
-    margin-left: 630px;
+    margin-left: 392px;
   }
   .offset5 {
-    margin-left: 530px;
+    margin-left: 330px;
   }
   .offset4 {
-    margin-left: 430px;
+    margin-left: 268px;
   }
   .offset3 {
-    margin-left: 330px;
+    margin-left: 206px;
   }
   .offset2 {
-    margin-left: 230px;
+    margin-left: 144px;
   }
   .offset1 {
-    margin-left: 130px;
+    margin-left: 82px;
   }
   .row-fluid {
     width: 100%;
@@ -545,8 +443,8 @@
     float: left;
     width: 100%;
     min-height: 28px;
-    margin-left: 2.564102564%;
-    *margin-left: 2.510911074638298%;
+    margin-left: 2.762430939%;
+    *margin-left: 2.709239449638298%;
     -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;
         -ms-box-sizing: border-box;
@@ -556,52 +454,52 @@
     margin-left: 0;
   }
   .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
+    width: 99.999999993%;
+    *width: 99.9468085036383%;
   }
   .row-fluid .span11 {
-    width: 91.45299145300001%;
-    *width: 91.3997999636383%;
+    width: 91.436464082%;
+    *width: 91.38327259263829%;
   }
   .row-fluid .span10 {
-    width: 82.905982906%;
-    *width: 82.8527914166383%;
+    width: 82.87292817100001%;
+    *width: 82.8197366816383%;
   }
   .row-fluid .span9 {
-    width: 74.358974359%;
-    *width: 74.30578286963829%;
+    width: 74.30939226%;
+    *width: 74.25620077063829%;
   }
   .row-fluid .span8 {
-    width: 65.81196581200001%;
-    *width: 65.7587743226383%;
+    width: 65.74585634900001%;
+    *width: 65.6926648596383%;
   }
   .row-fluid .span7 {
-    width: 57.264957265%;
-    *width: 57.2117657756383%;
+    width: 57.182320438000005%;
+    *width: 57.129128948638304%;
   }
   .row-fluid .span6 {
-    width: 48.717948718%;
-    *width: 48.6647572286383%;
+    width: 48.618784527%;
+    *width: 48.5655930376383%;
   }
   .row-fluid .span5 {
-    width: 40.170940171000005%;
-    *width: 40.117748681638304%;
+    width: 40.055248616%;
+    *width: 40.0020571266383%;
   }
   .row-fluid .span4 {
-    width: 31.623931624%;
-    *width: 31.5707401346383%;
+    width: 31.491712705%;
+    *width: 31.4385212156383%;
   }
   .row-fluid .span3 {
-    width: 23.076923077%;
-    *width: 23.0237315876383%;
+    width: 22.928176794%;
+    *width: 22.874985304638297%;
   }
   .row-fluid .span2 {
-    width: 14.529914530000001%;
-    *width: 14.4767230406383%;
+    width: 14.364640883%;
+    *width: 14.311449393638298%;
   }
   .row-fluid .span1 {
-    width: 5.982905983%;
-    *width: 5.929714493638298%;
+    width: 5.801104972%;
+    *width: 5.747913482638298%;
   }
   input,
   textarea,
@@ -611,72 +509,181 @@
   input.span12,
   textarea.span12,
   .uneditable-input.span12 {
-    width: 1160px;
+    width: 714px;
   }
   input.span11,
   textarea.span11,
   .uneditable-input.span11 {
-    width: 1060px;
+    width: 652px;
   }
   input.span10,
   textarea.span10,
   .uneditable-input.span10 {
-    width: 960px;
+    width: 590px;
   }
   input.span9,
   textarea.span9,
   .uneditable-input.span9 {
-    width: 860px;
+    width: 528px;
   }
   input.span8,
   textarea.span8,
   .uneditable-input.span8 {
-    width: 760px;
+    width: 466px;
   }
   input.span7,
   textarea.span7,
   .uneditable-input.span7 {
-    width: 660px;
+    width: 404px;
   }
   input.span6,
   textarea.span6,
   .uneditable-input.span6 {
-    width: 560px;
+    width: 342px;
   }
   input.span5,
   textarea.span5,
   .uneditable-input.span5 {
-    width: 460px;
+    width: 280px;
   }
   input.span4,
   textarea.span4,
   .uneditable-input.span4 {
-    width: 360px;
+    width: 218px;
   }
   input.span3,
   textarea.span3,
   .uneditable-input.span3 {
-    width: 260px;
+    width: 156px;
   }
   input.span2,
   textarea.span2,
   .uneditable-input.span2 {
-    width: 160px;
+    width: 94px;
   }
   input.span1,
   textarea.span1,
   .uneditable-input.span1 {
-    width: 60px;
+    width: 32px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
   }
+  .row,
   .thumbnails {
-    margin-left: -30px;
+    margin-left: 0;
   }
-  .thumbnails > li {
-    margin-left: 30px;
+  [class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: auto;
+    margin-left: 0;
   }
-  .row-fluid .thumbnails {
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 28px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 18px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
     margin-left: 0;
   }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .modal {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    left: 10px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
 }
 
 @media (max-width: 979px) {
@@ -806,10 +813,3 @@
     padding-left: 10px;
   }
 }
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 614c6905c2d6..2ee96c014257 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -1,70 +1,3 @@
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px) {
-
-  // Smooth out the collapsing/expanding nav
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
-  }
-
-  // Block level the page header small tag for readability
-  .page-header h1 small {
-    display: block;
-    line-height: @baseLineHeight;
-  }
-
-  // Update checkboxes for iOS
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-
-  // Remove the horizontal form styles
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  // Move over all input controls and content
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  // Move the options list down to align with labels
-  .form-horizontal .control-list {
-    padding-top: 0; // has to be padding because margin collaspes
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-horizontal .form-actions {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-
-  // Modals
-  .modal {
-    position: absolute;
-    top:   10px;
-    left:  10px;
-    right: 10px;
-    width: auto;
-    margin: 0;
-    &.fade.in { top: auto; }
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-
-  // Carousel
-  .carousel-caption {
-    position: static;
-  }
-
-}
-
-
-
 // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
 // --------------------------------------------------
 
@@ -75,12 +8,14 @@
     padding-left: 20px;
     padding-right: 20px;
   }
+
   // Negative indent the now static "fixed" navbar
   .navbar-fixed-top,
   .navbar-fixed-bottom {
     margin-left: -20px;
     margin-right: -20px;
   }
+
   // Remove padding on container given explicit padding set on body
   .container-fluid {
     padding: 0;
@@ -107,15 +42,18 @@
   .container {
     width: auto;
   }
+
   // Fluid rows
   .row-fluid {
     width: 100%;
   }
+
   // Undo negative margin on rows and thumbnails
   .row,
   .thumbnails {
     margin-left: 0;
   }
+
   // Make all grid-sized elements block level again
   [class*="span"],
   .row-fluid [class*="span"] {
@@ -137,6 +75,7 @@
   .uneditable-input {
     .input-block-level();
   }
+
   // But don't let it screw up prepend/append inputs
   .input-prepend input,
   .input-append input,
@@ -147,3 +86,73 @@
   }
 
 }
+
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px) {
+
+  // Smooth out the collapsing/expanding nav
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
+  }
+
+  // Block level the page header small tag for readability
+  .page-header h1 small {
+    display: block;
+    line-height: @baseLineHeight;
+  }
+
+  // Update checkboxes for iOS
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+
+  // Remove the horizontal form styles
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+
+  // Move over all input controls and content
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+
+  // Move the options list down to align with labels
+  .form-horizontal .control-list {
+    padding-top: 0; // has to be padding because margin collaspes
+  }
+
+  // Move over buttons in .form-actions to align with .controls
+  .form-horizontal .form-actions {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+
+  // Modals
+  .modal {
+    position: absolute;
+    top:   10px;
+    left:  10px;
+    right: 10px;
+    width: auto;
+    margin: 0;
+    &.fade.in { top: auto; }
+  }
+
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+
+  // Carousel
+  .carousel-caption {
+    position: static;
+  }
+
+}
\ No newline at end of file
diff --git a/less/responsive-768px-979px.less b/less/responsive-768px-979px.less
index 76f4f6df1504..7d5d354d8053 100644
--- a/less/responsive-768px-979px.less
+++ b/less/responsive-768px-979px.less
@@ -14,4 +14,4 @@
 
   // No need to reset .thumbnails here since it's the same @gridGutterWidth
 
-}
+}
\ No newline at end of file
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 8d31db5310ab..11e01b190a95 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -1,3 +1,14 @@
+// DEFAULT DESKTOP
+// ---------------
+
+// Required to make the collapsing navbar work on regular desktops
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
+
 // TABLETS AND BELOW
 // -----------------
 @media (max-width: 979px) {
@@ -8,25 +19,31 @@
   body {
     padding-top: 0;
   }
+
   // Unfix the navbar
   .navbar-fixed-top,
   .navbar-fixed-bottom {
     position: static;
   }
+
   .navbar-fixed-top {
     margin-bottom: @baseLineHeight;
   }
+
   .navbar-fixed-bottom {
     margin-top: @baseLineHeight;
   }
+
   .navbar-fixed-top .navbar-inner,
   .navbar-fixed-bottom .navbar-inner {
     padding: 5px;
   }
+
   .navbar .container {
     width: auto;
     padding: 0;
   }
+
   // Account for brand name
   .navbar .brand {
     padding-left: 10px;
@@ -40,24 +57,30 @@
   .nav-collapse {
     clear: both;
   }
+
   // Block-level the nav
   .nav-collapse .nav {
     float: none;
     margin: 0 0 (@baseLineHeight / 2);
   }
+
   .nav-collapse .nav > li {
     float: none;
   }
+
   .nav-collapse .nav > li > a {
     margin-bottom: 2px;
   }
+
   .nav-collapse .nav > .divider-vertical {
     display: none;
   }
+
   .nav-collapse .nav .nav-header {
     color: @navbarText;
     text-shadow: none;
   }
+
   // Nav and dropdown links in navbar
   .nav-collapse .nav > li > a,
   .nav-collapse .dropdown-menu a {
@@ -66,24 +89,29 @@
     color: @navbarLinkColor;
     .border-radius(3px);
   }
+
   // Buttons
   .nav-collapse .btn {
     padding: 4px 10px 4px;
     font-weight: normal;
     .border-radius(4px);
   }
+
   .nav-collapse .dropdown-menu li + li a {
     margin-bottom: 2px;
   }
+
   .nav-collapse .nav > li > a:hover,
   .nav-collapse .dropdown-menu a:hover {
     background-color: @navbarBackground;
   }
+
   // Buttons in the navbar
   .nav-collapse.in .btn-group {
     margin-top: 5px;
     padding: 0;
   }
+
   // Dropdowns in the navbar
   .nav-collapse .dropdown-menu {
     position: static;
@@ -99,13 +127,16 @@
     .border-radius(0);
     .box-shadow(none);
   }
+
   .nav-collapse .dropdown-menu:before,
   .nav-collapse .dropdown-menu:after {
     display: none;
   }
+
   .nav-collapse .dropdown-menu .divider {
     display: none;
   }
+
   // Forms in navbar
   .nav-collapse .navbar-form,
   .nav-collapse .navbar-search {
@@ -116,17 +147,20 @@
     border-bottom: 1px solid @navbarBackground;
     .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
   }
+
   // Pull right (secondary) nav content
   .navbar .nav-collapse .nav.pull-right {
     float: none;
     margin-left: 0;
   }
+
   // Hide everything in the navbar save .brand and toggle button */
   .nav-collapse,
   .nav-collapse.collapse {
     overflow: hidden;
     height: 0;
   }
+
   // Navbar button
   .navbar .btn-navbar {
     display: block;
@@ -138,16 +172,4 @@
     padding-left:  10px;
     padding-right: 10px;
   }
-}
-
-
-// DEFAULT DESKTOP
-// ---------------
-
-// Required to make the collapsing navbar work on regular desktops
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
 }
\ No newline at end of file
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less
index 572846c0fadb..2d7e7b897d91 100644
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
@@ -18,17 +18,6 @@
 .hidden-tablet     { }
 .hidden-desktop    { display: none !important; }
 
-// Phones only
-@media (max-width: 767px) {
-  // Show
-  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
-  // Hide
-  .hidden-phone      { display: none !important; }
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important; }
-}
-
 // Tablets & small desktops only
 @media (min-width: 768px) and (max-width: 979px) {
   // Show
@@ -39,3 +28,14 @@
   .hidden-desktop    { display: inherit !important; }
   .visible-desktop   { display: none !important ; }
 }
+
+// Phones only
+@media (max-width: 767px) {
+  // Show
+  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
+  // Hide
+  .hidden-phone      { display: none !important; }
+  // Hide everything else
+  .hidden-desktop    { display: inherit !important; }
+  .visible-desktop   { display: none !important; }
+}
\ No newline at end of file
diff --git a/less/responsive.less b/less/responsive.less
index 734b1988bffb..b331ca5e817e 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -31,18 +31,18 @@
 // MEDIA QUERIES
 // ------------------
 
-// Phones to portrait tablets and narrow desktops
-@import "responsive-767px-max.less";
+// Large desktops
+@import "responsive-1200px-min.less";
 
 // Tablets to regular desktops
 @import "responsive-768px-979px.less";
 
-// Large desktops
-@import "responsive-1200px-min.less";
+// Phones to portrait tablets and narrow desktops
+@import "responsive-767px-max.less";
 
 
 // RESPONSIVE NAVBAR
 // ------------------
 
 // From 979px and below, show a button to toggle navbar contents
-@import "responsive-navbar.less";
+@import "responsive-navbar.less";
\ No newline at end of file