aboutsummaryrefslogtreecommitdiff
path: root/docs/_data
diff options
context:
space:
mode:
authorPierre-Denis Vanduynslager <[email protected]>2017-03-18 22:08:55 -0400
committerPierre-Denis Vanduynslager <[email protected]>2017-03-18 22:08:55 -0400
commitf5cc59145642d78d7abbdf38fee1905786da5367 (patch)
tree94e9454a55f9a55353a0ade4bebb7935d03e7da1 /docs/_data
parent4ab576a41941b720e2f6fa77724203f66a1d3a17 (diff)
parent192a8af0dfcdb5d64a5f273b804011bdcd5d2436 (diff)
downloadbootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.tar.xz
bootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.zip
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'docs/_data')
-rw-r--r--docs/_data/nav.yml8
-rw-r--r--docs/_data/translations.yml2
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index 97e6b1b15..ff46ae70d 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -68,10 +68,10 @@
- title: Typography
- title: Vertical align
-# - 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 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