aboutsummaryrefslogtreecommitdiff
path: root/site/_includes
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2018-12-17 00:20:56 +0200
committerGitHub <[email protected]>2018-12-17 00:20:56 +0200
commit901761a34bb666c7f96981461631a3153c004ab5 (patch)
tree161121bf75bdc7a45c09bdbe289041cb929f17fe /site/_includes
parentf50f6e03551ae9f9477f4ebdfe934c7452d6c6ad (diff)
parent1960a528893b0b6a0587a9a888ddd51f149d49f1 (diff)
downloadbootstrap-901761a34bb666c7f96981461631a3153c004ab5.tar.xz
bootstrap-901761a34bb666c7f96981461631a3153c004ab5.zip
Merge branch 'v4-dev' into table-dark-colors
Diffstat (limited to 'site/_includes')
-rw-r--r--site/_includes/docs-navbar.html1
-rw-r--r--site/_includes/header.html2
2 files changed, 2 insertions, 1 deletions
diff --git a/site/_includes/docs-navbar.html b/site/_includes/docs-navbar.html
index a6154a8b3..01c7ec355 100644
--- a/site/_includes/docs-navbar.html
+++ b/site/_includes/docs-navbar.html
@@ -36,6 +36,7 @@
<a class="dropdown-item" href="https://getbootstrap.com/docs/4.0/">v4.0.0</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="https://v4-alpha.getbootstrap.com/">v4 Alpha 6</a>
+ <a class="dropdown-item" href="https://getbootstrap.com/docs/3.4/">v3.4.0</a>
<a class="dropdown-item" href="https://getbootstrap.com/docs/3.3/">v3.3.7</a>
<a class="dropdown-item" href="https://getbootstrap.com/2.3.2/">v2.3.2</a>
<div class="dropdown-divider"></div>
diff --git a/site/_includes/header.html b/site/_includes/header.html
index d7393d60a..83d051fa8 100644
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -1,5 +1,5 @@
<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="{{ page.description | default: site.description | smartify }}">
<meta name="author" content="{{ site.authors }}">
<meta name="generator" content="Jekyll v{{ jekyll.version }}">