diff --git a/README.md b/README.md index c3990ff008..9beef51e83 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ Should you encounter problems with installing dependencies or running Grunt comm Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. -More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo). +Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo). Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at . diff --git a/docs/_includes/nav-about.html b/docs/_includes/nav-about.html index 93121e700a..bf6b684e9d 100644 --- a/docs/_includes/nav-about.html +++ b/docs/_includes/nav-about.html @@ -1,9 +1,9 @@ -
  • - Brand guidelines -
  • History
  • Team
    • +
  • + Brand guidelines +
    • diff --git a/docs/about.html b/docs/about.html index f2ec01b25b..1cecb9f289 100644 --- a/docs/about.html +++ b/docs/about.html @@ -2,67 +2,10 @@ layout: default title: About slug: about -lead: "Find out how to use the Bootstrap brand, learn about the project's history, and meet the maintaining teams." +lead: "Learn about the project's history, meet the maintaining teams, and find out how to use the Bootstrap brand." --- - -
    -

    Brand guidelines

    - -

    Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's Brand Assets.

    - -

    Mark and logo

    -

    Use either the Bootstrap mark (a capital B) or the standard logo (just Bootstrap). It should always appear in Helvetica Neue Bold. Do not use the Twitter bird in association with Bootstrap.

    -
    -
    -
    B
    -
    -
    -
    B
    -
    -
    -
    -
    -

    Bootstrap

    -
    -
    -

    Bootstrap

    -
    -
    - -

    Name

    -

    The project and framework should always be referred to as Bootstrap. No Twitter before it, no capital s, and no abbreviations save for one, a capital B.

    -
    -
    -

    Bootstrap

    - -
    -
    -

    BootStrap

    - -
    -
    -

    Twitter Bootstrap

    - -
    -
    - -

    Colors

    -

    Our docs and branding use a handful of primary colors to differentiate what is Bootstrap from what is in Bootstrap. In other words, if it's purple, it's representative of Bootstrap.

    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    @@ -147,3 +90,60 @@ lead: "Find out how to use the Bootstrap brand, learn about the project's histor

    The official Sass port of Bootstrap was created and is maintained by this team. It became part of Bootstrap's organization with v3.1. Read the Sass contributing guidelines for information on how the Sass port is developed.

    + + + +
    +

    Brand guidelines

    + +

    Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's Brand Assets.

    + +

    Mark and logo

    +

    Use either the Bootstrap mark (a capital B) or the standard logo (just Bootstrap). It should always appear in Helvetica Neue Bold. Do not use the Twitter bird in association with Bootstrap.

    +
    +
    +
    B
    +
    +
    +
    B
    +
    +
    +
    +
    +

    Bootstrap

    +
    +
    +

    Bootstrap

    +
    +
    + +

    Name

    +

    The project and framework should always be referred to as Bootstrap. No Twitter before it, no capital s, and no abbreviations save for one, a capital B.

    +
    +
    +

    Bootstrap

    + +
    +
    +

    BootStrap

    + +
    +
    +

    Twitter Bootstrap

    + +
    +
    + +

    Colors

    +

    Our docs and branding use a handful of primary colors to differentiate what is Bootstrap from what is in Bootstrap. In other words, if it's purple, it's representative of Bootstrap.

    +
    +
    +
    +
    +
    +
    +
    +
    + +
    diff --git a/docs/components.html b/docs/components.html index 2f562908c4..510abcc667 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1149,7 +1149,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, -

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

    +

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

    Link functionality not impacted

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

    Adapts to active nav states

    -

    Built-in styles are included for placing badges in active states in pill and list navigations.

    +

    Built-in styles are included for placing badges in active states in pill navigations.