diff options
| author | Gijs Boddeus <[email protected]> | 2017-10-04 08:46:03 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-04 08:46:03 +0200 |
| commit | 263190305e1208b183611fe511ea8f983932a00d (patch) | |
| tree | 8cc874b98d5d9e7d9db66b078d94e5dc1db2c4e8 /_data | |
| parent | cc092272eefa0e89bebfc716c8df8214d2804c77 (diff) | |
| parent | 682ad1fff58fb6586dceaf31d490aaa522110e59 (diff) | |
| download | bootstrap-263190305e1208b183611fe511ea8f983932a00d.tar.xz bootstrap-263190305e1208b183611fe511ea8f983932a00d.zip | |
Merge branch 'v4-dev' into yiq-function-update
Diffstat (limited to '_data')
| -rw-r--r-- | _data/browser-features.yml | 6 | ||||
| -rw-r--r-- | _data/core-team.yml | 5 | ||||
| -rw-r--r-- | _data/nav.yml | 2 | ||||
| -rw-r--r-- | _data/showcase.yml | 2 |
4 files changed, 10 insertions, 5 deletions
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 784ec9a73..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 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 |