diff options
| author | Mark Otto <[email protected]> | 2017-03-07 20:44:42 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-03-07 20:44:42 -0800 |
| commit | 7e07d5bf2e5ed22d3997bacf8395ef6d0f0b99d1 (patch) | |
| tree | 6e96a5b4e21aa1d49643b5a3abb960c767b4f63f /docs/_data | |
| parent | 07f63324d1f9447641d6d932872cea05aff5107f (diff) | |
| parent | 95f37e4c402df37db16781995ffa1592032df9c8 (diff) | |
| download | bootstrap-7e07d5bf2e5ed22d3997bacf8395ef6d0f0b99d1.tar.xz bootstrap-7e07d5bf2e5ed22d3997bacf8395ef6d0f0b99d1.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/nav.yml | 6 | ||||
| -rw-r--r-- | docs/_data/translations.yml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index ff46ae70d..cf3bd929e 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -15,7 +15,7 @@ - title: Overview - title: Grid - title: Media object - - title: Responsive utilities + - title: Utilities for layout - title: Content pages: @@ -56,10 +56,9 @@ - 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 @@ -67,6 +66,7 @@ - title: Spacing - title: Typography - title: Vertical align + - title: Visibility - title: Extend pages: diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml index c9a4abd00..52241e3d5 100644 --- a/docs/_data/translations.yml +++ b/docs/_data/translations.yml @@ -1,7 +1,7 @@ - name: Chinese code: zh description: Bootstrap 中文文档 - url: http://v4.bootcss.com/ + url: https://v4.bootcss.com/ - name: Chinese code: zh |