aboutsummaryrefslogtreecommitdiff
path: root/docs/_data
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-09 15:04:32 -0700
committerMark Otto <[email protected]>2016-10-09 15:04:32 -0700
commit7dee5560a10785100996fb6affe644163b2db44e (patch)
treefc2e60e698bdc2421d7d17d604044bb700da57e6 /docs/_data
parent1db3586dc0798485d5ca82a9b8de477e82ba351c (diff)
parent8d162553fa7fe499a72569d42debed18dfc5791b (diff)
downloadbootstrap-7dee5560a10785100996fb6affe644163b2db44e.tar.xz
bootstrap-7dee5560a10785100996fb6affe644163b2db44e.zip
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/_data')
-rw-r--r--docs/_data/nav.yml2
-rw-r--r--docs/_data/showcase.yml8
-rw-r--r--docs/_data/translations.yml2
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index 835caabd7..9e3e55367 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -51,10 +51,10 @@
- title: Scrollspy
- title: Tag
- title: Tooltips
- - title: Utilities
- title: Utilities
pages:
+ - title: Borders
- title: Clearfix
- title: Close icon
- title: Colors
diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml
index 45e9b0ccc..435286f39 100644
--- a/docs/_data/showcase.yml
+++ b/docs/_data/showcase.yml
@@ -1,19 +1,19 @@
- name: Lyft
url: https://www.lyft.com
- expo_url: http://expo.getbootstrap.com/2014/10/29/lyft/
+ expo_url: https://expo.getbootstrap.com/2014/10/29/lyft/
img: lyft
- name: Vogue
url: http://www.vogue.com
- expo_url: http://expo.getbootstrap.com/2014/09/30/vogue/
+ expo_url: https://expo.getbootstrap.com/2014/09/30/vogue/
img: vogue
- name: Riot Design
url: http://riotdesign.eu/en/
- expo_url: http://expo.getbootstrap.com/2014/03/13/riot-design/
+ expo_url: https://expo.getbootstrap.com/2014/03/13/riot-design/
img: riot
- name: Newsweek
url: http://www.newsweek.com/
- expo_url: http://expo.getbootstrap.com/2014/02/12/newsweek/
+ expo_url: https://expo.getbootstrap.com/2014/02/12/newsweek/
img: newsweek
diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml
index de7ba990b..951f9756b 100644
--- a/docs/_data/translations.yml
+++ b/docs/_data/translations.yml
@@ -16,4 +16,4 @@
- name: Brazilian Portuguese
code: pt-BR
description: Bootstrap 4 Português do Brasil
- url: http://bootstrapbrasil.github.io/v4/
+ url: https://bootstrapbrasil.github.io/v4/