diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
| commit | c4867cfedb6235708967aa8518c59ffed2816f0b (patch) | |
| tree | c7be6d18ee7c7a61f319bccacc035b9952171db1 /docs/_data | |
| parent | 425d156df27fa6c18e979aa000bfe5a346ee3450 (diff) | |
| parent | 1b194c06607f6cc3d087d25d6d49e1698771f3a1 (diff) | |
| download | bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.tar.xz bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
# Conflicts:
# js/src/dropdown.js
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/nav.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index 256e1bb9d..97e6b1b15 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -60,9 +60,10 @@ - title: Display property - title: Image replacement - title: Invisible content + - title: Position - title: Responsive helpers - title: Screenreaders - - title: Sizing and positioning + - title: Sizing - title: Spacing - title: Typography - title: Vertical align |