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 @@ -
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.
- -Build a more custom page by narrowing the default container and jumbotron.
-Super basic template that includes the navbar along with some additional content.
-Super basic template with a static top navbar along with some additional content.
-Super basic template with a fixed top navbar along with some additional content.
-Create a custom navbar with justified links. Heads up! Not too Safari friendly.
-Attach a footer to the bottom of the viewport when the content is shorter than it.
-Attach a footer to the bottom of the viewport with a fixed navbar at the top.
-Learn how to quickly start a new project with Bootstrap with downloads, basic templates and examples, and more.
+ {% elsif page.url contains "css" %} +Global CSS settings, fundamental HTML elements styled and enhanced with extensible classes, and an advanced grid system.
+ {% elsif page.url contains "examples" %} +Examples.
{% 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 @@ - - -# 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 + +Build a more custom page by narrowing the default container and jumbotron.
+Super basic template that includes the navbar along with some additional content.
+Super basic template with a static top navbar along with some additional content.
+Super basic template with a fixed top navbar along with some additional content.
+Create a custom navbar with justified links. Heads up! Not too Safari friendly.
+Attach a footer to the bottom of the viewport when the content is shorter than it.
+Attach a footer to the bottom of the viewport with a fixed navbar at the top.
+