Merge branch 'v4-dev' into btn_input_split_variables

5 files changed, 27 insertions, 43 deletions

diff --git a/_includes/docs-navbar.html b/_includes/docs-navbar.html
index ecedf7c4d..4f3e68738 100644
--- a/_includes/docs-navbar.html
+++ b/_includes/docs-navbar.html
@@ -37,7 +37,7 @@
       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions">
         <a class="dropdown-item active" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/">Latest (4.x)</a>
         <a class="dropdown-item" href="https://v4-alpha.getbootstrap.com/">v4 Alpha 6</a>
-        <a class="dropdown-item" href="https://getbootstrap.com/3.3/">v3.3.7</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>
     </li>
diff --git a/_includes/docs-sidebar.html b/_includes/docs-sidebar.html
index 24c1a8b2a..34a5989a4 100644
--- a/_includes/docs-sidebar.html
+++ b/_includes/docs-sidebar.html
@@ -36,7 +36,7 @@
               {{ doc.title }}
             </a>
 
-            {% comment %}
+            {%- comment -%}
             {% unless doc.sections == nil %}
               <ul class="nav">
                 {% for section in doc.sections %}
@@ -48,7 +48,7 @@
                 {% endfor %}
               </ul>
             {% endunless %}
-            {% endcomment %}
+            {%- endcomment -%}
           </li>
         {%- endfor -%}
       </ul>
diff --git a/_includes/header.html b/_includes/header.html
index 048867bdd..50606564d 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,20 +1,22 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<meta name="description" content="{{ page.description | default: site.description }}">
+<meta name="author" content="{{ site.authors }}">
 <meta name="generator" content="Jekyll v{{ jekyll.version }}">
 
 <title>
   {%- if page.title -%}
-    {{ page.title }} &middot; {{ site.title }}
+    {{ page.title }} · {{ site.title }}
   {%- else -%}
-    {{ site.title }} &middot; {{ site.description }}
+    {{ site.title }} · {{ site.description }}
   {%- endif -%}
 </title>
 
 <!-- Bootstrap core CSS -->
 {% if site.github %}
-  <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
 {% else %}
-  <link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
 {% endif %}
 
 <!-- Documentation extras -->
diff --git a/_includes/scripts.html b/_includes/scripts.html
index 0af5f5c69..98ba3b41f 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -3,25 +3,25 @@
 
 <script src="{{ site.baseurl }}/assets/js/vendor/popper.min.js"></script>
 
-{% if site.github %}
+{%- if site.github -%}
   <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
-{% else %}
+{%- else -%}
   <script src="{{ site.baseurl }}/dist/js/bootstrap.js"></script>
-{% endif %}
+{%- endif -%}
 
-{% if site.github %}
+{%- if site.github -%}
   <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
-{% else %}
+{%- else -%}
   <script src="{{ site.baseurl }}/assets/js/vendor/anchor.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
   <script src="{{ site.baseurl }}/assets/js/src/pwa.js"></script>
-{% endif %}
+{%- endif -%}
 
 <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
 
-{% if page.layout == "docs" %}
+{%- if page.layout == "docs" -%}
 <script src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
 <script>
   docsearch({
@@ -43,7 +43,7 @@
     debug: false // Set debug to true if you want to inspect the dropdown
   });
 </script>
-{% endif %}
+{%- endif -%}
 
 <script>
   Holder.addTheme('gray', {
diff --git a/_includes/social.html b/_includes/social.html
index 977142b19..68be4d6e9 100644
--- a/_includes/social.html
+++ b/_includes/social.html
@@ -1,36 +1,18 @@
-<!-- Meta -->
-<meta name="description" content="{{ site.description }}">
-<meta name="author" content="{{ site.authors }}">
-
 <!-- Twitter -->
+<meta name="twitter:card" content="{% if page.title %}summary{% else %}summary_large_image{% endif %}">
 <meta name="twitter:site" content="@{{ site.twitter }}">
 <meta name="twitter:creator" content="@{{ site.twitter }}">
-
-{% if page.title %}
-  <meta name="twitter:card" content="summary">
-  <meta name="twitter:title" content="{{ page.title }}">
-  <meta name="twitter:description" content="{{ page.description }}">
-  <meta name="twitter:image" content="{{ site.url }}{{ site.social_logo_path }}">
-{% else %}
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:title" content="{{ site.title }}">
-  <meta name="twitter:description" content="{{ site.description }}">
-  <meta name="twitter:image" content="{{ site.url }}{{ site.social_image_path }}">
-{% endif %}
+<meta name="twitter:title" content="{{ page.title | default: site.title }}">
+<meta name="twitter:description" content="{{ page.description | default: site.description }}">
+<meta name="twitter:image" content="{% if page.title %}{{ site.url | append: site.social_logo_path }}{% else %}{{ site.url | append: site.social_image_path }}{% endif %}">
 
 <!-- Facebook -->
-{% if page.title %}
-  <meta property="og:url" content="{{ site.url }}{{ page.url }}">
-  <meta property="og:title" content="{{ page.title }}">
-  <meta property="og:description" content="{{ page.description }}">
-  <meta property="og:type" content="website">
-{% else %}
-  <meta property="og:url" content="{{ site.url }}">
-  <meta property="og:title" content="{{ site.title }}">
-  <meta property="og:description" content="{{ site.description }}">
-{% endif %}
-<meta property="og:image" content="{{ site.url | replace: 'https://', 'http://' }}{{ site.social_image_path }}">
-<meta property="og:image:secure_url" content="{{ site.url }}{{ site.social_image_path }}">
+<meta property="og:url" content="{{ site.url | append: page.url }}">
+<meta property="og:title" content="{{ page.title | default: site.title }}">
+<meta property="og:description" content="{{ page.description | default: site.description }}">
+<meta property="og:type" content="website">
+<meta property="og:image" content="{{ site.url | replace: 'https://', 'http://' | append: site.social_image_path }}">
+<meta property="og:image:secure_url" content="{{ site.url | append: site.social_image_path }}">
 <meta property="og:image:type" content="image/png">
 <meta property="og:image:width" content="1200">
 <meta property="og:image:height" content="630">