diff --git a/README.md b/README.md index 007d4a2fee..aae3e87d34 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ Editor preferences are available in the [editor config](.editorconfig) for easy Keep track of development and community news. * Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap). -* Read and subscribe to the [The Official Bootstrap Blog](http://blog.getbootstrap.com). +* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). * Have a question that's not a feature request or bug report? [Ask on the mailing list.](http://groups.google.com/group/twitter-bootstrap) * Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel. diff --git a/_includes/nav-about.html b/_includes/nav-about.html new file mode 100644 index 0000000000..2cf12359b7 --- /dev/null +++ b/_includes/nav-about.html @@ -0,0 +1,12 @@ +
  • + History +
  • +
  • + Core team +
  • +
  • + Community +
  • +
  • + Translations +
  • diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 243c05fb05..c06896e6a5 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -1,3 +1,12 @@ +
  • + Welcome + +
  • Download Bootstrap + diff --git a/_layouts/default.html b/_layouts/default.html index ef046f6ff7..a2c26a22aa 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -37,6 +37,8 @@ {% include nav-javascript.html %} {% elsif page.slug == "customize" %} {% include nav-customize.html %} + {% elsif page.slug == "about" %} + {% include nav-about.html %} {% endif %} diff --git a/about.html b/about.html new file mode 100644 index 0000000000..e7bc384251 --- /dev/null +++ b/about.html @@ -0,0 +1,85 @@ +--- +layout: default +title: About +slug: about +lead: "Learn about the history of Bootstrap, meet the core team, and check out the ever-growing community resources." +base_url: "../" +--- + + + +
    + +

    Originally created by a designer and a developer at Twitter, Bootstrap has become one of the most popular front-end frameworks and open source projects in the world.

    +

    Bootstrap was created at Twitter in mid-2010 by @mdo and @fat. Prior to being an open-sourced framework, Bootstrap was known as Twitter Blueprint. A few months into development, Twitter held its first Hack Week and the project exploded as developers of all skill levels jumped in without any external guidance. It served as the style guide for internal tools development at the company for over a year before its public release, and continues to do so today.

    +

    Originally released on , we've since had over twenty releases, including two major rewrites with v2 and v3. With Bootstrap 2, we added responsive functionality to the entire framework as an optional stylesheet. Building on that with Bootstrap 3, we rewrote the library once more to make it responsive by default with a mobile first approach.

    +
    + + + +
    + +

    Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.

    + +

    Get involved with Bootstrap development by opening an issue or submitting a pull request. Read our contributing guidelines for information on how we develop.

    +
    + + + +
    + +

    Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.

    + +

    You can also follow @twbootstrap on Twitter for the latest gossip and awesome music videos.

    +
    + + + +
    + +

    Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.

    + +

    Have another language to add, or perhaps a different or better translation? Let us know by opening an issue.

    +
    diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 8078a7bac6..25ebce1360 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -373,7 +373,7 @@ body { .carbonad { position: absolute; top: 20px; - right: 0; + right: 15px; /* 15px instead of 0 since box-sizing */ padding: 15px !important; width: 330px !important; } @@ -553,33 +553,79 @@ h1[id] { /* Common styles for all types */ .bs-callout { + /*position: relative;*/ margin: 20px 0; - padding: 15px 30px 15px 15px; - border-left: 5px solid #eee; + padding: 20px; + border-left: 3px solid #eee; + /*border-width: 1px 1px 1px 10px;*/ } +/*.bs-callout:before { + position: absolute; + top: 0; + left: -20px; + color: #fff; + width: 20px; + height: 20px; +}*/ .bs-callout h4 { margin-top: 0; + margin-bottom: 5px; } .bs-callout p:last-child { margin-bottom: 0; } .bs-callout code, .bs-callout .highlight { - background-color: #fff; + /*background-color: #fff;*/ } /* Variations */ .bs-callout-danger { - background-color: #fcf2f2; - border-color: #dFb5b4; + background-color: #fdf7f7; + border-color: #eed3d7; +} +.bs-callout-danger h4 { + color: #b94a48; } .bs-callout-warning { - background-color: #fefbed; - border-color: #f1e7bc; + background-color: #faf8f0; + border-color: #faebcc; +} +.bs-callout-warning h4 { + color: #c09853; } .bs-callout-info { - background-color: #f0f7fd; - border-color: #d0e3f0; + background-color: #f4f8fa; + border-color: #bce8f1; +} +.bs-callout-info h4 { + color: #3a87ad; +} + + +/* + * Team members + * + * Avatars, names, and usernames for core team. + */ + +.bs-team .team-member { + color: #555; + line-height: 32px; +} +.bs-team .team-member:hover { + color: #333; + text-decoration: none; +} +.bs-team iframe { + float: right; + margin-top: 6px; +} +.bs-team img { + float: left; + width: 32px; + margin-right: 10px; + border-radius: 4px; } @@ -1120,6 +1166,11 @@ h1[id] { * Odds and ends for optimum docs display. */ + /* About page */ + .bs-about { + font-size: 16px; + } + /* Examples gallery: space out content better */ .bs-examples h4 { margin-bottom: 5px; diff --git a/getting-started.html b/getting-started.html index b37ad1cfe4..357c4f8ead 100644 --- a/getting-started.html +++ b/getting-started.html @@ -7,6 +7,72 @@ base_url: "../" --- + +
    + +

    You're looking at the official documentation for Bootstrap (v{{ site.version }}), a front-end framework for building on the Web. Before diving in, get the background story on Bootstrap, useful tidbits about the docs, helpful community links, and more.

    + +

    Brief history

    +

    Bootstrap was created at Twitter in mid-2010 by @mdo and @fat. Prior to being open-sourced framework, Bootstrap was known as Twitter Blueprint. A few months into development, Twitter held its first Hack Week and the project exploded. It served as the style guide for internal tools development at the company for over a year before its public release.

    +

    Originally released on , we've had over twenty releases, including two major rewrites with v2 and v3. With Bootstrap 2, we added responsive functionality to the entire framework as an optional stylesheet. Building on that with Bootstrap 3, we rewrote the library once more to make it responsive by default with a mobile first approach.

    + +

    Core team

    +

    Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.

    + +

    Get involved with Bootstrap development by opening an issue or submitting a pull request. Read our contributing guidelines for more information.

    + +

    Callouts

    +

    We use callouts throughout the docs to direct attention to important contextual information. These callouts can be informative and optional (blue), warnings (yellow), or dangerously important (red).

    +
    +

    Extra information

    +

    These are helpful notes that provide background information or additional context.

    +
    +
    +

    Heads up

    +

    This is a warning used to highlight pertinent, though not necessarily required, information.

    +
    +
    +

    Potential danger ahead

    +

    Pay attention to these for potentially dangerous or tricky requirements, bugs, and more.

    +
    +

    See something worth calling out? Let us know with an issue on GitHub.

    + +

    Community

    +

    Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.

    + +

    You can also follow @twbootstrap on Twitter for the latest gossip and awesome music videos.

    +
    + +
    @@ -55,6 +121,7 @@ base_url: "../"
    +