diff options
| author | Mark Otto <[email protected]> | 2017-05-27 15:26:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-05-27 15:26:48 -0700 |
| commit | 8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910 (patch) | |
| tree | d5a2aba4e2e762b283e7cfe60f00e1f239105bbe /docs/_data | |
| parent | 6c3f833076a9fa68601741e3e21bd07ad79b7d8a (diff) | |
| parent | db44e4b311317ef760f8412cc33c84146959b248 (diff) | |
| download | bootstrap-8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910.tar.xz bootstrap-8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910.zip | |
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/core-team.yml | 4 | ||||
| -rw-r--r-- | docs/_data/nav.yml | 18 | ||||
| -rw-r--r-- | docs/_data/translations.yml | 4 |
3 files changed, 16 insertions, 10 deletions
diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml index 2b3fd9ac6..7528bdc11 100644 --- a/docs/_data/core-team.yml +++ b/docs/_data/core-team.yml @@ -33,3 +33,7 @@ - name: Gleb Mazovetskiy user: glebm gravatar: 729f685b8e8d7e9feed18c177c82e59b + +- name: Johann-S + user: johann-s + gravatar: d90d49733a4fe1aa461e45cb4a4fd9e3 diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index 256e1bb9d..3a335b780 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -8,6 +8,7 @@ - title: Options - title: Build tools - title: Best practices + - title: Webpack - title: Accessibility - title: Layout @@ -15,7 +16,7 @@ - title: Overview - title: Grid - title: Media object - - title: Responsive utilities + - title: Utilities for layout - title: Content pages: @@ -56,21 +57,22 @@ - title: Clearfix - title: Close icon - title: Colors + - title: Display - title: Flexbox - - title: Display property - title: Image replacement - - title: Invisible content + - title: Position - title: Responsive helpers - title: Screenreaders - - title: Sizing and positioning + - title: Sizing - title: Spacing - title: Typography - title: Vertical align + - title: Visibility -# - title: Extend -# pages: -# - title: Approach -# - title: Icon fonts +- title: Extend + pages: + # - title: Approach + - title: Icons - title: About pages: diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml index 951f9756b..52241e3d5 100644 --- a/docs/_data/translations.yml +++ b/docs/_data/translations.yml @@ -1,12 +1,12 @@ - name: Chinese code: zh description: Bootstrap 中文文档 - url: http://v4.bootcss.com/ + url: https://v4.bootcss.com/ - name: Chinese code: zh description: Bootstrap 4 中文文档教程 - url: http://boot4.com/ + url: http://wiki.jikexueyuan.com/project/bootstrap4/ - name: Japanese code: ja |