diff options
| author | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
| commit | 5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf (patch) | |
| tree | 2d760c794e61c15850d14d5eee1c565ab4f9a871 /less/responsive.less | |
| parent | 5df1e2c00a295c45db7fa75dba333dc9464b128c (diff) | |
| parent | aa2cec6f2f706f8c1754f8bf79a8c9f094445bd8 (diff) | |
| download | bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.tar.xz bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.zip | |
fMerge branch '2.1.0-wip'
Conflicts:
docs/index.html
Diffstat (limited to 'less/responsive.less')
| -rw-r--r-- | less/responsive.less | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/less/responsive.less b/less/responsive.less index 734b1988b..5a62e4a50 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.0.4 + * Bootstrap Responsive v2.1.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -31,14 +31,14 @@ // 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 |