diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8c81ec72ef..52f8ff1bc8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -851,37 +851,6 @@ form.bs-docs-example { } } -@media (min-width: 979px) { - .masthead, - .subhead { - position: fixed; - top: 40px; - right: 0; - left: 0; - } - .masthead { - height: 380px; - } - .subhead { - height: 130px; /* +80px pdding */ - } - .bs-docs-canvas { - position: absolute; - width: 100%; - z-index: 10; - background-color: #fff; - -webkit-box-shadow: 0 -5px 15px rgba(0,0,0,.15); - -moz-box-shadow: 0 -5px 15px rgba(0,0,0,.15); - box-shadow: 0 -5px 15px rgba(0,0,0,.15); - } - .masthead + .bs-docs-canvas { - top: 570px; - } - .subhead + .bs-docs-canvas { - top: 250px; - } -} - /* Tablet to desktop ------------------------- */ @media (min-width: 768px) and (max-width: 980px) { diff --git a/docs/base-css.html b/docs/base-css.html index 2f0c10f500..cd550adc38 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -78,7 +78,6 @@ -
@@ -1790,47 +1789,44 @@ For example, <code>section</code> should be wrapped as inline. - - - + + - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/components.html b/docs/components.html index 2b2bc52e83..a578238cc5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -78,7 +78,6 @@
-
@@ -2243,47 +2242,44 @@ class="clearfix" - - - + + - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/customize.html b/docs/customize.html index 1fc225e525..37da451e87 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -78,7 +78,6 @@
-
@@ -431,47 +430,44 @@ - - - + + - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/extend.html b/docs/extend.html index efd933cb55..aa306a598c 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -78,8 +78,6 @@
-
-
- + + - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/getting-started.html b/docs/getting-started.html index 70fb744326..4f7f43ed12 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -78,7 +78,6 @@
-
@@ -285,47 +284,44 @@ - - - + + - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/index.html b/docs/index.html index 91c0cdbc2f..1b21e1d00e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -82,128 +82,123 @@
-
+
+
+ +
+
-
-
-
+ - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/javascript.html b/docs/javascript.html index 7b015f6fe9..d0332ece9b 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -78,8 +78,6 @@
-
-
- + + - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 76ef0cc2ef..2bc153ea9b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -78,8 +78,6 @@
-
-
- + + - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 6266446e1f..eb4cc9ef42 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -85,46 +85,44 @@ - - + + - - - - - - - - - - - - - - - - - - - - -
{{! /.bs-docs-canvas }} + + + + + + + + + + + + + + + + + + + {{#production}} diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 8420f7d2ff..b0fe47c551 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -7,7 +7,6 @@
-
@@ -1724,5 +1723,3 @@
{{! row}}
{{! /.container }} - -{{! /.bs-docs-canvas closes in footer }} diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 314fd23f74..7ebae93e82 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -7,7 +7,6 @@ -
@@ -2169,5 +2168,3 @@ class="clearfix"
{{! row}}
{{! /.container }} - -{{! /.bs-docs-canvas closes in footer }} diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index d84d02f0cf..83f0169002 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -7,7 +7,6 @@ -
@@ -357,5 +356,3 @@
{{! row}}
{{! /.container }} - -{{! /.bs-docs-canvas closes in footer }} diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache index 842f9f7a37..f925e7b298 100644 --- a/docs/templates/pages/extend.mustache +++ b/docs/templates/pages/extend.mustache @@ -7,8 +7,6 @@
-
-
-
-

{{_i}}Upgrading to Bootstrap 2{{/i}}

-

{{_i}}Learn about significant changes and additions since v1.4 with this handy guide.{{/i}}

-
- - - - -
-
-

{{_i}}Project changes{{/i}}

-
-
    -
  • {{_i}}Docs: major updates across the board to general structure, examples, and code snippets. Also made responsive with new media queries.{{/i}}
    • -
  • {{_i}}Docs: all docs pages are now powered by Mustache templates and strings are wrapped in i18n tags for translation by the Twitter Translation Center. All changes to documentation must be done here and then compiled (similar to our CSS and LESS).{{/i}}
    • -
  • {{_i}}Repo directory structure: removed the compiled CSS from the root in favor of a large direct download link on the docs homepage. Compiled CSS is in /docs/assets/css/.{{/i}}
    • -
  • {{_i}}Docs and repo: one makefile, just type make in the Terminal and get updated docs and CSS.{{/i}}
    • -
-
- - - - -
-
-

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

-
-

{{_i}}Grid system{{/i}}

-
    -
  • {{_i}}Updated grid system, now only 12 columns instead of 16{{/i}} -
  • {{_i}}Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more{{/i}}
    • -
  • {{_i}}Removed unused (by default) grid columns support for 17-24 columns{{/i}}
    • -
-

{{_i}}Responsive (media queries){{/i}}

-
    -
  • {{_i}}Media queries added for basic support across mobile and tablet devices{{/i}} -
  • {{_i}}Responsive CSS is compiled separately, as bootstrap-responsive.css{{/i}}
    • -
-
- - - - -
-
-

{{_i}}Base CSS{{/i}}

-
-

{{_i}}Typography{{/i}}

-
    -
  • {{_i}}h4 elements were dropped from 16px to 14px with a default line-height of 18px{{/i}}
    • -
  • {{_i}}h5 elements were dropped from 14px to 12px{{/i}}
    • -
  • {{_i}}h6 elements were dropped from 13px to 11px{{/i}}
    • -
  • {{_i}}Right-aligned option for blockquotes if float: right;{{/i}}
    • -
-

{{_i}}Code{{/i}}

-
    -
  • {{_i}}New graphical style for <code>{{/i}}
    • -
  • {{_i}}Google Code Prettify styles updated (based on GitHub's gists){{/i}}
    • -
-

{{_i}}Tables{{/i}}

-
    -
  • {{_i}}Improved support for colspan and rowspan{{/i}}
    • -
  • {{_i}}Styles now restricted to new base class, .table{{/i}}
    • -
  • {{_i}}Table classes standardized with .table- required as a prefix{{/i}}
    • -
  • {{_i}}Removed unused table color options (too much code for such little impact){{/i}}
    • -
  • {{_i}}Dropped support for TableSorter{{/i}}
    • -
-

{{_i}}Buttons{{/i}}

-
    -
  • {{_i}}New classes for colors and sizes, all prefixed with .btn-{{/i}}
    • -
  • {{_i}}IE9: removed gradients and added rounded corners{{/i}}
    • -
  • {{_i}}Updated active state to make styling clearer in button groups (new) and look better with custom transition{{/i}}
    • -
  • {{_i}}New mixin, .buttonBackground, to set button gradients{{/i}}
    • -
  • {{_i}}The .secondary class was removed from modal examples in our docs as it never had associated styles.{{/i}}
    • -
-

{{_i}}Forms{{/i}}

-
    -
  • {{_i}}Default form style is now vertical (stacked) to use less CSS and add greater flexibility{{/i}}
    • -
  • {{_i}}Form classes standardized with .form- required as a prefix{{/i}}
    • -
  • {{_i}}New built-in form defaults for search, inline, and horizontal forms{{/i}}
    • -
  • {{_i}}For horizontal forms, previous classes .clearfix and .input are equivalent to the new .control-group and .controls.{{/i}}
    • -
  • {{_i}}More flexible horizontal form markup with classes for all styling, including new optional class for the label{{/i}}
    • -
  • {{_i}}Form states: colors updated and customizable via new LESS variables{{/i}}
    • -
-

{{_i}}Icons, by Glyphicons{{/i}}

-
    -
  • {{_i}}New Glyphicons Halflings icon set added in sprite form, in black and white{{/i}}
    • -
  • {{_i}}Simple markup required for an icon in tons of contexts: <i class="icon-cog"></>{{/i}}
    • -
  • {{_i}}Add another class, .icon-white, for white variation of the same icon{{/i}}
    • -
-
- - - - -
-
-

{{_i}}Components{{/i}}

-
-

{{_i}}Button groups and dropdowns{{/i}}

-
    -
  • {{_i}}Two brand new components in 2.0: button groups and button dropdowns{{/i}}
    • -
  • {{_i}}Dependency: button dropdowns are built on button groups, and therefore require all their styles{{/i}}
    • -
  • {{_i}}Button groups, .btn-group, can be grouped one level higher with a button toolbar, .btn-toolbar{{/i}}
    • -
-

{{_i}}Navigation{{/i}}

-
    -
  • {{_i}}Tabs and pills now require the use of a new base class, .nav, on their <ul> and the class names are now .nav-pills and .nav-tabs.{{/i}}
    • -
  • {{_i}}New nav list variation added that uses the same base class, .nav{{/i}}
    • -
  • {{_i}}Vertical tabs and pills have been added—just add .nav-stacked to the <ul>{{/i}}
    • -
  • {{_i}}Pills were restyled to be less rounded by default{{/i}}
    • -
  • {{_i}}Pills now have dropdown menu support (they share the same markup and styles as tabs){{/i}}
    • -
-

{{_i}}Navbar (formerly topbar){{/i}}

-
    -
  • {{_i}}Base class changed from .topbar to .navbar{{/i}}
    • -
  • {{_i}}Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed){{/i}}
    • -
  • {{_i}}Added vertical dividers to top-level nav{{/i}}
    • -
  • {{_i}}Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.{{/i}}
    • -
  • {{_i}}Navbar search form now requires use of the .navbar-search class and its input the use of .search-query. To position the search form, you must use .pull-left or .pull-right.{{/i}}
    • -
  • {{_i}}Added optional responsive markup for collapsing navbar contents for smaller resolutions and devices. See navbar docs for how to utilize.{{/i}}
    • -
-

{{_i}}Dropdown menus{{/i}}

-
    -
  • {{_i}}Updated the .dropdown-menu to tighten up spacing{{/i}}
    • -
  • {{_i}}Now requires you to add a <span class="caret"></span> to show the dropdown arrow{{/i}}
    • -
  • {{_i}}Now requires you to add a data-toggle="dropdown" attribute to obtain toggling behavior{{/i}}
    • -
  • {{_i}}The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.{{/i}}
    • -
-

{{_i}}Labels{{/i}}

-
    -
  • {{_i}}Label colors updated to match form state colors{{/i}}
    • -
  • {{_i}}Not only do they match graphically, but they are powered by the same new variables{{/i}}
    • -
-

{{_i}}Thumbnails{{/i}}

-
    -
  • {{_i}}Formerly .media-grid, now just .thumbnails, we've thoroughly extended this component for more uses while maintaining overall simplicity out of the box.{{/i}}
    • -
  • {{_i}}Individual thumbnails now require .thumbnail class{{/i}}
    • -
-

{{_i}}Alerts{{/i}}

-
    -
  • {{_i}}New base class: .alert instead of .alert-message{{/i}}
    • -
  • {{_i}}Class names standardized for other options, now all starting with .alert-{{/i}}
    • -
  • {{_i}}Redesigned base alert styles to combine the default alerts and block-level alerts into one{{/i}}
    • -
  • {{_i}}Block level alert class changed: .alert-block instead of .block-message{{/i}}
    • -
-

{{_i}}Progress bars{{/i}}

-
    -
  • {{_i}}New in 2.0{{/i}}
    • -
  • {{_i}}Features multiple styles via classes, including striped and animated variations via CSS3{{/i}}
    • -
-

{{_i}}Miscellaneous components{{/i}}

-
    -
  • {{_i}}Added documentation for the well component and the close icon (used in modals and alerts){{/i}}
    • -
-
- - - - -
-
-

{{_i}}Javascript plugins{{/i}}

-
-
- {{_i}}Heads up!{{/i}} {{_i}}We've rewritten just about everything for our plugins, so head on over to the Javascript page to learn more.{{/i}} -
-

{{_i}}Tooltips{{/i}}

-
    -
  • {{_i}}The plugin method has been renamed from twipsy() to tooltip(), and the class name changed from twipsy to tooltip.{{/i}}
    • -
  • {{_i}}The placement option value that was below is now bottom, and above is now top.{{/i}}
    • -
  • {{_i}}The animate option was renamed to animation.{{/i}}
    • -
  • {{_i}}The html option was removed, as the tooltips default to allowing HTML now.{{/i}}
    • -
-

{{_i}}Popovers{{/i}}

-
    -
  • {{_i}}Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.{{/i}}
    • -
  • {{_i}}The placement option value that was below is now bottom, and above is now top.{{/i}}
    • -
-

{{_i}}New plugins{{/i}}

- -
- diff --git a/docs/upgrading.html b/docs/upgrading.html deleted file mode 100644 index 2e390aaa6a..0000000000 --- a/docs/upgrading.html +++ /dev/null @@ -1,313 +0,0 @@ - - - - - Upgrading ยท Twitter Bootstrap - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - Bootstrap -
- -
-
-
-
- - -
-

Upgrading to Bootstrap 2

-

Learn about significant changes and additions since v1.4 with this handy guide.

-
- - - - -
-
-

Project changes

-
-
    -
  • Docs: major updates across the board to general structure, examples, and code snippets. Also made responsive with new media queries.
    • -
  • Docs: all docs pages are now powered by Mustache templates and strings are wrapped in i18n tags for translation by the Twitter Translation Center. All changes to documentation must be done here and then compiled (similar to our CSS and LESS).
    • -
  • Repo directory structure: removed the compiled CSS from the root in favor of a large direct download link on the docs homepage. Compiled CSS is in /docs/assets/css/.
    • -
  • Docs and repo: one makefile, just type make in the Terminal and get updated docs and CSS.
    • -
-
- - - - -
-
-

Scaffolding

-
-

Grid system

-
    -
  • Updated grid system, now only 12 columns instead of 16 -
  • Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more
    • -
  • Removed unused (by default) grid columns support for 17-24 columns
    • -
-

Responsive (media queries)

-
    -
  • Media queries added for basic support across mobile and tablet devices -
  • Responsive CSS is compiled separately, as bootstrap-responsive.css
    • -
-
- - - - -
-
-

Base CSS

-
-

Typography

-
    -
  • h4 elements were dropped from 16px to 14px with a default line-height of 18px
    • -
  • h5 elements were dropped from 14px to 12px
    • -
  • h6 elements were dropped from 13px to 11px
    • -
  • Right-aligned option for blockquotes if float: right;
    • -
-

Code

-
    -
  • New graphical style for <code>
    • -
  • Google Code Prettify styles updated (based on GitHub's gists)
    • -
-

Tables

-
    -
  • Improved support for colspan and rowspan
    • -
  • Styles now restricted to new base class, .table
    • -
  • Table classes standardized with .table- required as a prefix
    • -
  • Removed unused table color options (too much code for such little impact)
    • -
  • Dropped support for TableSorter
    • -
-

Buttons

-
    -
  • New classes for colors and sizes, all prefixed with .btn-
    • -
  • IE9: removed gradients and added rounded corners
    • -
  • Updated active state to make styling clearer in button groups (new) and look better with custom transition
    • -
  • New mixin, .buttonBackground, to set button gradients
    • -
  • The .secondary class was removed from modal examples in our docs as it never had associated styles.
    • -
-

Forms

-
    -
  • Default form style is now vertical (stacked) to use less CSS and add greater flexibility
    • -
  • Form classes standardized with .form- required as a prefix
    • -
  • New built-in form defaults for search, inline, and horizontal forms
    • -
  • For horizontal forms, previous classes .clearfix and .input are equivalent to the new .control-group and .controls.
    • -
  • More flexible horizontal form markup with classes for all styling, including new optional class for the label
    • -
  • Form states: colors updated and customizable via new LESS variables
    • -
-

Icons, by Glyphicons

-
    -
  • New Glyphicons Halflings icon set added in sprite form, in black and white
    • -
  • Simple markup required for an icon in tons of contexts: <i class="icon-cog"></>
    • -
  • Add another class, .icon-white, for white variation of the same icon
    • -
-
- - - - -
-
-

Components

-
-

Button groups and dropdowns

-
    -
  • Two brand new components in 2.0: button groups and button dropdowns
    • -
  • Dependency: button dropdowns are built on button groups, and therefore require all their styles
    • -
  • Button groups, .btn-group, can be grouped one level higher with a button toolbar, .btn-toolbar
    • -
-

Navigation

-
    -
  • Tabs and pills now require the use of a new base class, .nav, on their <ul> and the class names are now .nav-pills and .nav-tabs.
    • -
  • New nav list variation added that uses the same base class, .nav
    • -
  • Vertical tabs and pills have been added—just add .nav-stacked to the <ul>
    • -
  • Pills were restyled to be less rounded by default
    • -
  • Pills now have dropdown menu support (they share the same markup and styles as tabs)
    • -
-

Navbar (formerly topbar)

-
    -
  • Base class changed from .topbar to .navbar
    • -
  • Now supports static position (default behavior, not fixed) and fixed to the top of viewport via .navbar-fixed-top (previously only supported fixed)
    • -
  • Added vertical dividers to top-level nav
    • -
  • Improved support for inline forms in the navbar, which now require .navbar-form to properly scope styles to only the intended forms.
    • -
  • Navbar search form now requires use of the .navbar-search class and its input the use of .search-query. To position the search form, you must use .pull-left or .pull-right.
    • -
  • Added optional responsive markup for collapsing navbar contents for smaller resolutions and devices. See navbar docs for how to utilize.
    • -
-

Dropdown menus

-
    -
  • Updated the .dropdown-menu to tighten up spacing
    • -
  • Now requires you to add a <span class="caret"></span> to show the dropdown arrow
    • -
  • Now requires you to add a data-toggle="dropdown" attribute to obtain toggling behavior
    • -
  • The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.
    • -
-

Labels

-
    -
  • Label colors updated to match form state colors
    • -
  • Not only do they match graphically, but they are powered by the same new variables
    • -
-

Thumbnails

-
    -
  • Formerly .media-grid, now just .thumbnails, we've thoroughly extended this component for more uses while maintaining overall simplicity out of the box.
    • -
  • Individual thumbnails now require .thumbnail class
    • -
-

Alerts

-
    -
  • New base class: .alert instead of .alert-message
    • -
  • Class names standardized for other options, now all starting with .alert-
    • -
  • Redesigned base alert styles to combine the default alerts and block-level alerts into one
    • -
  • Block level alert class changed: .alert-block instead of .block-message
    • -
-

Progress bars

-
    -
  • New in 2.0
    • -
  • Features multiple styles via classes, including striped and animated variations via CSS3
    • -
-

Miscellaneous components

-
    -
  • Added documentation for the well component and the close icon (used in modals and alerts)
    • -
-
- - - - -
-
-

Javascript plugins

-
-
- Heads up! We've rewritten just about everything for our plugins, so head on over to the Javascript page to learn more. -
-

Tooltips

-
    -
  • The plugin method has been renamed from twipsy() to tooltip(), and the class name changed from twipsy to tooltip.
    • -
  • The placement option value that was below is now bottom, and above is now top.
    • -
  • The animate option was renamed to animation.
    • -
  • The html option was removed, as the tooltips default to allowing HTML now.
    • -
-

Popovers

-
    -
  • Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.
    • -
  • The placement option value that was below is now bottom, and above is now top.
    • -
-

New plugins

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -