aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-17 00:42:31 -0800
committerMark Otto <[email protected]>2013-01-17 00:42:31 -0800
commit687d4a3eebf15fe9235ece784a541c1fad5852b0 (patch)
tree1cc482f2079a459add3d88e3cd2068c3b5ade741 /docs/assets/css
parent255cb877341e9f214f57c6ccd6297c90d9c4c5ad (diff)
downloadbootstrap-687d4a3eebf15fe9235ece784a541c1fad5852b0.tar.xz
bootstrap-687d4a3eebf15fe9235ece784a541c1fad5852b0.zip
Move grid/container styles to grid.less; update docs; add offsetting back
Diffstat (limited to 'docs/assets/css')
-rw-r--r--docs/assets/css/bootstrap.css157
-rw-r--r--docs/assets/css/docs.css3
2 files changed, 93 insertions, 67 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 345064d4f..6f9d92ecc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -204,16 +204,14 @@ table {
html {
font-size: 62.5%;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
-webkit-overflow-scrolling: touch;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
@media screen and (max-device-width: 480px) {
html {
- -webkit-text-size-adjust: none;
- -ms-text-size-adjust: none;
+ -webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
}
}
@@ -726,6 +724,94 @@ pre code {
box-sizing: border-box;
}
+@media screen and (min-width: 768px) {
+ [class^="span"] {
+ float: left;
+ }
+ .span1 {
+ width: 8.3333333%;
+ }
+ .span2 {
+ width: 16.6666667%;
+ }
+ .span3 {
+ width: 25%;
+ }
+ .span4 {
+ width: 33.3333333%;
+ }
+ .span5 {
+ width: 41.666666667%;
+ }
+ .span6 {
+ width: 50%;
+ }
+ .span7 {
+ width: 58.333333333%;
+ }
+ .span8 {
+ width: 66.666666667%;
+ }
+ .span9 {
+ width: 75%;
+ }
+ .span10 {
+ width: 83.333333333%;
+ }
+ .span11 {
+ width: 91.666666667%;
+ }
+ .offset1 {
+ margin-left: 8.3333333%;
+ }
+ .offset2 {
+ margin-left: 16.6666667%;
+ }
+ .offset3 {
+ margin-left: 25%;
+ }
+ .offset4 {
+ margin-left: 33.3333333%;
+ }
+ .offset5 {
+ margin-left: 41.666666667%;
+ }
+ .offset6 {
+ margin-left: 50%;
+ }
+ .offset7 {
+ margin-left: 58.333333333%;
+ }
+ .offset8 {
+ margin-left: 66.666666667%;
+ }
+ .offset9 {
+ margin-left: 75%;
+ }
+ .offset10 {
+ margin-left: 83.333333333%;
+ }
+ .offset11 {
+ margin-left: 91.666666667%;
+ }
+}
+
+@media screen and (min-width: 992px) {
+ .container {
+ max-width: 940px;
+ }
+}
+
+@media screen and (min-width: 1200px) {
+ .container {
+ max-width: 1170px;
+ }
+ [class^="span"] {
+ padding-right: 15px;
+ padding-left: 15px;
+ }
+}
+
[class*="span"].pull-right {
float: right;
}
@@ -4544,69 +4630,6 @@ a.badge:hover {
position: fixed;
}
-@media screen and (min-width: 768px) {
- [class^="span"] {
- float: left;
- }
- .span1 {
- width: 8.3333333%;
- }
- .span2 {
- width: 16.6666667%;
- }
- .span3 {
- width: 25%;
- }
- .span4 {
- width: 33.3333333%;
- }
- .span5 {
- width: 41.666666667%;
- }
- .span6 {
- width: 50%;
- }
- .span7 {
- width: 58.333333333%;
- }
- .span8 {
- width: 66.666666667%;
- }
- .span9 {
- width: 75%;
- }
- .span10 {
- width: 83.333333333%;
- }
- .span11 {
- width: 91.666666667%;
- }
-}
-
-@media screen and (min-width: 992px) {
- {
- /* body {
- font-size: 1.6rem;
- font-size: 16px;
- }
- */
-
- }
- .container {
- max-width: 940px;
- }
-}
-
-@media screen and (min-width: 1200px) {
- .container {
- max-width: 1170px;
- }
- [class^="span"] {
- padding-right: 15px;
- padding-left: 15px;
- }
-}
-
/*
// Responsive
// -------------------------------------------------------------
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index a2ba17769..27744e96d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -139,6 +139,9 @@ section > ul li {
/* Special grid styles
-------------------------------------------------- */
+.show-grid {
+ margin-bottom: 15px;
+}
.show-grid [class^="span"] {
padding-top: 10px;
padding-bottom: 10px;