diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html index fd6f8c98b0..bde8bf4045 100644 --- a/docs/_includes/nav-getting-started.html +++ b/docs/_includes/nav-getting-started.html @@ -8,6 +8,9 @@
  • What's included
  • +
  • + Browser support +
  • Templates and examples
  • +
  • + License FAQs +
  • Customizing Bootstrap
  • \ No newline at end of file diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index a6d106989d..aae9e0635a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -222,11 +222,10 @@ body { /* Side notes for calling out things -------------------------------------------------- */ +/* Base styles (regardless of theme) */ .bs-callout { margin: 20px 0; padding: 15px 30px 15px 15px; - background-color: #fcf2f2; - border-left: 5px solid #df7c7b; } .bs-callout h4 { margin-top: 0; @@ -239,6 +238,20 @@ body { background-color: #fff; } +/* Themes for different contexts */ +.bs-callout-danger { + background-color: #fcf2f2; + border-left: 5px solid #df7c7b; +} +.bs-callout-warning { + background-color: #fefbed; + border-left: 5px solid #f5d659; +} +.bs-callout-info { + background-color: #f0f7fd; + border-left: 5px solid #55a9e1; +} + /* Special grid styles diff --git a/docs/components.html b/docs/components.html index cf504ebfa8..365eeb0d6b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -167,7 +167,13 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na {% endhighlight %}

    Justified button groups

    -

    Make a group of buttons stretch at the same size to span the entire width of its parent. This only works with <a> elements as the <button> doesn't pick up these styles.

    +

    Make a group of buttons stretch at the same size to span the entire width of its parent.

    + +
    +

    Element-specific usage

    +

    This only works with <a> elements as the <button> doesn't pick up these styles.

    +
    +
    Left @@ -193,7 +199,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na

    Use any button to trigger a dropdown menu by placing it within a .btn-group and providing the proper menu markup.

    -
    +

    Plugin dependency

    Button dropdowns require the dropdown plugin to be included in your version of Bootstrap.

    @@ -530,7 +536,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na

    For any nav component (tabs, pills, or list), add .disabled for gray links and no hover effects.

    -
    +

    Link functionality not impacted

    This class will only change the <a>'s appearance, not its functionality. Use custom JavaScript to disable links here.

    @@ -814,7 +820,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
    {% endhighlight %} -
    +

    Body padding required

    The fixed navbar will overlay your other content, unless you add padding to the top of the <body>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.

    {% highlight css %} @@ -843,7 +849,7 @@ body { padding-top: 70px; }
    {% endhighlight %} -
    +

    Body padding required

    The fixed navbar will overlay your other content, unless you add padding to the bottom of the <body>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.

    {% highlight css %} @@ -944,7 +950,7 @@ body { padding-bottom: 70px; }
    {% endhighlight %} -
    +

    Plugin dependency

    The responsive navbar requires the collapse plugin to be included in your version of Bootstrap.

    @@ -1261,7 +1267,7 @@ body { padding-bottom: 70px; }

    Self collapsing

    When there are no new or unread items, badges will simply collapse (via CSS's :empty selector) provided no content exists within.

    -
    +

    Cross-browser compatibility

    Badges won't self collapse in Internet Explorer 8 because it lacks support for the :empty selector.

    @@ -1455,7 +1461,13 @@ body { padding-bottom: 70px; }

    Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the alerts jQuery plugin.

    Default alert

    -

    Wrap any text and an optional dismiss button in .alert for a basic warning alert message. To ensure proper behavior across all devices, be sure to use <button> element with the data-dismiss="alert" data attribute.

    +

    Wrap any text and an optional dismiss button in .alert for a basic warning alert message.

    + +
    +

    Ensure proper behavior across all devices

    +

    Be sure to use the <button> element with the data-dismiss="alert" data attribute.

    +
    +
    @@ -1548,7 +1560,7 @@ body { padding-bottom: 70px; }

    Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.

    -
    +

    Cross-browser compatibility

    Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in Internet Explorer 9 and below or older versions of Firefox. Opera 12 does not support animations.

    diff --git a/docs/css.html b/docs/css.html index e87abfbc0d..e15157fba4 100644 --- a/docs/css.html +++ b/docs/css.html @@ -259,7 +259,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
    {% endhighlight %} -
    +

    Need more examples?

    We dive into more grid layouts in a separate page, free of chrome and documentation to better show you the power of the grid.

    More grid examples

    @@ -520,7 +520,10 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes." rendered as italicized text {% endhighlight %} -

    Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

    +
    +

    Alternate elements

    +

    Feel free to use <b> and <i> in HTML5. <b> is meant to highlight words or phrases without conveying additional importance while <i> is mostly for voice, technical terms, etc.

    +

    Alignment classes

    Easily realign text to components with text alignment classes.

    @@ -788,10 +791,10 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes." {% endhighlight %} -
    Auto-truncating
    -

    - Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout. -

    +
    +

    Auto-truncating

    +

    Horizontal description lists will truncate terms that are too long to fit in the left column with text-overflow. In narrower viewports, they will change to the default stacked layout.

    +
    @@ -878,7 +881,7 @@ For example, <section> should be wrapped as inline.

    Striped

    Use .table-striped to add zebra-striping to any table row within the <tbody>.

    -
    +

    Cross-browser compatibility

    Striped tables are styled via the :nth-child CSS selector, which is not available in IE8.

    @@ -1172,7 +1175,7 @@ For example, <section> should be wrapped as inline.

    Inline form

    Add .form-inline for left-aligned and inline-block controls for a compact layout.

    -
    +

    Requires custom widths

    Inputs, selects, and textareas are 100% wide by default in Bootstrap. To use the inline form, you'll have to set a width on the form controls used within.

    @@ -1254,7 +1257,7 @@ For example, <section> should be wrapped as inline.

    Inputs

    Most common form control, text-based input fields. Includes support for all HTML5 types: text, password, datetime, datetime-local, date, month, time, week, number, email, url, search, tel, and color.

    -
    +

    Type declaration required

    Inputs will only be fully styled if their type is properly declared.

    @@ -1402,12 +1405,12 @@ For example, <section> should be wrapped as inline.

    Disabled fieldsets

    Add the disabled attribute to a <fieldset> to disable all the controls within the <fieldset> at once.

    -
    +

    Link functionality of <a> not impacted

    This class will only change the appearance of <a class="btn btn-default"> buttons, not their functionality. Use custom JavaScript to disable links here.

    -
    +

    Cross-browser compatibility

    While Bootstrap will apply these styles in all browsers, IE and Safari don't actually support the <disabled> attribute on a <fieldset>. Use custom JavaScript to disable the fieldset in these browsers.

    @@ -1504,7 +1507,7 @@ For example, <section> should be wrapped as inline.

    Input groups

    Add text or buttons before, after, or on both sides of any text-based input. Use .input-group with an .add-on to prepend or append elements to an <input>.

    -
    +

    Cross-browser compatibility

    Avoid using <select> elements here as they cannot be fully styled in WebKit browsers.

    @@ -1891,7 +1894,7 @@ For example, <section> should be wrapped as inline. {% endhighlight %} -
    +

    Cross-browser compatibility

    If you add the disabled attribute to a <button>, Internet Explorer 9 and below will render text gray with a nasty text-shadow that we cannot fix.

    @@ -1909,7 +1912,7 @@ For example, <section> should be wrapped as inline.

    We use .disabled as a utility class here, similar to the common .active class, so no prefix is required.

    -
    +

    Link functionality not impacted

    This class will only change the <a>'s appearance, not its functionality. Use custom JavaScript to disable links here.

    @@ -1930,7 +1933,7 @@ For example, <section> should be wrapped as inline. {% endhighlight %} -
    +

    Cross-browser rendering

    As a best practice, we highly recommend using the <button> element whenever possible to ensure matching cross-browser rendering.

    @@ -1947,7 +1950,7 @@ For example, <section> should be wrapped as inline.

    Add classes to an <img> element to easily style images in any project.

    -
    +

    Cross-browser compatibility

    Keep in mind that Internet Explorer 8 lacks support for rounded corners.

    diff --git a/docs/customize.html b/docs/customize.html index 7d2b4f2540..876d81ddee 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -349,9 +349,15 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
    -
    -

    Heads up!

    -

    All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

    + +
    +

    Produces two files

    +

    All checked plugins will be compiled into a readable bootstrap.js and a minified bootstrap.min.js. We recommend you use the minified version in production.

    +
    + +
    +

    jQuery required

    +

    All plugins require the latest version of jQuery to be included.

    @@ -1151,7 +1157,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge -
    +

    What's included?

    Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.

    diff --git a/docs/getting-started.html b/docs/getting-started.html index 56e6cbc323..3efd00c1de 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -49,7 +49,7 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex {% endhighlight %} -
    +

    LESS compilation

    If you download the original files, you need to compile Bootstrap's LESS files into usable CSS. To do that, Bootstrap only officially supports Recess, Twitter's CSS hinter built on top of less.js.

    @@ -75,12 +75,35 @@ bootstrap/ {% endhighlight %}

    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.

    -
    +

    jQuery required

    Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template.

    + +
    + +

    Bootstrap is built to work best in the latest desktop and mobile browsers, meaning older and less advanced browsers might receive a less stylized, though fully functional, version of certain components.

    + +

    Supported browsers

    +

    Specifically, we support the latest versions of the following:

    +
      +
    • Chrome (Mac, Windows, iOS, and Android)
    • +
    • Safari (Mac and iOS only, as Windows has more or less been discontinued)
    • +
    • Firefox (Mac, Windows)
    • +
    • Internet Explorer
    • +
    • Opera (Mac, Windows)
    • +
    +

    Unofficially, Bootstrap should look and behave just fine in Chromium for Linux and Internet Explorer 7-8, though full support is not guaranteed.

    + +

    IE Compatibility modes

    +

    Bootstrap is not supported in the old Internet Explorer compatibility modes. To be sure you're using the latest rendering mode for IE, consider including <meta http-equiv="X-UA-Compatible" content="IE=edge"> in your pages. See this StackOverflow question for more information.

    +
    +
    @@ -213,6 +236,52 @@ bootstrap/ + +
    + +

    Bootstrap is released under the Apache 2 license. Boiled down to smaller chunks, it can be described with the following conditions.

    + +
    +
    +

    It allows you to:

    +
      +
    • Freely download and use Twitter open source software, in whole or in part, for personal, company internal or commercial purposes
    • +
    • Use Twitter open source software in packages or distributions that you create
    • +
    +
    +
    +

    It forbids you to:

    +
      +
    • Redistribute any piece of Twitter open source originated software without proper attribution
    • +
    • Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution
    • +
    • Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question
    • +
    +
    +
    +
    +
    +

    It requires you to:

    +
      +
    • Include a copy of the license in any redistribution you may make that includes Twitter software
    • +
    • Provide clear attribution to Twitter for any distributions that include Twitter open source software
    • +
    +
    +
    +

    It does not require you to:

    +
      +
    • Include the source of the Twitter software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it
    • +
    • Submit changes that you make to the software back to Twitter (though such feedback is encouraged)
    • +
    +
    +
    +

    The full Bootstrap license is located in the project repository for more information.

    +
    + + +