0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00

more responsive tweaks for tablet

This commit is contained in:
Mark Otto 2012-01-28 18:25:05 -08:00
parent 4fa931e403
commit e532228721
2 changed files with 33 additions and 36 deletions

View File

@ -89,81 +89,78 @@
} }
@media (min-width: 768px) and (max-width: 940px) { @media (min-width: 768px) and (max-width: 940px) {
.container { .container {
width: 748px; width: 724px;
padding-left: 10px; padding-left: 20px;
padding-right: 10px; padding-right: 20px;
} }
.span1 { .span1 {
width: 44px; width: 42px;
} }
.span2 { .span2 {
width: 108px; width: 104px;
} }
.span3 { .span3 {
width: 172px; width: 166px;
} }
.span4 { .span4 {
width: 236px; width: 228px;
} }
.span5 { .span5 {
width: 300px; width: 290px;
} }
.span6 { .span6 {
width: 364px; width: 352px;
} }
.span7 { .span7 {
width: 428px; width: 414px;
} }
.span8 { .span8 {
width: 492px; width: 476px;
} }
.span9 { .span9 {
width: 556px; width: 538px;
} }
.span10 { .span10 {
width: 620px; width: 600px;
} }
.span11 { .span11 {
width: 684px; width: 662px;
} }
.span12 { .span12 {
width: 748px; width: 724px;
} }
.offset1 { .offset1 {
margin-left: 84px; margin-left: 82px;
} }
.offset2 { .offset2 {
margin-left: 148px; margin-left: 144px;
} }
.offset3 { .offset3 {
margin-left: 212px; margin-left: 206px;
} }
.offset4 { .offset4 {
margin-left: 276px; margin-left: 268px;
} }
.offset5 { .offset5 {
margin-left: 340px; margin-left: 330px;
} }
.offset6 { .offset6 {
margin-left: 404px; margin-left: 392px;
} }
.offset7 { .offset7 {
margin-left: 468px; margin-left: 454px;
} }
.offset8 { .offset8 {
margin-left: 532px; margin-left: 516px;
} }
.offset9 { .offset9 {
margin-left: 596px; margin-left: 578px;
} }
.offset10 { .offset10 {
margin-left: 660px; margin-left: 640px;
} }
.offset11 { .offset11 {
margin-left: 724px; margin-left: 702px;
}
.offset12 {
margin-left: 788px;
} }
} }
@media (max-width: 940px) { @media (max-width: 940px) {

View File

@ -135,10 +135,10 @@
@media (min-width: 768px) and (max-width: 940px) { @media (min-width: 768px) and (max-width: 940px) {
// Reset grid variables // Reset grid variables
@gridColumns: 16; @gridColumns: 12;
@gridColumnWidth: 44px; @gridColumnWidth: 42px;
@gridGutterWidth: 20px; @gridGutterWidth: 20px;
@siteWidth: 748px; @siteWidth: 724px;
// Bring grid mixins to recalculate widths // Bring grid mixins to recalculate widths
.columns(@columns: 1) { .columns(@columns: 1) {
@ -148,11 +148,11 @@
margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
} }
// 16cols at 30px wide with 16px gutters // 12cols at 44px wide with 20px gutters
.container { .container {
width: @siteWidth; width: @siteWidth;
padding-left: 10px; padding-left: 20px;
padding-right: 10px; padding-right: 20px;
} }
// Default columns // Default columns
@ -181,7 +181,6 @@
.offset9 { .offset(9); } .offset9 { .offset(9); }
.offset10 { .offset(10); } .offset10 { .offset(10); }
.offset11 { .offset(11); } .offset11 { .offset(11); }
.offset12 { .offset(12); }
} }
@ -295,6 +294,7 @@
display: block; display: block;
} }
// Hide everything in the navbar save .brand and toggle button */
.nav-collapse { .nav-collapse {
overflow: hidden; overflow: hidden;
height: 0; height: 0;