Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <code@rebertia.com>2014-01-21 22:28:54 +0400
committerChris Rebert <code@rebertia.com>2014-01-21 22:28:54 +0400
commit068d7a11f98c6c7ae834208f4ab99781fb91dd39 (patch)
treed7ce2c8af64a7561533339e4c79e30b91262c210 /docs/about.html
parent7938134fd1382deb7b300da1672559fe2afb3706 (diff)
reorder sections of About docs page
most folks are probably more interested in History and Team than Branding
Diffstat (limited to 'docs/about.html')
-rw-r--r--docs/about.html114
1 files changed, 57 insertions, 57 deletions
diff --git a/docs/about.html b/docs/about.html
index f2ec01b25b..2d1c6c4e1e 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
-================================================== -->
-<div class="bs-docs-section">
- <h1 id="brand" class="page-header">Brand guidelines</h1>
-
- <p class="lead">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 <a href="http://mailchimp.com/about/brand-assets/" target="_blank">Brand Assets</a>.</p>
-
- <h2>Mark and logo</h2>
- <p>Use either the Bootstrap mark (a capital <strong>B</strong>) or the standard logo (just <strong>Bootstrap</strong>). It should always appear in Helvetica Neue Bold. <strong>Do not use the Twitter bird</strong> in association with Bootstrap.</p>
- <div class="bs-brand-logos">
- <div class="bs-brand-item">
- <div class="bs-booticon bs-booticon-lg">B</div>
- </div>
- <div class="bs-brand-item inverse">
- <div class="bs-booticon bs-booticon-lg bs-booticon-inverse">B</div>
- </div>
- </div>
- <div class="bs-brand-logos">
- <div class="bs-brand-item">
- <h1>Bootstrap</h1>
- </div>
- <div class="bs-brand-item inverse">
- <h1>Bootstrap</h1>
- </div>
- </div>
-
- <h2>Name</h2>
- <p>The project and framework should always be referred to as <strong>Bootstrap</strong>. No Twitter before it, no capital <em>s</em>, and no abbreviations save for one, a capital <strong>B</strong>.</p>
- <div class="bs-brand-logos">
- <div class="bs-brand-item">
- <h3>Bootstrap</h3>
- <span class="glyphicon glyphicon-ok"></span>
- </div>
- <div class="bs-brand-item">
- <h3 class="text-muted">BootStrap</h3>
- <span class="glyphicon glyphicon-remove"></span>
- </div>
- <div class="bs-brand-item">
- <h3 class="text-muted">Twitter Bootstrap</h3>
- <span class="glyphicon glyphicon-remove"></span>
- </div>
- </div>
-
- <h2>Colors</h2>
- <p>Our docs and branding use a handful of primary colors to differentiate what <em>is</em> Bootstrap from what <em>is in</em> Bootstrap. In other words, if it's purple, it's representative of Bootstrap.</p>
- <div class="bs-brand">
- <div class="color-swatches">
- <div class="color-swatch bs-purple"></div>
- <div class="color-swatch bs-purple-light"></div>
- <div class="color-swatch bs-purple-lighter"></div>
- <div class="color-swatch bs-gray"></div>
- </div>
- </div>
-
-</div>
-
-
<!-- History
================================================== -->
<div class="bs-docs-section">
@@ -147,3 +90,60 @@ lead: "Find out how to use the Bootstrap brand, learn about the project's histor
</div>
<p>The <a href="{{ site.sass_repo }}">official Sass port of Bootstrap</a> was created and is maintained by this team. It became part of Bootstrap's organization with v3.1. Read the Sass <a href="https://github.com/twbs/bootstrap-sass/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how the Sass port is developed.</p>
</div>
+
+
+<!-- Brand
+================================================== -->
+<div class="bs-docs-section">
+ <h1 id="brand" class="page-header">Brand guidelines</h1>
+
+ <p class="lead">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 <a href="http://mailchimp.com/about/brand-assets/" target="_blank">Brand Assets</a>.</p>
+
+ <h2>Mark and logo</h2>
+ <p>Use either the Bootstrap mark (a capital <strong>B</strong>) or the standard logo (just <strong>Bootstrap</strong>). It should always appear in Helvetica Neue Bold. <strong>Do not use the Twitter bird</strong> in association with Bootstrap.</p>
+ <div class="bs-brand-logos">
+ <div class="bs-brand-item">
+ <div class="bs-booticon bs-booticon-lg">B</div>
+ </div>
+ <div class="bs-brand-item inverse">
+ <div class="bs-booticon bs-booticon-lg bs-booticon-inverse">B</div>
+ </div>
+ </div>
+ <div class="bs-brand-logos">
+ <div class="bs-brand-item">
+ <h1>Bootstrap</h1>
+ </div>
+ <div class="bs-brand-item inverse">
+ <h1>Bootstrap</h1>
+ </div>
+ </div>
+
+ <h2>Name</h2>
+ <p>The project and framework should always be referred to as <strong>Bootstrap</strong>. No Twitter before it, no capital <em>s</em>, and no abbreviations save for one, a capital <strong>B</strong>.</p>
+ <div class="bs-brand-logos">
+ <div class="bs-brand-item">
+ <h3>Bootstrap</h3>
+ <span class="glyphicon glyphicon-ok"></span>
+ </div>
+ <div class="bs-brand-item">
+ <h3 class="text-muted">BootStrap</h3>
+ <span class="glyphicon glyphicon-remove"></span>
+ </div>
+ <div class="bs-brand-item">
+ <h3 class="text-muted">Twitter Bootstrap</h3>
+ <span class="glyphicon glyphicon-remove"></span>
+ </div>
+ </div>
+
+ <h2>Colors</h2>
+ <p>Our docs and branding use a handful of primary colors to differentiate what <em>is</em> Bootstrap from what <em>is in</em> Bootstrap. In other words, if it's purple, it's representative of Bootstrap.</p>
+ <div class="bs-brand">
+ <div class="color-swatches">
+ <div class="color-swatch bs-purple"></div>
+ <div class="color-swatch bs-purple-light"></div>
+ <div class="color-swatch bs-purple-lighter"></div>
+ <div class="color-swatch bs-gray"></div>
+ </div>
+ </div>
+
+</div>