]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Removal of one of the most iconic components of Bootstrap: the jumbotron (#28876)
authorMartijn Cuppens <martijn.cuppens@gmail.com>
Fri, 7 Jun 2019 11:44:26 +0000 (13:44 +0200)
committerXhmikosR <xhmikosr@gmail.com>
Fri, 7 Jun 2019 11:44:25 +0000 (14:44 +0300)
26 files changed:
scss/_jumbotron.scss [deleted file]
scss/_variables.scss
scss/bootstrap.scss
site/content/docs/4.3/components/jumbotron.md [deleted file]
site/content/docs/4.3/examples/album/album.css [deleted file]
site/content/docs/4.3/examples/album/index.html
site/content/docs/4.3/examples/blog/index.html
site/content/docs/4.3/examples/jumbotron/index.html [deleted file]
site/content/docs/4.3/examples/jumbotron/jumbotron.css [deleted file]
site/content/docs/4.3/examples/navbar-bottom/index.html
site/content/docs/4.3/examples/navbar-fixed/index.html
site/content/docs/4.3/examples/navbar-static/index.html
site/content/docs/4.3/examples/navbars/index.html
site/content/docs/4.3/migration.md
site/data/examples.yml
site/data/nav.yml
site/static/docs/4.3/assets/img/examples/album.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/album@2x.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbar-bottom.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbar-bottom@2x.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbar-fixed.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbar-fixed@2x.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbar-static.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbar-static@2x.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbars.png [changed mode: 0644->0755]
site/static/docs/4.3/assets/img/examples/navbars@2x.png [changed mode: 0644->0755]

diff --git a/scss/_jumbotron.scss b/scss/_jumbotron.scss
deleted file mode 100644 (file)
index bcd7dca..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-.jumbotron {
-  padding: $jumbotron-padding ($jumbotron-padding / 2);
-  margin-bottom: $jumbotron-padding;
-  color: $jumbotron-color;
-  background-color: $jumbotron-bg;
-  @include border-radius($border-radius-lg);
-
-  @include media-breakpoint-up(sm) {
-    padding: ($jumbotron-padding * 2) $jumbotron-padding;
-  }
-}
-
-.jumbotron-fluid {
-  padding-right: 0;
-  padding-left: 0;
-  @include border-radius(0);
-}
index 79e0793a755939f8a4d9b7572eada3a00c0f5651..716b5513604ea660b35339e9f345bacd40c4a4a5 100644 (file)
@@ -811,13 +811,6 @@ $pagination-disabled-bg:            $white !default;
 $pagination-disabled-border-color:  $gray-300 !default;
 
 
-// Jumbotron
-
-$jumbotron-padding:                 2rem !default;
-$jumbotron-color:                   null !default;
-$jumbotron-bg:                      $gray-200 !default;
-
-
 // Cards
 
 $card-spacer-y:                     .75rem !default;
index 5f100326b7cd99670b0288f3e4cf83636196a147..6ded9f628fb2f3199fb8f2da404d2a8bf7d73330 100644 (file)
@@ -35,7 +35,6 @@
 @import "breadcrumb";
 @import "pagination";
 @import "badge";
-@import "jumbotron";
 @import "alert";
 @import "progress";
 @import "list-group";
diff --git a/site/content/docs/4.3/components/jumbotron.md b/site/content/docs/4.3/components/jumbotron.md
deleted file mode 100644 (file)
index 9810be4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: docs
-title: Jumbotron
-description: Lightweight, flexible component for showcasing hero unit style content.
-group: components
----
-
-A lightweight, flexible component that can optionally extend the entire viewport to showcase key marketing messages on your site.
-
-{{< example >}}
-<div class="jumbotron">
-  <h1 class="display-4">Hello, world!</h1>
-  <p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
-  <hr class="my-4">
-  <p>It uses utility classes for typography and spacing to space content out within the larger container.</p>
-  <a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a>
-</div>
-{{< /example >}}
-
-To make the jumbotron full width, and without rounded corners, add the `.jumbotron-fluid` modifier class and add a `.container` or `.container-fluid` within.
-
-{{< example >}}
-<div class="jumbotron jumbotron-fluid">
-  <div class="container">
-    <h1 class="display-4">Fluid jumbotron</h1>
-    <p class="lead">This is a modified jumbotron that occupies the entire horizontal space of its parent.</p>
-  </div>
-</div>
-{{< /example >}}
diff --git a/site/content/docs/4.3/examples/album/album.css b/site/content/docs/4.3/examples/album/album.css
deleted file mode 100644 (file)
index bc81349..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-.jumbotron {
-  padding-top: 3rem;
-  padding-bottom: 3rem;
-  margin-bottom: 0;
-  background-color: #fff;
-}
-@media (min-width: 768px) {
-  .jumbotron {
-    padding-top: 6rem;
-    padding-bottom: 6rem;
-  }
-}
-
-.jumbotron p:last-child {
-  margin-bottom: 0;
-}
-
-.jumbotron h1 {
-  font-weight: 300;
-}
-
-.jumbotron .container {
-  max-width: 40rem;
-}
-
-footer {
-  padding-top: 3rem;
-  padding-bottom: 3rem;
-}
-
-footer p {
-  margin-bottom: .25rem;
-}
index bedeefcf38382e52b8d2a81bb3ab75d3c1fea68e..366ac511641433389b69c6188f88a4375f145b61 100644 (file)
@@ -1,8 +1,6 @@
 ---
 layout: examples
 title: Album example
-extra_css:
-  - "album.css"
 ---
 
 <header>
@@ -39,14 +37,16 @@ extra_css:
 
 <main role="main">
 
-  <section class="jumbotron text-center">
-    <div class="container">
-      <h1>Album example</h1>
-      <p class="lead text-muted">Something short and leading about the collection below—its contents, the creator, etc. Make it short and sweet, but not too short so folks don’t simply skip over it entirely.</p>
-      <p>
-        <a href="#" class="btn btn-primary my-2">Main call to action</a>
-        <a href="#" class="btn btn-secondary my-2">Secondary action</a>
-      </p>
+  <section class="py-5 text-center container">
+    <div class="row py-lg-5">
+      <div class="col-lg-6 col-md-8 mx-auto">
+        <h1 class="font-weight-light">Album example</h1>
+        <p class="lead text-muted">Something short and leading about the collection below—its contents, the creator, etc. Make it short and sweet, but not too short so folks don’t simply skip over it entirely.</p>
+        <p>
+          <a href="#" class="btn btn-primary my-2">Main call to action</a>
+          <a href="#" class="btn btn-secondary my-2">Secondary action</a>
+        </p>
+      </div>
     </div>
   </section>
 
@@ -197,12 +197,12 @@ extra_css:
 
 </main>
 
-<footer class="text-muted">
+<footer class="text-muted py-5">
   <div class="container">
-    <p class="float-right">
+    <p class="float-right mb-1">
       <a href="#">Back to top</a>
     </p>
-    <p>Album example is &copy; Bootstrap, but please download and customize it for yourself!</p>
-    <p>New to Bootstrap? <a href="/">Visit the homepage</a> or read our <a href="{{< docsref "/getting-started/introduction" >}}">getting started guide</a>.</p>
+    <p class="mb-1">Album example is &copy; Bootstrap, but please download and customize it for yourself!</p>
+    <p class="mb-0">New to Bootstrap? <a href="/">Visit the homepage</a> or read our <a href="{{< docsref "/getting-started/introduction" >}}">getting started guide</a>.</p>
   </div>
 </footer>
index 06b8d2a64ab8ab16a2c7479e59b41b8a7f1a2938..6436f1ad852a0c8192a0799d34f05647568a8bae 100644 (file)
@@ -42,7 +42,7 @@ include_js: false
     </nav>
   </div>
 
-  <div class="jumbotron p-4 p-md-5 text-white rounded bg-dark">
+  <div class="p-4 p-md-5 mb-4 text-white rounded bg-dark">
     <div class="col-md-6 px-0">
       <h1 class="display-4 font-italic">Title of a longer featured blog post</h1>
       <p class="lead my-3">Multiple lines of text that form the lede, informing new readers quickly and efficiently about what’s most interesting in this post’s contents.</p>
diff --git a/site/content/docs/4.3/examples/jumbotron/index.html b/site/content/docs/4.3/examples/jumbotron/index.html
deleted file mode 100644 (file)
index efcae9c..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
----
-layout: examples
-title: Jumbotron Template
-extra_css:
-  - "jumbotron.css"
----
-
-<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
-  <a class="navbar-brand" href="#">Navbar</a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-
-  <div class="collapse navbar-collapse" id="navbarsExampleDefault">
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item active">
-        <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="#">Link</a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
-      </li>
-      <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-expanded="false">Dropdown</a>
-        <div class="dropdown-menu" aria-labelledby="dropdown01">
-          <a class="dropdown-item" href="#">Action</a>
-          <a class="dropdown-item" href="#">Another action</a>
-          <a class="dropdown-item" href="#">Something else here</a>
-        </div>
-      </li>
-    </ul>
-    <form class="form-inline my-2 my-lg-0">
-      <input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
-      <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
-    </form>
-  </div>
-</nav>
-
-<main role="main">
-
-  <!-- Main jumbotron for a primary marketing message or call to action -->
-  <div class="jumbotron">
-    <div class="container">
-      <h1 class="display-3">Hello, world!</h1>
-      <p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-      <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more &raquo;</a></p>
-    </div>
-  </div>
-
-  <div class="container">
-    <!-- Example row of columns -->
-    <div class="row">
-      <div class="col-md-4">
-        <h2>Heading</h2>
-        <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-        <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
-      </div>
-      <div class="col-md-4">
-        <h2>Heading</h2>
-        <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-        <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
-      </div>
-      <div class="col-md-4">
-        <h2>Heading</h2>
-        <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-        <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
-      </div>
-    </div>
-
-    <hr>
-
-  </div> <!-- /container -->
-
-</main>
-
-<footer class="container">
-  <p>&copy; Company 2017-{{< year >}}</p>
-</footer>
diff --git a/site/content/docs/4.3/examples/jumbotron/jumbotron.css b/site/content/docs/4.3/examples/jumbotron/jumbotron.css
deleted file mode 100644 (file)
index d751264..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Move down content because we have a fixed navbar that is 3.5rem tall */
-body {
-  padding-top: 3.5rem;
-}
index 4210fbce5e7df5809a5997057b560e7dce33f3e9..50c5e4c579311cfae5615bc403115ae59483630c 100644 (file)
@@ -4,7 +4,7 @@ title: Bottom navbar example
 ---
 
 <div class="container">
-  <div class="jumbotron mt-3">
+  <div class="bg-light p-5 rounded mt-3">
     <h1>Bottom Navbar example</h1>
     <p class="lead">This example is a quick exercise to illustrate how the bottom navbar works.</p>
     <a class="btn btn-lg btn-primary" href="{{< docsref "/components/navbar" >}}" role="button">View navbar docs &raquo;</a>
index 2ab51e3480f1948c5f145eeb0019efa6ef10e68a..0dc1702dc996b8c3033b2c8eb297338754c8f3ee 100644 (file)
@@ -30,7 +30,7 @@ extra_css:
 </nav>
 
 <main role="main" class="container">
-  <div class="jumbotron">
+  <div class="bg-light p-5 rounded">
     <h1>Navbar example</h1>
     <p class="lead">This example is a quick exercise to illustrate how fixed to top navbar works. As you scroll, it will remain fixed to the top of your browser’s viewport.</p>
     <a class="btn btn-lg btn-primary" href="{{< docsref "/components/navbar" >}}" role="button">View navbar docs &raquo;</a>
index f0ee429a76057fe452396028c20de545352355bc..aabbd01f077989c55d23479b2cada2624b33b658 100644 (file)
@@ -30,7 +30,7 @@ extra_css:
 </nav>
 
 <main role="main" class="container">
-  <div class="jumbotron">
+  <div class="bg-light p-5 rounded">
     <h1>Navbar example</h1>
     <p class="lead">This example is a quick exercise to illustrate how the top-aligned navbar works. As you scroll, this navbar remains in its original position and moves with the rest of the page.</p>
     <a class="btn btn-lg btn-primary" href="{{< docsref "/components/navbar" >}}" role="button">View navbar docs &raquo;</a>
index 64f1243072eaaae76449c81be496aba71c8e807f..bdb4aeb01979b3b0f56f0e5f43f2c46e37c13a8a 100644 (file)
@@ -310,7 +310,7 @@ extra_css:
   </nav>
 
   <main role="main">
-    <div class="jumbotron">
+    <div class="bg-light p-5 rounded">
       <div class="col-sm-8 mx-auto">
         <h1>Navbar examples</h1>
         <p>This example is a quick exercise to illustrate how the navbar and its contents work. Some navbars extend the width of the viewport, others are confined within a <code>.container</code>. For positioning of navbars, checkout the <a href="{{< docsref "/examples/navbar-static" >}}">top</a> and <a href="{{< docsref "/examples/navbar-fixed" >}}">fixed top</a> examples.</p>
index 85e9f6dcfb550edd05cb525a8e06300ce36cae1b..59c0c8af6fc193339097f79c4431cefd8fe99e02 100644 (file)
@@ -77,6 +77,10 @@ Badges were overhauled to better differentiate themselves from buttons and to be
 - **Todo:** Removed `.badge-pill` for the `.rounded-pill` utility class
 - **Todo:** Removed badge's hover and focus styles for `a.badge` and `button.badge`.
 
+### Jumbotron
+
+- The jumbotron component is removed in favor of utility classes like `.bg-light` for the background color and `.p-*` classes to control padding.
+
 ### Popovers
 
 - Renamed `.arrow` to `.popover-arrow`
index 6fb65d7f6ba2793e6879807f3b3b2ca324acad0c..9e4fd6bd7ac8966652ed2ab058f4e557a10fc4bd 100644 (file)
@@ -31,8 +31,6 @@
       description: "Nothing but the basics: compiled CSS and JavaScript."
     - name: Grid
       description: "Multiple examples of grid layouts with all four tiers, nesting, and more."
-    - name: Jumbotron
-      description: "Build around the jumbotron with a navbar and some basic grid columns."
 
 - category: Navbars
   description: "Taking the default navbar component and showing how it can be moved, placed, and extended."
index 67c64b9f7adbf5d591900e11347e1eae125a8fe9..1fc3f63333146d9b8f875e049efc03392e575946 100644 (file)
@@ -40,7 +40,6 @@
     - title: Dropdowns
     - title: Forms
     - title: Input group
-    - title: Jumbotron
     - title: List group
     - title: Modal
     - title: Navs
old mode 100644 (file)
new mode 100755 (executable)
index 694b3b2..9f628ba
Binary files a/site/static/docs/4.3/assets/img/examples/album.png and b/site/static/docs/4.3/assets/img/examples/album.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 162269c..00c938d
Binary files a/site/static/docs/4.3/assets/img/examples/album@2x.png and b/site/static/docs/4.3/assets/img/examples/album@2x.png differ
old mode 100644 (file)
new mode 100755 (executable)
index e9f0abc..af47666
Binary files a/site/static/docs/4.3/assets/img/examples/navbar-bottom.png and b/site/static/docs/4.3/assets/img/examples/navbar-bottom.png differ
old mode 100644 (file)
new mode 100755 (executable)
index a62faa1..93a7cdc
Binary files a/site/static/docs/4.3/assets/img/examples/navbar-bottom@2x.png and b/site/static/docs/4.3/assets/img/examples/navbar-bottom@2x.png differ
old mode 100644 (file)
new mode 100755 (executable)
index c839602..97df67e
Binary files a/site/static/docs/4.3/assets/img/examples/navbar-fixed.png and b/site/static/docs/4.3/assets/img/examples/navbar-fixed.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 1ce8ca5..3e0f98b
Binary files a/site/static/docs/4.3/assets/img/examples/navbar-fixed@2x.png and b/site/static/docs/4.3/assets/img/examples/navbar-fixed@2x.png differ
old mode 100644 (file)
new mode 100755 (executable)
index faebe34..8d54f18
Binary files a/site/static/docs/4.3/assets/img/examples/navbar-static.png and b/site/static/docs/4.3/assets/img/examples/navbar-static.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 758aa61..9b05737
Binary files a/site/static/docs/4.3/assets/img/examples/navbar-static@2x.png and b/site/static/docs/4.3/assets/img/examples/navbar-static@2x.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 874f6d7..4e7e5fa
Binary files a/site/static/docs/4.3/assets/img/examples/navbars.png and b/site/static/docs/4.3/assets/img/examples/navbars.png differ
old mode 100644 (file)
new mode 100755 (executable)
index ce11b8d..dc0cea0
Binary files a/site/static/docs/4.3/assets/img/examples/navbars@2x.png and b/site/static/docs/4.3/assets/img/examples/navbars@2x.png differ