From a667fd93aba8e947f94af973518b7dce25c08765 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Aug 2012 23:01:24 -0700 Subject: [PATCH] pre font-size increase; revert static top navbar, undo contents section for now --- docs/assets/css/bootstrap.css | 2 +- docs/assets/css/docs.css | 22 ++++++++++++------- .../js/google-code-prettify/prettify.css | 4 ++-- docs/base-css.html | 18 +++++---------- docs/components.html | 2 +- docs/customize.html | 2 +- docs/extend.html | 2 +- docs/getting-started.html | 7 +++--- docs/index.html | 2 +- docs/javascript.html | 2 +- docs/scaffolding.html | 4 ++-- docs/templates/layout.mustache | 2 +- docs/templates/pages/base-css.mustache | 16 ++++---------- docs/templates/pages/getting-started.mustache | 5 +++-- docs/templates/pages/scaffolding.mustache | 2 +- 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 @@ -
+
- - -
-

Headings

All HTML headings, <h1> through <h6> are available.

@@ -182,7 +174,7 @@
-

Abbreviations

+

Abbreviations

Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.

<abbr>

@@ -203,7 +195,7 @@
-

Addresses

+

Addresses

Present contact information for the nearest ancestor or the entire body of work.

<address>

@@ -238,7 +230,7 @@
-

Blockquotes

+

Blockquotes

For quoting blocks of content from another source within your document.

Default blockqoute

@@ -291,7 +283,7 @@ -

Lists

+

Lists

Unordered

A list of items in which the order does not explicitly matter.

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 @@ -
+
- - -
- {{! Headings }}

{{_i}}Headings{{/i}}

{{_i}}All HTML headings, <h1> through <h6> are available.{{/i}}

@@ -117,7 +109,7 @@ {{! Abbreviations }} -

{{_i}}Abbreviations{{/i}}

+

{{_i}}Abbreviations{{/i}}

{{_i}}Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}

<abbr>

@@ -139,7 +131,7 @@ {{! Addresses }} -

{{_i}}Addresses{{/i}}

+

{{_i}}Addresses{{/i}}

{{_i}}Present contact information for the nearest ancestor or the entire body of work.{{/i}}

<address>

@@ -175,7 +167,7 @@ {{! Blockquotes }} -

{{_i}}Blockquotes{{/i}}

+

{{_i}}Blockquotes{{/i}}

{{_i}}For quoting blocks of content from another source within your document.{{/i}}

{{_i}}Default blockqoute{{/i}}

@@ -228,7 +220,7 @@ -

{{_i}}Lists{{/i}}

+

{{_i}}Lists{{/i}}

{{_i}}Unordered{{/i}}

{{_i}}A list of items in which the order does not explicitly matter.{{/i}}

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 @@

{{_i}}2. File structure{{/i}}

+

{{_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}}

{{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}

   bootstrap/
@@ -82,7 +83,7 @@
           

             
{{_i}}3. What's included{{/i}}

           

-          
{{_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 Bootstrap documentation.{{/i}}

+          
{{_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 Bootstrap documentation.{{/i}}

 
           
{{_i}}Docs sections{{/i}}

           
{{_i}}Scaffolding{{/i}}

@@ -126,7 +127,7 @@
           

             
{{_i}}4. Basic HTML template{{/i}}

           

-          
{{_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 File structure.{{/i}}

+          
{{_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 File structure.{{/i}}

           
{{_i}}Now, here's a look at a typical HTML file:{{/i}}

 
 <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 @@
         ================================================== -->
         

           

-            
{{_i}}Global styles{{/i}}

+            
{{_i}}Global settings{{/i}}

           

 
           
{{_i}}Requires HTML5 doctype{{/i}}

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;