Merge branch 'v4-dev' into v4-dev-xmr-docs-access-callout

twbs · Nov 27, 2018 · 84bde65 · 84bde65
2 parents 7074a2d + cb2b21b
commit 84bde65
Show file tree

Hide file tree

Showing 46 changed files with 8 additions and 3 deletions.
diff --git a/site/_includes/icons/bootstrap-stack.svg b/site/_includes/icons/bootstrap-stack.svg
diff --git a/site/docs/4.1/assets/img/bootstrap-stack.png b/site/docs/4.1/assets/img/bootstrap-stack.png
diff --git a/site/docs/4.1/assets/img/bootstrap-themes.png b/site/docs/4.1/assets/img/bootstrap-themes.png
diff --git a/site/docs/4.1/assets/img/bootstrap-themes@2x.png b/site/docs/4.1/assets/img/bootstrap-themes@2x.png
diff --git a/site/docs/4.1/assets/img/examples/album.png b/site/docs/4.1/assets/img/examples/album.png
diff --git a/site/docs/4.1/examples/screenshots/album.png → ...docs/4.1/assets/img/examples/album@2x.png b/site/docs/4.1/examples/screenshots/album.png → ...docs/4.1/assets/img/examples/album@2x.png
diff --git a/site/docs/4.1/assets/img/examples/blog.png b/site/docs/4.1/assets/img/examples/blog.png
diff --git a/site/docs/4.1/examples/screenshots/blog.png → .../docs/4.1/assets/img/examples/blog@2x.png b/site/docs/4.1/examples/screenshots/blog.png → .../docs/4.1/assets/img/examples/blog@2x.png
diff --git a/site/docs/4.1/assets/img/examples/carousel.png b/site/docs/4.1/assets/img/examples/carousel.png
diff --git a/...ocs/4.1/examples/screenshots/carousel.png → ...s/4.1/assets/img/examples/carousel@2x.png b/...ocs/4.1/examples/screenshots/carousel.png → ...s/4.1/assets/img/examples/carousel@2x.png
diff --git a/site/docs/4.1/assets/img/examples/checkout.png b/site/docs/4.1/assets/img/examples/checkout.png
diff --git a/...ocs/4.1/examples/screenshots/checkout.png → ...s/4.1/assets/img/examples/checkout@2x.png b/...ocs/4.1/examples/screenshots/checkout.png → ...s/4.1/assets/img/examples/checkout@2x.png
diff --git a/site/docs/4.1/assets/img/examples/cover.png b/site/docs/4.1/assets/img/examples/cover.png
diff --git a/site/docs/4.1/examples/screenshots/cover.png → ...docs/4.1/assets/img/examples/cover@2x.png b/site/docs/4.1/examples/screenshots/cover.png → ...docs/4.1/assets/img/examples/cover@2x.png
diff --git a/site/docs/4.1/assets/img/examples/dashboard.png b/site/docs/4.1/assets/img/examples/dashboard.png
diff --git a/...cs/4.1/examples/screenshots/dashboard.png → .../4.1/assets/img/examples/dashboard@2x.png b/...cs/4.1/examples/screenshots/dashboard.png → .../4.1/assets/img/examples/dashboard@2x.png
diff --git a/site/docs/4.1/assets/img/examples/floating-labels.png b/site/docs/4.1/assets/img/examples/floating-labels.png
diff --git a/.../examples/screenshots/floating-labels.png → ...ssets/img/examples/floating-labels@2x.png b/.../examples/screenshots/floating-labels.png → ...ssets/img/examples/floating-labels@2x.png
diff --git a/site/docs/4.1/assets/img/examples/grid.png b/site/docs/4.1/assets/img/examples/grid.png
diff --git a/site/docs/4.1/examples/screenshots/grid.png → .../docs/4.1/assets/img/examples/grid@2x.png b/site/docs/4.1/examples/screenshots/grid.png → .../docs/4.1/assets/img/examples/grid@2x.png
diff --git a/site/docs/4.1/assets/img/examples/jumbotron.png b/site/docs/4.1/assets/img/examples/jumbotron.png
diff --git a/...cs/4.1/examples/screenshots/jumbotron.png → .../4.1/assets/img/examples/jumbotron@2x.png b/...cs/4.1/examples/screenshots/jumbotron.png → .../4.1/assets/img/examples/jumbotron@2x.png
diff --git a/site/docs/4.1/assets/img/examples/navbar-bottom.png b/site/docs/4.1/assets/img/examples/navbar-bottom.png
diff --git a/....1/examples/screenshots/navbar-bottom.png → .../assets/img/examples/navbar-bottom@2x.png b/....1/examples/screenshots/navbar-bottom.png → .../assets/img/examples/navbar-bottom@2x.png
diff --git a/site/docs/4.1/assets/img/examples/navbar-fixed.png b/site/docs/4.1/assets/img/examples/navbar-fixed.png
diff --git a/...4.1/examples/screenshots/navbar-fixed.png → ...1/assets/img/examples/navbar-fixed@2x.png b/...4.1/examples/screenshots/navbar-fixed.png → ...1/assets/img/examples/navbar-fixed@2x.png
diff --git a/site/docs/4.1/assets/img/examples/navbar-static.png b/site/docs/4.1/assets/img/examples/navbar-static.png
diff --git a/....1/examples/screenshots/navbar-static.png → .../assets/img/examples/navbar-static@2x.png b/....1/examples/screenshots/navbar-static.png → .../assets/img/examples/navbar-static@2x.png
diff --git a/site/docs/4.1/assets/img/examples/navbars.png b/site/docs/4.1/assets/img/examples/navbars.png
diff --git a/...docs/4.1/examples/screenshots/navbars.png → ...cs/4.1/assets/img/examples/navbars@2x.png b/...docs/4.1/examples/screenshots/navbars.png → ...cs/4.1/assets/img/examples/navbars@2x.png
diff --git a/site/docs/4.1/assets/img/examples/offcanvas.png b/site/docs/4.1/assets/img/examples/offcanvas.png
diff --git a/...cs/4.1/examples/screenshots/offcanvas.png → .../4.1/assets/img/examples/offcanvas@2x.png b/...cs/4.1/examples/screenshots/offcanvas.png → .../4.1/assets/img/examples/offcanvas@2x.png
diff --git a/site/docs/4.1/assets/img/examples/pricing.png b/site/docs/4.1/assets/img/examples/pricing.png
diff --git a/...docs/4.1/examples/screenshots/pricing.png → ...cs/4.1/assets/img/examples/pricing@2x.png b/...docs/4.1/examples/screenshots/pricing.png → ...cs/4.1/assets/img/examples/pricing@2x.png
diff --git a/site/docs/4.1/assets/img/examples/product.png b/site/docs/4.1/assets/img/examples/product.png
diff --git a/...docs/4.1/examples/screenshots/product.png → ...cs/4.1/assets/img/examples/product@2x.png b/...docs/4.1/examples/screenshots/product.png → ...cs/4.1/assets/img/examples/product@2x.png
diff --git a/site/docs/4.1/assets/img/examples/sign-in.png b/site/docs/4.1/assets/img/examples/sign-in.png
diff --git a/...docs/4.1/examples/screenshots/sign-in.png → ...cs/4.1/assets/img/examples/sign-in@2x.png b/...docs/4.1/examples/screenshots/sign-in.png → ...cs/4.1/assets/img/examples/sign-in@2x.png
diff --git a/site/docs/4.1/assets/img/examples/starter-template.png b/site/docs/4.1/assets/img/examples/starter-template.png
diff --git a/...examples/screenshots/starter-template.png → ...sets/img/examples/starter-template@2x.png b/...examples/screenshots/starter-template.png → ...sets/img/examples/starter-template@2x.png
diff --git a/site/docs/4.1/assets/img/examples/sticky-footer-navbar.png b/site/docs/4.1/assets/img/examples/sticky-footer-navbar.png
diff --git a/...ples/screenshots/sticky-footer-navbar.png → .../img/examples/sticky-footer-navbar@2x.png b/...ples/screenshots/sticky-footer-navbar.png → .../img/examples/sticky-footer-navbar@2x.png
diff --git a/site/docs/4.1/assets/img/examples/sticky-footer.png b/site/docs/4.1/assets/img/examples/sticky-footer.png
diff --git a/....1/examples/screenshots/sticky-footer.png → .../assets/img/examples/sticky-footer@2x.png b/....1/examples/screenshots/sticky-footer.png → .../assets/img/examples/sticky-footer@2x.png
diff --git a/site/docs/4.1/examples/index.html b/site/docs/4.1/examples/index.html
@@ -15,7 +15,9 @@ <h2>{{ entry.category | capitalize }}</h2>
     {% if forloop.first %}<div class="row">{% endif %}
       <div class="col-sm-6 col-md-4 col-xl-3 mb-3">
         <a href="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/{{ example.name | slugify }}/">
-          <img class="img-thumbnail mb-3" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/examples/screenshots/{{ example.name | slugify }}.png" alt="{{ example.name }} screenshot" width="960" height="600">
+          <img class="img-thumbnail mb-3" srcset="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}.png,
+                                                  {{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}@2x.png 2x"
+                                          src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/examples/{{ example.name | slugify }}.png" alt="{{ example.name }} screenshot" width="480" height="300">
           <h5 class="mb-1">{{ example.name }}</h5>
         </a>
         <p class="text-muted">{{ example.description }}</p>

diff --git a/site/index.html b/site/index.html
@@ -6,7 +6,7 @@
   <div class="container">
     <div class="row align-items-center">
       <div class="col-6 mx-auto col-md-6 order-md-2">
-        <img class="img-fluid mb-3 mb-md-0" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-stack.png" alt="" width="1024" height="860">
+        {% include icons/bootstrap-stack.svg width="512" height="430" class="img-fluid mb-3 mb-md-0" %}
       </div>
       <div class="col-md-6 order-md-1 text-center text-md-left pr-md-5">
         <h1 class="mb-3 bd-text-purple-bright">Bootstrap</h1>
@@ -80,7 +80,9 @@ <h3>Official Themes</h3>
     <p>
       Take Bootstrap 4 to the next level with official premium themes—toolkits built on Bootstrap with new components and plugins, docs, and build tools.
     </p>
-    <img class="img-fluid mt-3 mx-auto" src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes.png" alt="Bootstrap Themes" width="1024" height="388">
+    <img class="img-fluid mt-3 mx-auto" srcset="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes.png,
+                                                {{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes@2x.png 2x"
+                                        src="{{ site.baseurl }}/docs/{{ site.docs_version }}/assets/img/bootstrap-themes.png" alt="Bootstrap Themes" width="500" height="200">
     <hr class="half-rule">
     <a href="{{ site.themes }}/" class="btn btn-outline-primary">Browse themes</a>
   </div>