diff options
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 22 | ||||
| -rw-r--r-- | docs/assets/js/google-code-prettify/prettify.css | 4 | ||||
| -rw-r--r-- | docs/base-css.html | 18 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/customize.html | 2 | ||||
| -rw-r--r-- | docs/extend.html | 2 | ||||
| -rw-r--r-- | docs/getting-started.html | 7 | ||||
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | docs/scaffolding.html | 4 | ||||
| -rw-r--r-- | docs/templates/layout.mustache | 2 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 16 | ||||
| -rw-r--r-- | docs/templates/pages/getting-started.mustache | 5 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 2 | ||||
| -rw-r--r-- | less/code.less | 2 |
16 files changed, 43 insertions, 51 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3c16ef2f56..02a32014c7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -836,7 +836,7 @@ pre { display: block; padding: 9.5px; margin: 0 0 10px; - font-size: 12px; + font-size: 13px; 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 2801efe5e9..d9b9f16066 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -12,6 +12,7 @@ body { position: relative; + padding-top: 40px; } /* Code in headings */ @@ -25,12 +26,12 @@ h3 code { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ -body > .navbar-static-top { +body > .navbar { font-size: 13px; } /* Change the docs' brand */ -body > .navbar-static-top .brand { +body > .navbar .brand { padding-right: 0; padding-left: 0; margin-left: 20px; @@ -42,7 +43,7 @@ body > .navbar-static-top .brand { -moz-transition: all .2s linear; transition: all .2s linear; } -body > .navbar-static-top .brand:hover { +body > .navbar .brand:hover { text-decoration: none; text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4); } @@ -100,9 +101,9 @@ hr.soften { 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), inset 0 -3px 7px rgba(0,0,0,.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15); - box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15); + -webkit-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); + -moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); + box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); } .jumbotron h1 { font-size: 80px; @@ -792,6 +793,7 @@ form.bs-docs-example { z-index: 2; padding: 9px 15px; border: 0; + text-shadow: 0 1px 0 rgba(0,0,0,.15); -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1); -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1); box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1); @@ -812,10 +814,10 @@ form.bs-docs-example { .bs-docs-sidenav .active .icon-chevron-right, .bs-docs-sidenav .active a:hover .icon-chevron-right { background-image: url(../img/glyphicons-halflings-white.png); - opacity: .75; + opacity: 1; } .bs-docs-sidenav.affix { - top: 0; + top: 40px; } .bs-docs-sidenav.affix-bottom { position: absolute; @@ -872,6 +874,10 @@ form.bs-docs-example { body { padding-top: 0; } + /* Widen masthead and social buttons to fill body padding */ + .jumbotron { + margin-top: -20px; /* Offset bottom margin on .navbar */ + } /* Adjust sidenav width */ .bs-docs-sidenav { width: 166px; diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index 1b800c90c6..d437aff62b 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -21,10 +21,10 @@ /* Specify class=linenums on a pre to get line numbering */ ol.linenums { margin: 0 0 0 33px; /* IE indents via margin-left */ -} +} ol.linenums li { padding-left: 12px; color: #bebec5; - line-height: 18px; + line-height: 20px; text-shadow: 0 1px 0 #fff; }
\ No newline at end of file diff --git a/docs/base-css.html b/docs/base-css.html index 95267c5b5f..f1401d688f 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> @@ -106,14 +106,6 @@ <h1>Typography</h1> </div> - <ul> - <li><a href="./base-css.html#headings">Headings</a></li> - <li><a href="./base-css.html#body-copy">Body copy</a></li> - <li><a href="./base-css.html#emphasis">Emphasis</a></li> - </ul> - - <hr> - <h2 id="headings">Headings</h2> <p>All HTML headings, <code><h1></code> through <code><h6></code> are available.</p> <div class="bs-docs-example"> @@ -182,7 +174,7 @@ <hr class="bs-docs-separator"> - <h2>Abbreviations</h2> + <h2 id="abbreviations">Abbreviations</h2> <p>Stylized implemenation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p> <h3><code><abbr></code></h3> @@ -203,7 +195,7 @@ <hr class="bs-docs-separator"> - <h2>Addresses</h2> + <h2 id="addresses">Addresses</h2> <p>Present contact information for the nearest ancestor or the entire body of work.</p> <h3><code><address></code></h3> @@ -238,7 +230,7 @@ <hr class="bs-docs-separator"> - <h2>Blockquotes</h2> + <h2 id="blockquotes">Blockquotes</h2> <p>For quoting blocks of content from another source within your document.</p> <h3>Default blockqoute</h3> @@ -291,7 +283,7 @@ <!-- Lists --> - <h2>Lists</h2> + <h2 id="lists">Lists</h2> <h3>Unordered</h3> <p>A list of items in which the order does <em>not</em> explicitly matter.</p> diff --git a/docs/components.html b/docs/components.html index 40f1457560..e4bb55188b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> diff --git a/docs/customize.html b/docs/customize.html index 8d6a59cd93..0a6c65da91 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> diff --git a/docs/extend.html b/docs/extend.html index f5a194702b..a81016e48d 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> diff --git a/docs/getting-started.html b/docs/getting-started.html index ac38f38638..952c246548 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> @@ -128,6 +128,7 @@ <div class="page-header"> <h1>2. File structure</h1> </div> + <p class="lead">Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.</p> <p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p> <pre class="prettyprint"> bootstrap/ @@ -153,7 +154,7 @@ <div class="page-header"> <h1>3. What's included</h1> </div> - <p>Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.</p> + <p class="lead">Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.</p> <h2>Docs sections</h2> <h4><a href="http://twitter.github.com/bootstrap/scaffolding.html">Scaffolding</a></h4> @@ -197,7 +198,7 @@ <div class="page-header"> <h1>4. Basic HTML template</h1> </div> - <p>With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p> + <p class="lead">With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p> <p>Now, here's a look at a <strong>typical HTML file</strong>:</p> <pre class="prettyprint linenums"> <html> diff --git a/docs/index.html b/docs/index.html index efc82d55cf..6d3f2f6b5f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> diff --git a/docs/javascript.html b/docs/javascript.html index 7ac86841ff..f6c8c428b0 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index c30d177649..a8edd1705b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -31,7 +31,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> @@ -100,7 +100,7 @@ ================================================== --> <section id="global"> <div class="page-header"> - <h1>Global styles</h1> + <h1>Global settings</h1> </div> <h3>Requires HTML5 doctype</h3> diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index f98f318976..d463f441e8 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -43,7 +43,7 @@ <!-- Navbar ================================================== --> - <div class="navbar navbar-inverse navbar-static-top"> + <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 53ded2d873..46b1552343 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -35,14 +35,6 @@ <h1>{{_i}}Typography{{/i}}</h1> </div> - <ul> - <li><a href="./base-css.html#headings">Headings</a></li> - <li><a href="./base-css.html#body-copy">Body copy</a></li> - <li><a href="./base-css.html#emphasis">Emphasis</a></li> - </ul> - - <hr> - {{! Headings }} <h2 id="headings">{{_i}}Headings{{/i}}</h2> <p>{{_i}}All HTML headings, <code><h1></code> through <code><h6></code> are available.{{/i}}</p> @@ -117,7 +109,7 @@ {{! Abbreviations }} - <h2>{{_i}}Abbreviations{{/i}}</h2> + <h2 id="abbreviations">{{_i}}Abbreviations{{/i}}</h2> <p>{{_i}}Stylized implemenation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p> <h3><code><abbr></code></h3> @@ -139,7 +131,7 @@ {{! Addresses }} - <h2>{{_i}}Addresses{{/i}}</h2> + <h2 id="addresses">{{_i}}Addresses{{/i}}</h2> <p>{{_i}}Present contact information for the nearest ancestor or the entire body of work.{{/i}}</p> <h3><code><address></code></h3> @@ -175,7 +167,7 @@ {{! Blockquotes }} - <h2>{{_i}}Blockquotes{{/i}}</h2> + <h2 id="blockquotes">{{_i}}Blockquotes{{/i}}</h2> <p>{{_i}}For quoting blocks of content from another source within your document.{{/i}}</p> <h3>{{_i}}Default blockqoute{{/i}}</h3> @@ -228,7 +220,7 @@ <!-- Lists --> - <h2>{{_i}}Lists{{/i}}</h2> + <h2 id="lists">{{_i}}Lists{{/i}}</h2> <h3>{{_i}}Unordered{{/i}}</h3> <p>{{_i}}A list of items in which the order does <em>not</em> explicitly matter.{{/i}}</p> diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index b89a8c6291..8b58e62b72 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -57,6 +57,7 @@ <div class="page-header"> <h1>{{_i}}2. File structure{{/i}}</h1> </div> + <p class="lead">{{_i}}Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.{{/i}}</p> <p>{{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}</p> <pre class="prettyprint"> bootstrap/ @@ -82,7 +83,7 @@ <div class="page-header"> <h1>{{_i}}3. What's included{{/i}}</h1> </div> - <p>{{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.{{/i}}</p> + <p class="lead">{{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.{{/i}}</p> <h2>{{_i}}Docs sections{{/i}}</h2> <h4><a href="http://twitter.github.com/bootstrap/scaffolding.html">{{_i}}Scaffolding{{/i}}</a></h4> @@ -126,7 +127,7 @@ <div class="page-header"> <h1>{{_i}}4. Basic HTML template{{/i}}</h1> </div> - <p>{{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p> + <p class="lead">{{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p> <p>{{_i}}Now, here's a look at a <strong>typical HTML file</strong>:{{/i}}</p> <pre class="prettyprint linenums"> <html> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index c1147805c4..724ab5e53e 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -29,7 +29,7 @@ ================================================== --> <section id="global"> <div class="page-header"> - <h1>{{_i}}Global styles{{/i}}</h1> + <h1>{{_i}}Global settings{{/i}}</h1> </div> <h3>{{_i}}Requires HTML5 doctype{{/i}}</h3> diff --git a/less/code.less b/less/code.less index 97d30eafe0..f1851a074c 100644 --- a/less/code.less +++ b/less/code.less @@ -26,7 +26,7 @@ pre { display: block; padding: (@baseLineHeight - 1) / 2; margin: 0 0 @baseLineHeight / 2; - font-size: @baseFontSize - 2; // 14px to 12px + font-size: @baseFontSize - 1; // 14px to 13px line-height: @baseLineHeight; word-break: break-all; word-wrap: break-word; |