From e8bd019a19a82b2796b77101cb43892138f4935e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 10 Jul 2014 20:02:47 -0700
Subject: [PATCH] move all css files over to components dir
---
docs/_data/nav.yml | 3 +-
docs/_includes/getting-started/examples.html | 159 -----------------
docs/_layouts/default.html | 5 +
docs/{_includes/css => components}/buttons.md | 0
docs/{_includes/css => components}/code.md | 0
.../css/forms.html => components/forms.md} | 0
docs/{_includes/css => components}/grid.md | 0
docs/{_includes/css => components}/helpers.md | 0
docs/{_includes/css => components}/images.md | 0
.../responsive-utilities.md} | 0
.../overview.md => components/scaffolding.md} | 7 +-
.../{_includes/css => components}/tables.html | 0
docs/{_includes/css => components}/type.md | 0
docs/css.html | 24 ---
docs/getting-started.html | 1 -
docs/getting-started/examples.md | 163 ++++++++++++++++++
16 files changed, 173 insertions(+), 189 deletions(-)
delete mode 100644 docs/_includes/getting-started/examples.html
rename docs/{_includes/css => components}/buttons.md (100%)
rename docs/{_includes/css => components}/code.md (100%)
rename docs/{_includes/css/forms.html => components/forms.md} (100%)
rename docs/{_includes/css => components}/grid.md (100%)
rename docs/{_includes/css => components}/helpers.md (100%)
rename docs/{_includes/css => components}/images.md (100%)
rename docs/{_includes/css/responsive-utilities.html => components/responsive-utilities.md} (100%)
rename docs/{_includes/css/overview.md => components/scaffolding.md} (98%)
rename docs/{_includes/css => components}/tables.html (100%)
rename docs/{_includes/css => components}/type.md (100%)
delete mode 100644 docs/css.html
create mode 100644 docs/getting-started/examples.md
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index db11c2836f..d9b11ef61b 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -8,6 +8,7 @@
- title: Bower
- title: npm
- title: Contents
+ - title: Examples
- title: Compiling
- title: Browser and device support
- title: Third aprty support
@@ -15,8 +16,6 @@
- title: License FAQs
- title: Translations
-- title: Examples
-
- title: Components
pages:
- title: Scaffolding
diff --git a/docs/_includes/getting-started/examples.html b/docs/_includes/getting-started/examples.html
deleted file mode 100644
index 2436bb0627..0000000000
--- a/docs/_includes/getting-started/examples.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<div class="bs-docs-section">
- <h1 id="examples" class="page-header">Examples</h1>
-
- <p class="lead">Build on the basic template above with Bootstrap's many components. We encourage you to customize and adapt Bootstrap to suit your individual project's needs.</p>
-
- <h3 id="examples-framework">Using the framework</h3>
- <div class="row bs-examples">
- <div class="col-xs-6 col-md-4">
- <a href="../examples/starter-template/">
- <img class="img-thumbnail" src="../examples/screenshots/starter-template.jpg" alt="">
- </a>
- <h4>Starter template</h4>
- <p>Nothing but the basics: compiled CSS and JavaScript.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/theme/">
- <img class="img-thumbnail" src="../examples/screenshots/theme.jpg" alt="">
- </a>
- <h4>Bootstrap theme</h4>
- <p>Load the optional Bootstrap theme for a visually enhanced experience.</p>
- </div>
- <div class="clearfix visible-xs-block"></div>
-
- <div class="col-xs-6 col-md-4">
- <a href="../examples/grid/">
- <img class="img-thumbnail" src="../examples/screenshots/grid.jpg" alt="">
- </a>
- <h4>Grids</h4>
- <p>Multiple examples of grid layouts with all four tiers, nesting, and more.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/jumbotron/">
- <img class="img-thumbnail" src="../examples/screenshots/jumbotron.jpg" alt="">
- </a>
- <h4>Jumbotron</h4>
- <p>Build around the jumbotron with a navbar and some basic grid columns.</p>
- </div>
- <div class="clearfix visible-xs-block"></div>
-
- <div class="col-xs-6 col-md-4">
- <a href="../examples/jumbotron-narrow/">
- <img class="img-thumbnail" src="../examples/screenshots/jumbotron-narrow.jpg" alt="">
- </a>
- <h4>Narrow jumbotron</h4>
- <p>Build a more custom page by narrowing the default container and jumbotron.</p>
- </div>
- </div>
-
- <h3 id="examples-navbars">Navbars in action</h3>
- <div class="row bs-examples">
- <div class="col-xs-6 col-md-4">
- <a href="../examples/navbar/">
- <img class="img-thumbnail" src="../examples/screenshots/navbar.jpg" alt="">
- </a>
- <h4>Navbar</h4>
- <p>Super basic template that includes the navbar along with some additional content.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/navbar-static-top/">
- <img class="img-thumbnail" src="../examples/screenshots/navbar-static.jpg" alt="">
- </a>
- <h4>Static top navbar</h4>
- <p>Super basic template with a static top navbar along with some additional content.</p>
- </div>
- <div class="clearfix visible-xs-block"></div>
-
- <div class="col-xs-6 col-md-4">
- <a href="../examples/navbar-fixed-top/">
- <img class="img-thumbnail" src="../examples/screenshots/navbar-fixed.jpg" alt="">
- </a>
- <h4>Fixed navbar</h4>
- <p>Super basic template with a fixed top navbar along with some additional content.</p>
- </div>
- </div>
-
- <h3 id="examples-custom">Custom components</h3>
- <div class="row bs-examples">
- <div class="col-xs-6 col-md-4">
- <a href="../examples/cover/">
- <img class="img-thumbnail" src="../examples/screenshots/cover.jpg" alt="">
- </a>
- <h4>Cover</h4>
- <p>A one-page template for building simple and beautiful home pages.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/carousel/">
- <img class="img-thumbnail" src="../examples/screenshots/carousel.jpg" alt="">
- </a>
- <h4>Carousel</h4>
- <p>Customize the navbar and carousel, then add some new components.</p>
- </div>
- <div class="clearfix visible-xs-block"></div>
-
- <div class="col-xs-6 col-md-4">
- <a href="../examples/blog/">
- <img class="img-thumbnail" src="../examples/screenshots/blog.jpg" alt="">
- </a>
- <h4>Blog</h4>
- <p>Simple two-column blog layout with custom navigation, header, and type.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/dashboard/">
- <img class="img-thumbnail" src="../examples/screenshots/dashboard.jpg" alt="">
- </a>
- <h4>Dashboard</h4>
- <p>Basic structure for a admin dashboard with fixed sidebar and navbar.</p>
- </div>
- <div class="clearfix visible-xs-block"></div>
-
- <div class="col-xs-6 col-md-4">
- <a href="../examples/signin/">
- <img class="img-thumbnail" src="../examples/screenshots/sign-in.jpg" alt="">
- </a>
- <h4>Sign-in page</h4>
- <p>Custom form layout and design for a simple sign in form.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/justified-nav/">
- <img class="img-thumbnail" src="../examples/screenshots/justified-nav.jpg" alt="">
- </a>
- <h4>Justified nav</h4>
- <p>Create a custom navbar with justified links. Heads up! <a href="../components/#nav-justified">Not too Safari friendly.</a></p>
- </div>
- <div class="clearfix visible-xs-block"></div>
-
- <div class="col-xs-6 col-md-4">
- <a href="../examples/sticky-footer/">
- <img class="img-thumbnail" src="../examples/screenshots/sticky-footer.jpg" alt="">
- </a>
- <h4>Sticky footer</h4>
- <p>Attach a footer to the bottom of the viewport when the content is shorter than it.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/sticky-footer-navbar/">
- <img class="img-thumbnail" src="../examples/screenshots/sticky-footer-navbar.jpg" alt="">
- </a>
- <h4>Sticky footer with navbar</h4>
- <p>Attach a footer to the bottom of the viewport with a fixed navbar at the top.</p>
- </div>
- </div>
-
- <h3 id="examples-experiments">Experiments</h3>
- <div class="row bs-examples">
- <div class="col-xs-6 col-md-4">
- <a href="../examples/non-responsive/">
- <img class="img-thumbnail" src="../examples/screenshots/non-responsive.jpg" alt="">
- </a>
- <h4>Non-responsive Bootstrap</h4>
- <p>Easily disable the responsiveness of Bootstrap <a href="#disable-responsive">per our docs</a>.</p>
- </div>
- <div class="col-xs-6 col-md-4">
- <a href="../examples/offcanvas/">
- <img class="img-thumbnail" src="../examples/screenshots/offcanvas.jpg" alt="">
- </a>
- <h4>Offcanvas</h4>
- <p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p>
- </div>
- </div>
-</div>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index da91a91452..ebbaf0e645 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -14,6 +14,11 @@
{% if page.url contains "getting-started" %}
<h1>Getting started</h1>
<p class="lead">Learn how to quickly start a new project with Bootstrap with downloads, basic templates and examples, and more.</p>
+ {% elsif page.url contains "css" %}
+ <p class="lead">Global CSS settings, fundamental HTML elements styled and enhanced with extensible classes, and an advanced grid system.</p>
+ {% elsif page.url contains "examples" %}
+ <h1>Examples</h1>
+ <p class="lead">Examples.</p>
{% endif %}
{% include ads.html %}
diff --git a/docs/_includes/css/buttons.md b/docs/components/buttons.md
similarity index 100%
rename from docs/_includes/css/buttons.md
rename to docs/components/buttons.md
diff --git a/docs/_includes/css/code.md b/docs/components/code.md
similarity index 100%
rename from docs/_includes/css/code.md
rename to docs/components/code.md
diff --git a/docs/_includes/css/forms.html b/docs/components/forms.md
similarity index 100%
rename from docs/_includes/css/forms.html
rename to docs/components/forms.md
diff --git a/docs/_includes/css/grid.md b/docs/components/grid.md
similarity index 100%
rename from docs/_includes/css/grid.md
rename to docs/components/grid.md
diff --git a/docs/_includes/css/helpers.md b/docs/components/helpers.md
similarity index 100%
rename from docs/_includes/css/helpers.md
rename to docs/components/helpers.md
diff --git a/docs/_includes/css/images.md b/docs/components/images.md
similarity index 100%
rename from docs/_includes/css/images.md
rename to docs/components/images.md
diff --git a/docs/_includes/css/responsive-utilities.html b/docs/components/responsive-utilities.md
similarity index 100%
rename from docs/_includes/css/responsive-utilities.html
rename to docs/components/responsive-utilities.md
diff --git a/docs/_includes/css/overview.md b/docs/components/scaffolding.md
similarity index 98%
rename from docs/_includes/css/overview.md
rename to docs/components/scaffolding.md
index 552ac2a0bc..d819e2e0ad 100644
--- a/docs/_includes/css/overview.md
+++ b/docs/components/scaffolding.md
@@ -1,6 +1,7 @@
-<a id="overview"></a>
-
-# Overview
+---
+layout: page
+title: Scaffolding
+---
Get the lowdown on the key pieces of Bootstrap's infrastructure, including our approach to better, faster, stronger web development.
diff --git a/docs/_includes/css/tables.html b/docs/components/tables.html
similarity index 100%
rename from docs/_includes/css/tables.html
rename to docs/components/tables.html
diff --git a/docs/_includes/css/type.md b/docs/components/type.md
similarity index 100%
rename from docs/_includes/css/type.md
rename to docs/components/type.md
diff --git a/docs/css.html b/docs/css.html
deleted file mode 100644
index caf77cc52b..0000000000
--- a/docs/css.html
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: default
-title: CSS
-slug: css
-lead: "Global CSS settings, fundamental HTML elements styled and enhanced with extensible classes, and an advanced grid system."
----
-
-{% markdown %}
- {% include css/overview.md %}
- {% include css/grid.md %}
- {% include css/type.md %}
- {% include css/code.md %}
-{% endmarkdown %}
-
-{% include css/tables.html %}
-{% include css/forms.html %}
-
-{% markdown %}
- {% include css/buttons.md %}
- {% include css/images.md %}
- {% include css/helpers.md %}
-{% endmarkdown %}
-
-{% include css/responsive-utilities.html %}
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 19b81c8466..53d5ac3f01 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -9,7 +9,6 @@ lead: "Learn how to quickly start a new project with Bootstrap with downloads, b
{% endmarkdown %}
{% include getting-started/template.html %}
-{% include getting-started/examples.html %}
{% include getting-started/community.html %}
{% include getting-started/disabling-responsiveness.html %}
{% include getting-started/browser-device-support.html %}
diff --git a/docs/getting-started/examples.md b/docs/getting-started/examples.md
new file mode 100644
index 0000000000..c21348b03c
--- /dev/null
+++ b/docs/getting-started/examples.md
@@ -0,0 +1,163 @@
+---
+layout: page
+title: Examples
+---
+
+Build on the basic template above with Bootstrap's many components. We encourage you to customize and adapt Bootstrap to suit your individual project's needs.
+
+### Framework
+
+<div class="row bs-examples">
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/starter-template/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/starter-template.jpg" alt="">
+ </a>
+ <h4>Starter template</h4>
+ <p>Nothing but the basics: compiled CSS and JavaScript.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/theme/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/theme.jpg" alt="">
+ </a>
+ <h4>Bootstrap theme</h4>
+ <p>Load the optional Bootstrap theme for a visually enhanced experience.</p>
+ </div>
+ <div class="clearfix visible-xs-block"></div>
+
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/grid/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/grid.jpg" alt="">
+ </a>
+ <h4>Grids</h4>
+ <p>Multiple examples of grid layouts with all four tiers, nesting, and more.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/jumbotron/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/jumbotron.jpg" alt="">
+ </a>
+ <h4>Jumbotron</h4>
+ <p>Build around the jumbotron with a navbar and some basic grid columns.</p>
+ </div>
+ <div class="clearfix visible-xs-block"></div>
+
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/jumbotron-narrow/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/jumbotron-narrow.jpg" alt="">
+ </a>
+ <h4>Narrow jumbotron</h4>
+ <p>Build a more custom page by narrowing the default container and jumbotron.</p>
+ </div>
+</div>
+
+### Navbars
+
+<div class="row bs-examples">
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/navbar/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/navbar.jpg" alt="">
+ </a>
+ <h4>Navbar</h4>
+ <p>Super basic template that includes the navbar along with some additional content.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/navbar-static-top/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/navbar-static.jpg" alt="">
+ </a>
+ <h4>Static top navbar</h4>
+ <p>Super basic template with a static top navbar along with some additional content.</p>
+ </div>
+ <div class="clearfix visible-xs-block"></div>
+
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/navbar-fixed-top/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/navbar-fixed.jpg" alt="">
+ </a>
+ <h4>Fixed navbar</h4>
+ <p>Super basic template with a fixed top navbar along with some additional content.</p>
+ </div>
+</div>
+
+<h3 id="examples-custom">Custom components</h3>
+<div class="row bs-examples">
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/cover/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/cover.jpg" alt="">
+ </a>
+ <h4>Cover</h4>
+ <p>A one-page template for building simple and beautiful home pages.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/carousel/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/carousel.jpg" alt="">
+ </a>
+ <h4>Carousel</h4>
+ <p>Customize the navbar and carousel, then add some new components.</p>
+ </div>
+ <div class="clearfix visible-xs-block"></div>
+
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/blog/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/blog.jpg" alt="">
+ </a>
+ <h4>Blog</h4>
+ <p>Simple two-column blog layout with custom navigation, header, and type.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/dashboard/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/dashboard.jpg" alt="">
+ </a>
+ <h4>Dashboard</h4>
+ <p>Basic structure for a admin dashboard with fixed sidebar and navbar.</p>
+ </div>
+ <div class="clearfix visible-xs-block"></div>
+
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/signin/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/sign-in.jpg" alt="">
+ </a>
+ <h4>Sign-in page</h4>
+ <p>Custom form layout and design for a simple sign in form.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/justified-nav/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/justified-nav.jpg" alt="">
+ </a>
+ <h4>Justified nav</h4>
+ <p>Create a custom navbar with justified links. Heads up! <a href="{{ site.baseurl }}components/#nav-justified">Not too Safari friendly.</a></p>
+ </div>
+ <div class="clearfix visible-xs-block"></div>
+
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/sticky-footer/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/sticky-footer.jpg" alt="">
+ </a>
+ <h4>Sticky footer</h4>
+ <p>Attach a footer to the bottom of the viewport when the content is shorter than it.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/sticky-footer-navbar/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/sticky-footer-navbar.jpg" alt="">
+ </a>
+ <h4>Sticky footer with navbar</h4>
+ <p>Attach a footer to the bottom of the viewport with a fixed navbar at the top.</p>
+ </div>
+</div>
+
+### Experiments
+
+<div class="row bs-examples">
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/non-responsive/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/non-responsive.jpg" alt="">
+ </a>
+ <h4>Non-responsive Bootstrap</h4>
+ <p>Easily disable the responsiveness of Bootstrap <a href="#disable-responsive">per our docs</a>.</p>
+ </div>
+ <div class="col-xs-6 col-md-4">
+ <a href="{{ site.baseurl }}examples/offcanvas/">
+ <img class="img-thumbnail" src="{{ site.baseurl }}examples/screenshots/offcanvas.jpg" alt="">
+ </a>
+ <h4>Offcanvas</h4>
+ <p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p>
+ </div>
+</div>
--
GitLab