diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d24c6f36a3..6e2ab728cd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -631,7 +631,8 @@ h4 small { } .page-header { - margin: 20px 0 19px; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a8398ca4d1..e84d118d1f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -12,7 +12,7 @@ body { position: relative; - padding-top: 100px; + padding-top: 80px; font-size: 14px; background-color: #fff; background-image: url(../img/grid-20px.png); @@ -20,12 +20,6 @@ body { background-position: 0 40px; } -/* Custom container for the narrow docs */ -.bs-docs-container { - max-width: 780px; - margin: 0 auto; -} - /* Code in headings */ h3 code { font-size: 14px; @@ -37,6 +31,10 @@ h3 code { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ +body > .navbar-fixed-top { + font-size: 13px; +} + /* Change the docs' brand */ body > .navbar-fixed-top .brand { padding-right: 0; @@ -52,6 +50,7 @@ body > .navbar-fixed-top .brand { } body > .navbar-fixed-top .brand:hover { text-decoration: none; + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4); } @@ -119,7 +118,7 @@ hr.soften { ------------------------- */ .masthead { padding: 50px 0 60px; - margin-top: -60px; + margin-top: -40px; margin-bottom: 0; color: #fff; text-align: center; @@ -207,10 +206,14 @@ hr.soften { ------------------------- */ .subhead { text-align: left; + border-bottom: 1px solid #ddd; } .subhead h1 { font-size: 60px; } +.subhead .navbar { + display: none; +} @@ -242,7 +245,7 @@ hr.soften { } .marketing img { display: block; - margin: 0 auto 20px; + margin: 0 auto 30px; } @@ -837,3 +840,66 @@ form.bs-docs-example { float: none; } } + + + +/* Docs side .nav-list +------------------------- */ +.span3 { + min-height: 1px; +} +.bs-docs-sidenav { + margin-top: 40px; + padding: 0; + margin-right: 10px; + background-color: #fff; + border: 1px solid #e5e5e5; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.bs-docs-sidenav > li > a { + margin: 0; + font-size: 14px; + padding: 9px 14px; + border-top: 1px solid #eee; +} +.bs-docs-sidenav > li:first-child > a { + border-top: 0; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.bs-docs-sidenav > li:last-child > a { + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; +} +/* Chevrons */ +.bs-docs-sidenav .icon-chevron-right { + float: right; + margin-top: 2px; + margin-right: -6px; + opacity: .25; +} +.bs-docs-sidenav > li > a:hover { + background-color: #f5f5f5; +} +.bs-docs-sidenav a:hover .icon-chevron-right { + opacity: .5; +} +.bs-docs-sidenav .active .icon-chevron-right { + background-image: url(../img/glyphicons-halflings-white.png); + opacity: .75; +} + +@media (max-width: 979px) { + + .bs-docs-sidenav { + margin-top: 30px; + margin-right: 0; + } + +} + + diff --git a/docs/base-css.html b/docs/base-css.html index ed6f27871c..8c2879907d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -27,7 +27,7 @@ - + @@ -88,6 +88,20 @@ +
+
+ +
+
+ + @@ -1625,6 +1639,8 @@ For example, <code>section</code> should be wrapped as inline. +
+
diff --git a/docs/components.html b/docs/components.html index 9a67b25e0d..2132478217 100644 --- a/docs/components.html +++ b/docs/components.html @@ -27,7 +27,7 @@ - + @@ -105,13 +105,34 @@ +
+
+ +
+
+
+
+ diff --git a/docs/download.html b/docs/download.html index 301854a031..9aebb74d23 100644 --- a/docs/download.html +++ b/docs/download.html @@ -27,7 +27,7 @@ - + diff --git a/docs/examples.html b/docs/examples.html index 1c8434b751..a2c7447b82 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -27,7 +27,7 @@ - + diff --git a/docs/extend.html b/docs/extend.html index b3b72f75e7..ccd5122602 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -27,7 +27,7 @@ - + diff --git a/docs/getting-started.html b/docs/getting-started.html new file mode 100644 index 0000000000..26a9bc38ee --- /dev/null +++ b/docs/getting-started.html @@ -0,0 +1,255 @@ + + + + + Getting ยท Twitter Bootstrap + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+

Getting started

+

Overview of the project, it's contents, and how to get started with a simple template.

+
+ +
+ +
+ + +
+ +

Before getting started, you need the following:

+
    +
  • An unzipped copy of the latest version of Bootstrap (which includes all CSS, JavaScript, and images).
  • +
  • An editor of your choice for writing code (I recommend Sublime Text 2).
  • +
  • Some working knowledge of HTML and CSS.
  • +
+

When ready, proceed to the next section, File structure.

+
+ + + +
+ +

Once unzipped, the structure of Bootstrap’s files looks like this:

+
    +
  • bootstrap/ +
      +
    • css/ +
        +
      • bootstrap.css
      • +
      • bootstrap.min.css
      • +
      +
    • +
    • js/ +
        +
      • bootstrap.js
      • +
      • bootstrap.min.js
      • +
      +
    • +
    • img/ +
        +
      • glyphicons-halflings.png
      • +
      • glyphicons-halflings-white.png
      • +
      +
    • +
    • README.md
    • +
    +
  • +
+

This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.

+
+ + + +
+ +

Bootstrap comes equipped with CSS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation:

+
    +
  • Scaffolding: Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.
  • +
  • Base CSS: Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.
  • +
  • Components: Basic styles for common interface components like tabs and pills, navbar, page headers, and more.
  • +
  • Javascript plugins: Similar to the Components section, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.
  • +
+

Together, the Components and Javascript plugins sections provide the following interface elements:

+
    +
  • Button groups
  • +
  • Button dropdowns
  • +
  • Navigational tabs, pills, and lists
  • +
  • Navbar
  • +
  • Labels
  • +
  • Badges
  • +
  • Page headers and hero unit
  • +
  • Thumbnails
  • +
  • Alerts
  • +
  • Progress bars
  • +
  • Modals
  • +
  • Dropdowns
  • +
  • Tooltips
  • +
  • Popovers
  • +
  • Accordion
  • +
  • Carousel
  • +
  • Typeahead
  • +
+

In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.

+
+ + + +
+ +

Now that we’ve got the basic information on Bootstrap out of the way, we can focus on getting started. To do that, we’ll utilize a basic HTML template that includes everything we’ve mentioned in the File structure.

+

As previously mentioned, we won’t cover the basics of writing HTML and CSS here. Instead, we’ll leapfrog through various points in web development complexity to give you the broadest and most complete overview.

+

Now, here’s a look at a typical HTML file:

+
+  <html>
+    <head>
+      <title>Bootstrap 101 Template</title>
+    </head>
+    <body>
+      <h1>Hello, world!</h1>
+    </body>
+  </html>
+  
+

To make this a Bootstrapped template, just include the appropriate CSS and JS files:

+
+  <html>
+    <head>
+      <title>Bootstrap 101 Template</title>
+      <!-- Bootstrap -->
+      <link href="css/bootstrap.min.css" rel="stylesheet">
+      <script src="js/bootstrap.min.js"></script>
+    </head>
+    <body>
+      <h1>Hello, world!</h1>
+    </body>
+  </html>
+  
+

And you’re set. With those two files added, you can begin to write Bootstrap-friendly HTML, CSS, and JS to build any site or application you like. Head to the Bootstrap docs for information, examples, and even code snippets for the Bootstrap grid system, base HTML styles, components, and even responsive features.

+
+ + + +
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/index.html b/docs/index.html index 1a9763bb20..ae841b3c16 100644 --- a/docs/index.html +++ b/docs/index.html @@ -27,7 +27,7 @@ - + @@ -123,7 +123,7 @@

Packed with features.

-

Utilize the 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.

+

A 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.

diff --git a/docs/javascript.html b/docs/javascript.html index b321e6632c..888391ba53 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -27,7 +27,7 @@ - + @@ -95,6 +95,27 @@ +
+
+ +
+
+ + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 8df8a818f7..09ea5664b2 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -27,7 +27,7 @@ - + @@ -88,6 +88,20 @@ +
+ +
+ + @@ -585,6 +599,8 @@ +
+
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 7f223ae68c..dbec68eebd 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -39,7 +39,7 @@ {{/production}} - + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5435689bde..8985e7c69f 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -18,6 +18,20 @@ + \ No newline at end of file diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 5fb11ccf28..306c4dea21 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -35,13 +35,34 @@
+
+ +
+
+
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache new file mode 100644 index 0000000000..5e1407436c --- /dev/null +++ b/docs/templates/pages/getting-started.mustache @@ -0,0 +1,143 @@ + +
+

{{_i}}Getting started{{/i}}

+

{{_i}}Overview of the project, it's contents, and how to get started with a simple template.{{/i}}

+
+ +
+ +
+ + +
+ +

{{_i}}Before getting started, you need the following:{{/i}}

+
    +
  • {{_i}}An unzipped copy of the latest version of Bootstrap (which includes all CSS, JavaScript, and images).{{/i}}
  • +
  • {{_i}}An editor of your choice for writing code (I recommend Sublime Text 2).{{/i}}
  • +
  • {{_i}}Some working knowledge of HTML and CSS.{{/i}}
  • +
+

{{_i}}When ready, proceed to the next section, File structure.{{/i}}

+
+ + + +
+ +

{{_i}}Once unzipped, the structure of Bootstrap’s files looks like this:{{/i}}

+
    +
  • bootstrap/ +
      +
    • css/ +
        +
      • bootstrap.css
      • +
      • bootstrap.min.css
      • +
      +
    • +
    • js/ +
        +
      • bootstrap.js
      • +
      • bootstrap.min.js
      • +
      +
    • +
    • img/ +
        +
      • glyphicons-halflings.png
      • +
      • glyphicons-halflings-white.png
      • +
      +
    • +
    • README.md
    • +
    +
  • +
+

{{_i}}This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.{{/i}}

+
+ + + +
+ +

{{_i}}Bootstrap comes equipped with CSS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation:{{/i}}

+
    +
  • Scaffolding: Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.
  • +
  • Base CSS: Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.
  • +
  • Components: Basic styles for common interface components like tabs and pills, navbar, page headers, and more.
  • +
  • Javascript plugins: Similar to the Components section, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.
  • +
+

Together, the Components and Javascript plugins sections provide the following interface elements:

+
    +
  • Button groups
  • +
  • Button dropdowns
  • +
  • Navigational tabs, pills, and lists
  • +
  • Navbar
  • +
  • Labels
  • +
  • Badges
  • +
  • Page headers and hero unit
  • +
  • Thumbnails
  • +
  • Alerts
  • +
  • Progress bars
  • +
  • Modals
  • +
  • Dropdowns
  • +
  • Tooltips
  • +
  • Popovers
  • +
  • Accordion
  • +
  • Carousel
  • +
  • Typeahead
  • +
+

{{_i}}In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.{{/i}}

+
+ + + +
+ +

{{_i}}Now that we’ve got the basic information on Bootstrap out of the way, we can focus on getting started. To do that, we’ll utilize a basic HTML template that includes everything we’ve mentioned in the File structure.{{/i}}

+

{{_i}}As previously mentioned, we won’t cover the basics of writing HTML and CSS here. Instead, we’ll leapfrog through various points in web development complexity to give you the broadest and most complete overview.{{/i}}

+

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

+
+  <html>
+    <head>
+      <title>Bootstrap 101 Template</title>
+    </head>
+    <body>
+      <h1>Hello, world!</h1>
+    </body>
+  </html>
+  
+

{{_i}}To make this a Bootstrapped template, just include the appropriate CSS and JS files:{{/i}}

+
+  <html>
+    <head>
+      <title>Bootstrap 101 Template</title>
+      <!-- Bootstrap -->
+      <link href="css/bootstrap.min.css" rel="stylesheet">
+      <script src="js/bootstrap.min.js"></script>
+    </head>
+    <body>
+      <h1>Hello, world!</h1>
+    </body>
+  </html>
+  
+

{{_i}}And you’re set. With those two files added, you can begin to write Bootstrap-friendly HTML, CSS, and JS to build any site or application you like. Head to the Bootstrap docs for information, examples, and even code snippets for the Bootstrap grid system, base HTML styles, components, and even responsive features.{{/i}}

+
+ + + +
+
\ No newline at end of file diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 2990ed4f1b..e90df3d084 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -53,7 +53,7 @@

{{_i}}Packed with features.{{/i}}

-

{{_i}}Utilize the 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.{{/i}}

+

{{_i}}A 12-column responsive grid, dozens of components, javascript plugins, typography, form controls, and even a web-based Customizer to make Bootstrap your own.{{/i}}

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 6f51417fa0..13d5285b70 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -25,6 +25,27 @@ +
+
+ +
+
+ + @@ -518,3 +532,6 @@ + +
+
\ No newline at end of file diff --git a/docs/upgrading.html b/docs/upgrading.html index 6d605b7368..e322337628 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -27,7 +27,7 @@ - + diff --git a/less/type.less b/less/type.less index e3106c7178..697b64a54b 100644 --- a/less/type.less +++ b/less/type.less @@ -54,7 +54,8 @@ h4 small { font-size: 14px; } // ------------------------- .page-header { - margin: @baseLineHeight 0 (@baseLineHeight - 1); + padding-bottom: (@baseLineHeight / 2) - 1; + margin: @baseLineHeight 0 (@baseLineHeight * 1.5); border-bottom: 1px solid @grayLighter; }