From 14975e4ee949a64413bde6d934d2198450c4478c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 15 Jan 2014 13:24:34 -0800 Subject: indentation and page header changes --- docs/about.html | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index 2f8efe8ea..e5bd120a3 100644 --- a/docs/about.html +++ b/docs/about.html @@ -9,9 +9,8 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t
-
-

Brand guidelines

-
+

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

@@ -67,9 +66,8 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t
-
-

History

-
+

History

+

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.

@@ -79,9 +77,8 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t
-
-

Team

-
+

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.

Core team

@@ -155,9 +152,8 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t
-
-

Community

-
+

Community

+

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

  • Read and subscribe to The Official Bootstrap Blog.
    • @@ -171,9 +167,8 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t
    -
    -

    Translations

    -
    +

    Translations

    +

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

    • Bootstrap 中文文档 (Chinese)
      • -- cgit v1.2.3 From a624981ef334c64adf5df829f02cda95528782f1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 15 Jan 2014 15:02:13 -0800 Subject: add link to Sass CONTRIBUTING file in the About page --- docs/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index e5bd120a3..7033838ea 100644 --- a/docs/about.html +++ b/docs/about.html @@ -145,7 +145,7 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t
-

The official Sass port of Bootstrap was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.

+

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.

-- cgit v1.2.3 From 4c9433d13d789fac5edcc8531abc8f6b0fcf0f54 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 16 Jan 2014 00:22:05 +0100 Subject: Adhere to MailChimp's brand guidelines ;) --- docs/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index e5bd120a3..137988ca6 100644 --- a/docs/about.html +++ b/docs/about.html @@ -11,7 +11,7 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t

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.

+

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.

-- cgit v1.2.3 From 53bcb829bbe9eee1ab2f65a9b1ca0c024711e34d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 15 Jan 2014 15:34:10 -0800 Subject: move Community & Translations docs sections from About to Getting Started --- docs/about.html | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index e5bd120a3..b644b1e31 100644 --- a/docs/about.html +++ b/docs/about.html @@ -147,35 +147,3 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t

The official Sass port of Bootstrap was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.

- - - -
-

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.

-
- - - -
-

Translations

- -

Community members have translated Bootstrap's documentation into various languages. 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.

-
-- cgit v1.2.3 From 5ac8dca8ad38cfe57665aee6b4f9f00e371203ef Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 16 Jan 2014 01:08:00 +0100 Subject: Adapt about.html lead to latest changes --- docs/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index 9d47aba0f..f2ec01b25 100644 --- a/docs/about.html +++ b/docs/about.html @@ -2,7 +2,7 @@ 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." +lead: "Find out how to use the Bootstrap brand, learn about the project's history, and meet the maintaining teams." --- -- cgit v1.2.3 From 068d7a11f98c6c7ae834208f4ab99781fb91dd39 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 21 Jan 2014 10:28:54 -0800 Subject: reorder sections of About docs page most folks are probably more interested in History and Team than Branding --- docs/about.html | 114 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index f2ec01b25..2d1c6c4e1 100644 --- a/docs/about.html +++ b/docs/about.html @@ -6,63 +6,6 @@ lead: "Find out how to use the Bootstrap brand, learn about the project's histor --- - -
-

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.

+
+
+
+
+
+
+
+
+ +
-- cgit v1.2.3 From c08aef16554e0958666f736da40601af09896c1c Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Tue, 21 Jan 2014 22:12:44 -0800 Subject: Reorder lead info of About docs page --- docs/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index 2d1c6c4e1..1cecb9f28 100644 --- a/docs/about.html +++ b/docs/about.html @@ -2,7 +2,7 @@ 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." --- -- cgit v1.2.3 From 4b5991586dc501a219d19debd23238aac791d3a9 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Fri, 24 Jan 2014 11:24:50 -0800 Subject: Change a word. --- docs/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index 1cecb9f28..4aa3bc026 100644 --- a/docs/about.html +++ b/docs/about.html @@ -119,7 +119,7 @@ lead: "Learn about the project's history, meet the maintaining teams, and find o

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.

+

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

Bootstrap

-- cgit v1.2.3 From 1a36e4fa1e9d9220a242d01062941a16ef07e660 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 26 Jan 2014 17:48:15 -0800 Subject: docs & comments: v3.1 => v3.1.0 --- docs/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/about.html') diff --git a/docs/about.html b/docs/about.html index 4aa3bc026..1195a08a0 100644 --- a/docs/about.html +++ b/docs/about.html @@ -88,7 +88,7 @@ lead: "Learn about the project's history, meet the maintaining teams, and find o
-

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.

+

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

-- cgit v1.2.3