Merge remote-tracking branch 'refs/remotes/twbs/v4-dev' into v4-dev

6 files changed, 24 insertions, 14 deletions

diff --git a/_data/browser-bugs.yml b/_data/browser-bugs.yml
index d3f133354..9756758dd 100644
--- a/_data/browser-bugs.yml
+++ b/_data/browser-bugs.yml
@@ -204,7 +204,7 @@
   summary: >
     `table-cell` borders not overlapping despite `margin-right: -1px`
   upstream_bug: >
-    Chromium#568691
+    Chromium#749848
   origin: >
     Bootstrap#17438, Bootstrap#14237
 
diff --git a/_data/browser-features.yml b/_data/browser-features.yml
index f19a460e6..acdc532b2 100644
--- a/_data/browser-features.yml
+++ b/_data/browser-features.yml
@@ -52,7 +52,7 @@
   browser: >
     Edge
   summary: >
-    Implement the [`of <selector-list>` clause](http://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class
+    Implement the [`of <selector-list>` clause](https://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class
   upstream_bug: >
     UserVoice#15944476
   origin: >
@@ -62,7 +62,7 @@
   browser: >
     Firefox
   summary: >
-    Implement the [`of <selector-list>` clause](http://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class
+    Implement the [`of <selector-list>` clause](https://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class
   upstream_bug: >
     Mozilla#854148
   origin: >
@@ -102,7 +102,7 @@
   browser: >
     Chrome
   summary: >
-    Implement the [`of <selector-list>` clause](http://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class
+    Implement the [`of <selector-list>` clause](https://caniuse.com/#feat=css-nth-child-of) of the `:nth-child()` pseudo-class
   upstream_bug: >
     Chromium#304163
   origin: >
diff --git a/_data/core-team.yml b/_data/core-team.yml
index 7528bdc11..644320b64 100644
--- a/_data/core-team.yml
+++ b/_data/core-team.yml
@@ -37,3 +37,8 @@
 - name: Johann-S
   user: johann-s
   gravatar: d90d49733a4fe1aa461e45cb4a4fd9e3
+
+
+- name: Andres Galante
+  user: andresgalante
+  gravatar: 03dc4f2e26e476958c952505c8d8f563
diff --git a/_data/nav.yml b/_data/nav.yml
index 1ce74e782..96eeba2b5 100644
--- a/_data/nav.yml
+++ b/_data/nav.yml
@@ -5,7 +5,7 @@
     - title: Contents
     - title: Browsers & devices
     - title: JavaScript
-    - title: Options
+    - title: Theming
     - title: Build tools
     # - title: Best practices # TODO: Write this content
     - title: Webpack
@@ -75,12 +75,12 @@
     # - title: Approach
     - title: Icons
 
-# - title: About
-#   pages:
-#     - title: History
-#     - title: Team
-#     - title: Brand
-#     - title: License
-#     - title: Translations
-
 - title: Migration
+
+- title: About
+  pages:
+    - title: History
+    - title: Team
+    - title: Brand
+    - title: License
+    - title: Translations
diff --git a/_data/showcase.yml b/_data/showcase.yml
index 435286f39..2643e1ed0 100644
--- a/_data/showcase.yml
+++ b/_data/showcase.yml
@@ -9,7 +9,7 @@
   img: vogue
 
 - name: Riot Design
-  url: http://riotdesign.eu/en/
+  url: https://riot.design/en/
   expo_url: https://expo.getbootstrap.com/2014/03/13/riot-design/
   img: riot
 
diff --git a/_data/translations.yml b/_data/translations.yml
index 1594865b0..3681ddf56 100644
--- a/_data/translations.yml
+++ b/_data/translations.yml
@@ -1,3 +1,8 @@
+- name: 中文(繁體)
+  code: zh-tw
+  description: Bootstrap 4 繁體中文手冊
+  url: http://bootstrap.hexschool.com/
+
 - name: Chinese
   code: zh
   description: Bootstrap 4 中文文档教程