revert variable media breakpoints

sass < 3.2 doesn't support these yet. :(

2 files changed, 13 insertions, 26 deletions

diff --git a/vendor/assets/stylesheets/_bootstrap-responsive.scss b/vendor/assets/stylesheets/_bootstrap-responsive.scss
index 7e2288ea..75fbbcfb 100644
--- a/vendor/assets/stylesheets/_bootstrap-responsive.scss
+++ b/vendor/assets/stylesheets/_bootstrap-responsive.scss
@@ -32,7 +32,7 @@
 .hidden-desktop    { display: none !important; }
 
 // Phones only
-@media (max-width : $mediaTablet - 1) {
+@media (max-width : 767px) {
   // Show
   .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
   // Hide
@@ -43,7 +43,7 @@
 }
 
 // Tablets & small desktops only
-@media (min-width: $mediaTablet) and (max-width: $mediaDesktop - 1) {
+@media (min-width: 768px) and (max-width: 979px) {
   // Show
   .visible-tablet    { display: inherit !important; }
   // Hide
@@ -56,7 +56,7 @@
 // UP TO LANDSCAPE PHONE
 // ---------------------
 
-@media (max-width: $mediaPhone) {
+@media (max-width: 480px) {
 
   // Smooth out the collapsing/expanding nav
   .nav-collapse {
@@ -122,7 +122,7 @@
 // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
 // --------------------------------------------------
 
-@media (max-width: $mediaTablet - 1) {
+@media (max-width: 768px) {
 
   // Padding to set content in a bit
   body {
@@ -194,7 +194,7 @@
 // PORTRAIT TABLET TO DEFAULT DESKTOP
 // ----------------------------------
 
-@media (min-width: $mediaTablet) and (max-width: $mediaDesktop - 1) {
+@media (min-width: 768px) and (max-width: 979px) {
 
   // Fixed grid
   @include gridCore($gridColumnWidthTablet, $gridGutterWidthTablet);
@@ -213,7 +213,7 @@
 
 // TABLETS AND BELOW
 // -----------------
-@media (max-width: $mediaDesktop - 1) {
+@media (max-width: 979px) {
 
   // UNFIX THE TOPBAR
   // ----------------
@@ -346,31 +346,17 @@
 // ---------------
 
 // Required to make the collapsing navbar work on regular desktops
-@media (min-width: $mediaDesktop) {
+@media (min-width: 980px) {
   .nav-collapse.collapse {
     height: auto !important;
     overflow: visible !important;
   }
 }
 
-
-
-// DEFAULT DESKTOP
-// ---------------
-
-@media (min-width: $mediaDesktop) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
-
-
-
 // LARGE DESKTOP & UP
 // ------------------
 
-@media (min-width: $mediaLarge) {
+@media (min-width: 1200px) {
 
   // Fixed grid
   @include gridCore($gridColumnWidthLarge, $gridGutterWidthLarge);
diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss
index fc0a4e06..c68ba185 100644
--- a/vendor/assets/stylesheets/bootstrap/_variables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_variables.scss
@@ -227,7 +227,8 @@ $fluidGridGutterWidthLarge:    2.564102564% !default;
 
 // Media widths
 // -------------------------
-$mediaPhone:              480px !default;
-$mediaTablet:             768px !default;
-$mediaDesktop:            980px !default;
-$mediaLarge:              1200px !default; // and upper
+// Not supported Sass < 3.2 :(
+// $mediaPhone:              480px !default;
+// $mediaTablet:             768px !default;
+// $mediaDesktop:            980px !default;
+// $mediaLarge:              1200px !default; // and upper