From 5f861ef51735d8b0f2c0f0faf8f438808a480d99 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jul 2012 23:16:07 -0700 Subject: [PATCH] fix up docs to use default container, fix responsive home changes --- docs/assets/css/bootstrap.css | 4 +- docs/assets/css/docs.css | 286 ++++++++++++---------------- docs/base-css.html | 9 +- docs/components.html | 9 +- docs/download.html | 9 +- docs/examples.html | 9 +- docs/extend.html | 9 +- docs/index.html | 180 +++++++---------- docs/javascript.html | 9 +- docs/scaffolding.html | 9 +- docs/templates/layout.mustache | 9 +- docs/templates/pages/index.mustache | 171 ++++++----------- docs/upgrading.html | 9 +- less/code.less | 4 +- 14 files changed, 309 insertions(+), 417 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 39ea788bec..d24c6f36a3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -788,7 +788,7 @@ code, pre { padding: 0 3px 2px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 13px; + font-size: 12px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -806,7 +806,7 @@ pre { display: block; padding: 9.5px; margin: 0 0 10px; - font-size: 12.950000000000001px; + font-size: 12px; line-height: 20px; word-break: break-all; word-wrap: break-word; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2fd1715afb..a8398ca4d1 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -37,9 +37,6 @@ h3 code { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ -.navbar { -} - /* Change the docs' brand */ body > .navbar-fixed-top .brand { padding-right: 0; @@ -94,7 +91,6 @@ hr.soften { text-align: center; } .jumbotron h1 { - margin-bottom: 10px; font-size: 80px; font-weight: bold; letter-spacing: -1px; @@ -122,13 +118,89 @@ hr.soften { /* Masthead (docs home) ------------------------- */ .masthead { - margin-top: 20px; - margin-bottom: 80px; + padding: 50px 0 60px; + margin-top: -60px; + margin-bottom: 0; + color: #fff; + text-align: center; + text-shadow: 0 1px 5px rgba(0,0,0,.25), 0 0 30px rgba(0,0,0,.075); + background: #020031; /* Old browsers */ + background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6d3353)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */ + background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ + -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); +} +.masthead h1 { + font-size: 120px; + line-height: 1; + letter-spacing: -2px; } .masthead p { - margin-bottom: 20px; - font-size: 30px; - line-height: 40px; + font-size: 40px; + font-weight: 200; + line-height: 1.25; +} + +/* Drop borders on buttons, improve shadows */ +.masthead .btn { + font-size: 24px; + padding: 14px 24px; + font-weight: 200; + border: 0; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); +} +.masthead .btn:active { + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); + box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); +} + +/* Textual links in masthead */ +.masthead-links { + margin: 0; + list-style: none; +} +.masthead-links li { + display: inline; + padding: 0 10px; + color: rgba(255,255,255,.25); +} +.masthead-links a { + color: #fff; + color: rgba(255,255,255,.5); +} +.masthead-links a:hover { + color: #fff; +} + +/* Social proof buttons from GitHub & Twitter */ +.bs-docs-social { + padding: 15px 0; + text-align: center; + background-color: #f5f5f5; + border-top: 1px solid #fff; + border-bottom: 1px solid #ddd; +} + +/* Quick links on Home */ +.bs-docs-social-buttons { + margin-left: 0; + margin-bottom: 0; + padding-left: 0; + list-style: none; +} +.bs-docs-social-buttons li { + display: inline-block; + padding: 5px 8px; + line-height: 1; } /* Subhead (other pages) @@ -140,29 +212,6 @@ hr.soften { font-size: 60px; } -/* Quick links on Home -------------------------- */ -.bs-links { - margin: 40px 0 0; - font-size: 12px; -} -.quick-links { - height: 20px; - margin: 0; - padding: 0; - list-style: none; - overflow: hidden; -} -.quick-links:first-child { - min-height: 0; -} -.quick-links li { - display: inline-block; - margin: 0 8px; - color: #999; - line-height: 1; -} - /* Marketing section of Overview @@ -210,6 +259,13 @@ hr.soften { margin-bottom: 0; color: #777; } +.footer-links { + margin: 10px 0; +} +.footer-links li { + display: inline; + margin-right: 10px; +} @@ -479,7 +535,6 @@ h2 + .row { .bs-docs-example + .prettyprint { margin-top: -20px; padding-top: 15px; - font-size: 12px; } /* Tweak examples @@ -666,6 +721,10 @@ form.bs-docs-example { body { padding-top: 0; } + /* Widen masthead and social buttons to fill body padding */ + .masthead { + margin-top: -20px; /* Offset bottom margin on .navbar */ + } } /* Tablet @@ -676,9 +735,22 @@ form.bs-docs-example { padding-top: 0; } - /* Jumbotron buttons */ - .jumbotron .btn { - margin-bottom: 10px; + /* Widen masthead and social buttons to fill body padding */ + .masthead { + padding: 40px 20px; + margin-top: -20px; /* Offset bottom margin on .navbar */ + margin-right: -20px; + margin-left: -20px; + } + .masthead h1 { + font-size: 90px; + } + .masthead p, + .masthead .btn { + font-size: 24px; + } + .bs-docs-social { + margin: 0 -20px; } /* Space out the show-grid examples */ @@ -695,9 +767,9 @@ form.bs-docs-example { /* Landscape phones ------------------------- */ @media (max-width: 480px) { - /* Reduce padding above jumbotron */ + /* Remove padding above jumbotron */ body { - padding-top: 70px; + padding-top: 0; } /* Change up some type stuff */ @@ -707,24 +779,28 @@ form.bs-docs-example { /* Downsize the jumbotrons */ .jumbotron h1 { - font-size: 45px; + font-size: 60px; } - .jumbotron p { - font-size: 18px; - line-height: 24px; + .jumbotron p, + .jumbotron .btn { + font-size: 20px; } .jumbotron .btn { display: block; - font-size: 18px; - padding: 10px 14px; - margin: 0 auto 10px; + margin: 0 auto; } + /* center align subhead text like the masthead */ .subhead h1, .subhead p { text-align: center; } + /* Marketing on home */ + .marketing h1 { + font-size: 40px; + } + /* center example sites */ .example-sites { margin-left: 0; @@ -761,123 +837,3 @@ form.bs-docs-example { float: none; } } - - - -.navbar-inner { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.jumbo { - padding: 80px 0; - margin: -60px 0 60px; - background-color: #222; - color: #fff; - text-align: center; - text-shadow: 0 1px 5px rgba(0,0,0,.25), 0 0 30px rgba(0,0,0,.075); - - background: #c9cabc; /* Old browsers */ -background: -moz-linear-gradient(-45deg, #c9cabc 0%, #68686d 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#c9cabc), color-stop(100%,#68686d)); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(-45deg, #c9cabc 0%,#68686d 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(-45deg, #c9cabc 0%,#68686d 100%); /* Opera 11.10+ */ -background: -ms-linear-gradient(-45deg, #c9cabc 0%,#68686d 100%); /* IE10+ */ -background: linear-gradient(135deg, #c9cabc 0%,#68686d 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c9cabc', endColorstr='#68686d',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ - - background: #020031; /* Old browsers */ - background: -moz-linear-gradient(45deg, #020031 0%, #803353 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#803353)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(45deg, #020031 0%,#803353 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(45deg, #020031 0%,#803353 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(45deg, #020031 0%,#803353 100%); /* IE10+ */ - background: linear-gradient(45deg, #020031 0%,#803353 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#803353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ - - background: #020031; /* Old browsers */ - background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6d3353)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */ - background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ - - xborder-bottom: 1px solid #68686d; - - -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); - box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); -} -.jumbo h1 { - font-size: 120px; - font-weight: ; - line-height: 1; - margin: 0 0 10px; - letter-spacing: -2px; -} -.jumbo p { - margin-bottom: 30px; - font-size: 40px; - font-weight: 200; - line-height: 1.25; -} -.jumbo .btn { - font-size: 24px; - padding: 14px 24px; - font-weight: 200; - border: 0; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); - box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); -} -.jumbo .btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); - -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); - box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); -} -.jumbo-links { - margin: 0; - list-style: none; -} -.jumbo-links li { - display: inline; - padding: 0 10px; - color: rgba(255,255,255,.25); -} -.jumbo-links a { - color: #fff; - color: rgba(255,255,255,.5); -} -.jumbo-links a:hover { - color: #fff; -} - - -.jumbo-buttons { - padding: 20px 0; - margin-top: -60px; - text-align: center; - background-color: #f5f5f5; - border-top: 1px solid #fff; - border-bottom: 1px solid #ddd; -} - - -@media (max-width: 480px) { - body { - padding-top: 0; - } - .jumbo { - margin: -20px -20px ; - padding: 40px 25px; - } - .jumbo h1 { - font-size: 72px; - } - .jumbo p { - font-size: 20px; - } - -} diff --git a/docs/base-css.html b/docs/base-css.html index 9f27d862cd..ed6f27871c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -33,7 +33,7 @@ ================================================== -->
-
+
-
+
@@ -1633,6 +1633,11 @@ For example, <code>section</code> should be wrapped as inline.

Designed and built with all the love in the world @twitter by @mdo and @fat.

Code licensed under the Apache License v2.0. Documentation licensed under CC BY 3.0.

Icons from Glyphicons Free, licensed under CC BY 3.0.

+
diff --git a/docs/components.html b/docs/components.html index 2c07efbf6e..9a67b25e0d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -33,7 +33,7 @@ ================================================== -->
-
+
-
+
@@ -2221,6 +2221,11 @@ class="clearfix"

Designed and built with all the love in the world @twitter by @mdo and @fat.

Code licensed under the Apache License v2.0. Documentation licensed under CC BY 3.0.

Icons from Glyphicons Free, licensed under CC BY 3.0.

+
diff --git a/docs/download.html b/docs/download.html index 2d92c3b915..301854a031 100644 --- a/docs/download.html +++ b/docs/download.html @@ -33,7 +33,7 @@ ================================================== -->
-
+
-
+
@@ -424,6 +424,11 @@

Designed and built with all the love in the world @twitter by @mdo and @fat.

Code licensed under the Apache License v2.0. Documentation licensed under CC BY 3.0.

Icons from Glyphicons Free, licensed under CC BY 3.0.

+
diff --git a/docs/examples.html b/docs/examples.html index 767b024cb6..1c8434b751 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -33,7 +33,7 @@ ================================================== -->
-
+
-
+
@@ -108,6 +108,11 @@

Designed and built with all the love in the world @twitter by @mdo and @fat.

Code licensed under the Apache License v2.0. Documentation licensed under CC BY 3.0.

Icons from Glyphicons Free, licensed under CC BY 3.0.

+
diff --git a/docs/extend.html b/docs/extend.html index 77c93af3b9..b3b72f75e7 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -33,7 +33,7 @@ ================================================== -->
-
+
-
+
@@ -167,6 +167,11 @@

Designed and built with all the love in the world @twitter by @mdo and @fat.

Code licensed under the Apache License v2.0. Documentation licensed under CC BY 3.0.

Icons from Glyphicons Free, licensed under CC BY 3.0.

+
diff --git a/docs/index.html b/docs/index.html index 88d2f6b6a9..1a9763bb20 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ ================================================== -->
-
+
-
+
-
-
+
+

Bootstrap

Sleek, intuitive, and powerful front-end framework for faster and easier web development.

-

Download Bootstrap

-
-
-
-