From 77549410d52f86c2d42136014f5a2ae21f4cabee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Sep 2013 18:37:39 -0700 Subject: [PATCH 1/8] Add Welcome section to docs * Fixes unrelated typo in readme * Add new Welcome section with history, team, callouts, and community subsections * Redesigns callouts to be a bit lighterweight with colored headings --- README.md | 2 +- _includes/nav-getting-started.html | 9 ++++ assets/css/docs.css | 64 ++++++++++++++++++++++++---- getting-started.html | 67 ++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 29d7e99034..fa1235a3df 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,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-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 3f1276e4e6..46a5a7f551 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -38,6 +38,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..c9c2088375 --- /dev/null +++ b/about.html @@ -0,0 +1,69 @@ +--- +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: "../" +--- + + + +
    +
    +

    History

    +
    +

    Originally created at Twitter by a designer and a developer nearly three years ago, 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 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. 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 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.

    +
    + + + +
    +
    +

    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.

    +
    + + + @mdo + Mark Otto @mdo + + + + @fat + Jacob Thornton @fat + + + + @cvrebert + Chris Rebert @cvrebert + + + + @juthilo + Julian Thilo @juthilo + +
    +

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

    +
    + + + +
    +
    +

    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.

    +
    From 25607c268337c6505f633309e2765cf328a6896b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 23:19:11 -0700 Subject: [PATCH 8/8] add translations, copy edit a few things, and fix alignment of ads --- _includes/nav-about.html | 3 +++ about.html | 20 ++++++++++++++++++-- assets/css/docs.css | 7 ++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/_includes/nav-about.html b/_includes/nav-about.html index d6f971f6be..2cf12359b7 100644 --- a/_includes/nav-about.html +++ b/_includes/nav-about.html @@ -7,3 +7,6 @@
  • Community
    • +
  • + Translations +
    • diff --git a/about.html b/about.html index c9c2088375..e7bc384251 100644 --- a/about.html +++ b/about.html @@ -13,8 +13,8 @@ base_url: "../"

    History

    -

    Originally created at Twitter by a designer and a developer nearly three years ago, 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 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. It served as the style guide for internal tools development at the company for over a year before its public release.

    +

    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.

    @@ -67,3 +67,19 @@ base_url: "../"

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

    + + + +
    +
    +

    Translations

    +
    +

    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/assets/css/docs.css b/assets/css/docs.css index 0d8981d71e..c1ecf71b91 100644 --- a/assets/css/docs.css +++ b/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; } @@ -1118,6 +1118,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;