Skip to content

Commit 3e76d65

Browse files
committed
Rearrange all the docs to allow for a docs/major.minor/ setup
1 parent 32153eb commit 3e76d65

File tree

231 files changed

+40
-15412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+40
-15412
lines changed

_config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ kramdown:
99
permalink: pretty
1010

1111
# Server
12-
source: docs
1312
destination: _gh_pages
1413
host: 0.0.0.0
1514
port: 9001
1615
baseurl: ""
17-
url: https://v4-alpha.getbootstrap.com
16+
url: https://getbootstrap.com
1817
encoding: UTF-8
19-
exclude: [assets/scss/]
18+
exclude: [.git, .github, assets/scss/, build, js, node_modules, nuget, scss]
2019

2120
gems:
2221
- jekyll-redirect-from
@@ -33,6 +32,7 @@ social_image_path: /assets/brand/bootstrap-social.png
3332

3433
# Custom vars
3534
current_version: 4.0.0-alpha.6
35+
docs_version: 4.0
3636
repo: https://github.com/twbs/bootstrap
3737
slack: https://bootstrap-slack.herokuapp.com
3838

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/_data/nav.yml _data/nav.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@
7474
# - title: Approach
7575
- title: Icons
7676

77-
- title: About
78-
pages:
79-
- title: History
80-
- title: Team
81-
- title: Brand
82-
- title: License
83-
- title: Translations
77+
# - title: About
78+
# pages:
79+
# - title: History
80+
# - title: Team
81+
# - title: Brand
82+
# - title: License
83+
# - title: Translations
8484

8585
- title: Migration
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/_includes/nav-docs.html _includes/nav-docs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{% endif %}
1919

2020
<div class="bd-toc-item {{ active }}">
21-
<a class="bd-toc-link" href="{{ site.baseurl }}/{{ group_slug }}/{{ link_slug }}{% if link_slug %}/{% endif %}">
21+
<a class="bd-toc-link" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ link_slug }}{% if link_slug %}/{% endif %}">
2222
{{ group.title }}
2323
</a>
2424

@@ -32,7 +32,7 @@
3232
{% endif %}
3333

3434
<li class="{{ active }}">
35-
<a href="{{ site.baseurl }}/{{ group_slug }}/{{ doc_slug }}/">
35+
<a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ doc_slug }}/">
3636
{{ doc.title }}
3737
</a>
3838

docs/_includes/nav-home.html _includes/nav-home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<a class="nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Home</a>
1010
</li>
1111
<li class="nav-item">
12-
<a class="nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
12+
<a class="nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
1313
</li>
1414
<li class="nav-item">
1515
<a class="nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/about/brand.md about/brand.md

docs/about/team.md about/team.md

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

assets/css/docs.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/docs.min.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/assets/scss/docs.scss assets/scss/docs.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
// Happy Bootstrapping!
2525

2626
// Load Bootstrap variables and mixins
27-
@import "../../../scss/variables";
28-
@import "../../../scss/mixins";
27+
@import "../../scss/variables";
28+
@import "../../scss/mixins";
2929

3030
// Load docs components
3131
@import "variables";

docs/.htmlhintrc build/.htmlhintrc

File renamed without changes.

docs/.htmllintrc build/.htmllintrc

File renamed without changes.

dist/css/bootstrap.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/getting-started/introduction.md docs/4.0/getting-started/introduction.md

+4-1

docs/assets/css/docs.min.css

-7
This file was deleted.

0 commit comments

Comments
 (0)