kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

revert variable media breakpoints

Browse source 
sass < 3.2 doesn't support these yet. :(
This commit is contained in:
Thomas McDonald 2012-04-25 22:28:25 +01:00
parent e3314e5e43
commit 1f30c64af6
2 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
vendor/assets/stylesheets/_bootstrap-responsive.scss vendored
View file

@ -32,7 +32,7 @@
.hidden-desktop { display: none !important; } .hidden-desktop { display: none !important; }
// Phones only // Phones only
@media (max-width : $mediaTablet - 1) { @media (max-width : 767px) {
// Show // Show
.visible-phone { display: inherit !important; } // Use inherit to restore previous behavior .visible-phone { display: inherit !important; } // Use inherit to restore previous behavior
// Hide // Hide
@ -43,7 +43,7 @@
} }
// Tablets & small desktops only // Tablets & small desktops only
@media (min-width: $mediaTablet) and (max-width: $mediaDesktop - 1) { @media (min-width: 768px) and (max-width: 979px) {
// Show // Show
.visible-tablet { display: inherit !important; } .visible-tablet { display: inherit !important; }
// Hide // Hide
@ -56,7 +56,7 @@
// UP TO LANDSCAPE PHONE // UP TO LANDSCAPE PHONE
// --------------------- // ---------------------
@media (max-width: $mediaPhone) { @media (max-width: 480px) {
// Smooth out the collapsing/expanding nav // Smooth out the collapsing/expanding nav
.nav-collapse { .nav-collapse {
@ -122,7 +122,7 @@
// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
// -------------------------------------------------- // --------------------------------------------------
@media (max-width: $mediaTablet - 1) { @media (max-width: 768px) {
// Padding to set content in a bit // Padding to set content in a bit
body { body {
@ -194,7 +194,7 @@
// PORTRAIT TABLET TO DEFAULT DESKTOP // PORTRAIT TABLET TO DEFAULT DESKTOP
// ---------------------------------- // ----------------------------------
@media (min-width: $mediaTablet) and (max-width: $mediaDesktop - 1) { @media (min-width: 768px) and (max-width: 979px) {
// Fixed grid // Fixed grid
@include gridCore($gridColumnWidthTablet, $gridGutterWidthTablet); @include gridCore($gridColumnWidthTablet, $gridGutterWidthTablet);
@ -213,7 +213,7 @@
// TABLETS AND BELOW // TABLETS AND BELOW
// ----------------- // -----------------
@media (max-width: $mediaDesktop - 1) { @media (max-width: 979px) {
// UNFIX THE TOPBAR // UNFIX THE TOPBAR
// ---------------- // ----------------
@ -346,31 +346,17 @@
// --------------- // ---------------
// Required to make the collapsing navbar work on regular desktops // Required to make the collapsing navbar work on regular desktops
@media (min-width: $mediaDesktop) { @media (min-width: 980px) {
.nav-collapse.collapse { .nav-collapse.collapse {
height: auto !important; height: auto !important;
overflow: visible !important; overflow: visible !important;
} }
} }
// DEFAULT DESKTOP
// ---------------
@media (min-width: $mediaDesktop) {
.nav-collapse.collapse {
height: auto !important;
overflow: visible !important;
}
}
// LARGE DESKTOP & UP // LARGE DESKTOP & UP
// ------------------ // ------------------
@media (min-width: $mediaLarge) { @media (min-width: 1200px) {
// Fixed grid // Fixed grid
@include gridCore($gridColumnWidthLarge, $gridGutterWidthLarge); @include gridCore($gridColumnWidthLarge, $gridGutterWidthLarge);

9
vendor/assets/stylesheets/bootstrap/_variables.scss vendored
View file

@ -227,7 +227,8 @@ $fluidGridGutterWidthLarge: 2.564102564% !default;
// Media widths // Media widths
// ------------------------- // -------------------------
$mediaPhone: 480px !default; // Not supported Sass < 3.2 :(
$mediaTablet: 768px !default; // $mediaPhone: 480px !default;
$mediaDesktop: 980px !default; // $mediaTablet: 768px !default;
$mediaLarge: 1200px !default; // and upper // $mediaDesktop: 980px !default;
// $mediaLarge: 1200px !default; // and upper