Merge from twbs/v4-dev

merge official dev into fork
gijsbotje · Oct 25, 2017 · c781789 · c781789
2 parents 1db943c + 9611089
commit c781789
Show file tree

Hide file tree

Showing 124 changed files with 1,529 additions and 1,262 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'jekyll', '~> 3.6.0'
+  gem 'jekyll', '~> 3.6.2'
   gem 'jekyll-redirect-from', '~> 0.12.1'
   gem 'jekyll-sitemap', '~> 1.1.1'
-  gem 'jekyll-toc', '~> 0.4.0.rc2'
+  gem 'jekyll-toc', '~> 0.4.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,7 +7,7 @@ GEM
     ffi (1.9.18)
     ffi (1.9.18-x64-mingw32)
     forwardable-extended (2.6.0)
-    jekyll (3.6.0)
+    jekyll (3.6.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
@@ -24,7 +24,7 @@ GEM
       sass (~> 3.4)
     jekyll-sitemap (1.1.1)
       jekyll (~> 3.3)
-    jekyll-toc (0.4.0.rc2)
+    jekyll-toc (0.4.0)
       nokogiri (~> 1.6)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
@@ -58,10 +58,10 @@ PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
-  jekyll (~> 3.6.0)
+  jekyll (~> 3.6.2)
   jekyll-redirect-from (~> 0.12.1)
   jekyll-sitemap (~> 1.1.1)
-  jekyll-toc (~> 0.4.0.rc2)
+  jekyll-toc (~> 0.4.0)
 
 BUNDLED WITH
    1.15.4
diff --git a/_config.yml b/_config.yml
@@ -71,5 +71,5 @@ cdn:
   js_hash:          "sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ"
   jquery:           "https://code.jquery.com/jquery-3.2.1.slim.min.js"
   jquery_hash:      "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
-  popper:           "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"
-  popper_hash:      "sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh"
+  popper:           "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.6/umd/popper.min.js"
+  popper_hash:      "sha384-W1IgCZfiFCplncoIxD5rld+uzdB6FlcG2vm4qjrCP5Z7uUt7vnwbztJXeqXgd26w"
diff --git a/_data/showcase.yml b/_data/showcase.yml
diff --git a/_data/translations.yml b/_data/translations.yml
@@ -11,4 +11,4 @@
 - name: Brazilian Portuguese
   code: pt-BR
   description: Bootstrap 4 Português do Brasil
-  url: https://bootstrapbrasil.github.io/v4/
+  url: http://getbootstrap.com.br/v4/
diff --git 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
@@ -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
@@ -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
@@ -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">
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -13,11 +13,11 @@
     {% include docs-navbar.html %}
 
     {% if page.layout == "simple" %}
-        {{ content }}
+      {{ content }}
     {% else %}
-        <main id="content" role="main">
-            {{ content }}
-        </main>
+      <main id="content" role="main">
+        {{ content }}
+      </main>
     {% endif %}
 
     {% include footer.html %}

diff --git a/assets/css/docs.min.css b/assets/css/docs.min.css
diff --git a/assets/css/docs.min.css.map b/assets/css/docs.min.css.map
diff --git a/assets/js/vendor/popper.min.js b/assets/js/vendor/popper.min.js
diff --git a/assets/scss/_ads.scss b/assets/scss/_ads.scss
@@ -14,7 +14,7 @@
   font-size: 13px;
   line-height: 1.4;
   text-align: left;
-  background-color: rgba(0,0,0,.05);
+  background-color: rgba(0, 0, 0, .05);
 
   a {
     color: #333;

diff --git a/assets/scss/_algolia.scss b/assets/scss/_algolia.scss
@@ -15,8 +15,8 @@
     padding: .75rem 0 !important;
     background-color: #fff;
     background-clip: padding-box;
-    border: 1px solid rgba(0,0,0,.1);
-    box-shadow: 0 .5rem 1rem rgba(0,0,0,.175);
+    border: 1px solid rgba(0, 0, 0, .1);
+    box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .175);
 
     @include media-breakpoint-up(md) {
       width: 175%;
@@ -82,7 +82,7 @@
       .algolia-docsearch-suggestion--category-header {
         padding-top: .75rem !important;
         margin-top: .75rem !important;
-        border-top: 1px solid rgba(0,0,0,.1);
+        border-top: 1px solid rgba(0, 0, 0, .1);
       }
     }
 
@@ -115,7 +115,7 @@
     font-size: .75rem !important;
     line-height: 1 !important;
     color: #767676 !important;
-    border-top: 1px solid rgba(0,0,0,.1);
+    border-top: 1px solid rgba(0, 0, 0, .1);
   }
 
   .algolia-docsearch-footer--logo {
@@ -132,10 +132,10 @@
   }
 
   .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight {
-    box-shadow: inset 0 -2px 0 0 rgba(95,45,171,.5) !important;
+    box-shadow: inset 0 -2px 0 0 rgba(95, 45, 171, .5) !important;
   }
 
   .ds-suggestion.ds-cursor .algolia-docsearch-suggestion--content {
-    background-color: rgba(208,189,236,.15) !important;
+    background-color: rgba(208, 189, 236, .15) !important;
   }
 }