aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-10-22 15:49:42 -0700
committerMark Otto <[email protected]>2011-10-22 15:49:42 -0700
commitd4675bf4ef8019fc80e3b6816d3597c07cde81df (patch)
tree3e935ce414bab4e55f1f9dac1e6fe0eea58ebd61
parent80332e8340dfdb9d73caa682016746823b9d0d82 (diff)
downloadbootstrap-d4675bf4ef8019fc80e3b6816d3597c07cde81df.tar.xz
bootstrap-d4675bf4ef8019fc80e3b6816d3597c07cde81df.zip
updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin
-rw-r--r--bootstrap.css8
-rw-r--r--bootstrap.min.css2
-rw-r--r--docs/assets/css/docs.css16
-rw-r--r--lib/responsive.less8
4 files changed, 28 insertions, 6 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 0f6d58ae0..256ab096b 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Mon Oct 17 23:44:56 PDT 2011
+ * Date: Sat Oct 22 15:49:12 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2268,6 +2268,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
width: auto;
padding: 0 10px;
}
+ .row {
+ margin-left: 0;
+ }
[class*="span"] {
float: none;
display: block;
@@ -2299,6 +2302,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
width: auto;
padding: 0 10px;
}
+ .row {
+ margin-left: 0;
+ }
[class*="span"] {
float: none;
display: block;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 31912f293..e35f0d223 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -321,4 +321,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.media-grid li{display:inline;}
.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;}
.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
-@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
+@media (max-width: 480px){.container{width:auto;padding:0 10px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index c1c43b1d8..b618c44b8 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -340,9 +340,17 @@ h2 + table {
}
}
-@media (min-width: 768px) and (max-width: 900px) {
- .footer,
- .jumbotron {
- min-width: 748px;
+@media (min-width: 768px) and (max-width: 940px) {
+
+ /* Scale down the jumbotron content */
+ .jumbotron h1 {
+ font-size: 72px;
+ }
+
+ /* Provide enough space on right-hand side for benefits list */
+ .jumbotron h1,
+ .jumbotron p {
+ margin-right: 40%;
}
}
+
diff --git a/lib/responsive.less b/lib/responsive.less
index a1a33164f..6cacccad9 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -12,6 +12,10 @@
width: auto;
padding: 0 10px;
}
+ // Undo negative margin on rows
+ .row {
+ margin-left: 0;
+ }
// Make all columns even
[class*="span"] {
float: none;
@@ -57,6 +61,10 @@
width: auto;
padding: 0 10px;
}
+ // Undo negative margin on rows
+ .row {
+ margin-left: 0;
+ }
// Make all columns even
[class*="span"] {
float: none;