aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-28 18:25:05 -0800
committerMark Otto <[email protected]>2012-01-28 18:25:05 -0800
commite532228721734492d6f2741f729525cc1bb3c77c (patch)
tree6fdd617f776fed0cb594c92bec92be8b92ff8859
parent4fa931e403ec3ae2f8f7f690c6c4040365f68ba9 (diff)
downloadbootstrap-e532228721734492d6f2741f729525cc1bb3c77c.tar.xz
bootstrap-e532228721734492d6f2741f729525cc1bb3c77c.zip
more responsive tweaks for tablet
-rw-r--r--docs/assets/css/bootstrap-responsive.css55
-rw-r--r--less/responsive.less14
2 files changed, 33 insertions, 36 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index b0fbd9d7b..bbfc0ac5a 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -89,81 +89,78 @@
}
@media (min-width: 768px) and (max-width: 940px) {
.container {
- width: 748px;
- padding-left: 10px;
- padding-right: 10px;
+ width: 724px;
+ padding-left: 20px;
+ padding-right: 20px;
}
.span1 {
- width: 44px;
+ width: 42px;
}
.span2 {
- width: 108px;
+ width: 104px;
}
.span3 {
- width: 172px;
+ width: 166px;
}
.span4 {
- width: 236px;
+ width: 228px;
}
.span5 {
- width: 300px;
+ width: 290px;
}
.span6 {
- width: 364px;
+ width: 352px;
}
.span7 {
- width: 428px;
+ width: 414px;
}
.span8 {
- width: 492px;
+ width: 476px;
}
.span9 {
- width: 556px;
+ width: 538px;
}
.span10 {
- width: 620px;
+ width: 600px;
}
.span11 {
- width: 684px;
+ width: 662px;
}
.span12 {
- width: 748px;
+ width: 724px;
}
.offset1 {
- margin-left: 84px;
+ margin-left: 82px;
}
.offset2 {
- margin-left: 148px;
+ margin-left: 144px;
}
.offset3 {
- margin-left: 212px;
+ margin-left: 206px;
}
.offset4 {
- margin-left: 276px;
+ margin-left: 268px;
}
.offset5 {
- margin-left: 340px;
+ margin-left: 330px;
}
.offset6 {
- margin-left: 404px;
+ margin-left: 392px;
}
.offset7 {
- margin-left: 468px;
+ margin-left: 454px;
}
.offset8 {
- margin-left: 532px;
+ margin-left: 516px;
}
.offset9 {
- margin-left: 596px;
+ margin-left: 578px;
}
.offset10 {
- margin-left: 660px;
+ margin-left: 640px;
}
.offset11 {
- margin-left: 724px;
- }
- .offset12 {
- margin-left: 788px;
+ margin-left: 702px;
}
}
@media (max-width: 940px) {
diff --git a/less/responsive.less b/less/responsive.less
index 0955710b6..fba5b3656 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -135,10 +135,10 @@
@media (min-width: 768px) and (max-width: 940px) {
// Reset grid variables
- @gridColumns: 16;
- @gridColumnWidth: 44px;
+ @gridColumns: 12;
+ @gridColumnWidth: 42px;
@gridGutterWidth: 20px;
- @siteWidth: 748px;
+ @siteWidth: 724px;
// Bring grid mixins to recalculate widths
.columns(@columns: 1) {
@@ -148,11 +148,11 @@
margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
}
- // 16cols at 30px wide with 16px gutters
+ // 12cols at 44px wide with 20px gutters
.container {
width: @siteWidth;
- padding-left: 10px;
- padding-right: 10px;
+ padding-left: 20px;
+ padding-right: 20px;
}
// Default columns
@@ -181,7 +181,6 @@
.offset9 { .offset(9); }
.offset10 { .offset(10); }
.offset11 { .offset(11); }
- .offset12 { .offset(12); }
}
@@ -295,6 +294,7 @@
display: block;
}
+ // Hide everything in the navbar save .brand and toggle button */
.nav-collapse {
overflow: hidden;
height: 0;