Skip to content

Commit

Permalink
Merge branch 'main' into gs-use-a-standard-method-to-execute-callback…
Browse files Browse the repository at this point in the history
…s-inside-components
  • Loading branch information
rohit2sharma95 committed May 8, 2021
2 parents 02fe971 + eb73a2f commit 82004ff
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
5 changes: 4 additions & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ categories:
- 'fix'
- 'bugfix'
- 'bug'
- title: '⚡ Performance Improvements'
- title: '⚡ Performance improvements'
labels:
- 'performance'
- title: '🎨 CSS'
Expand All @@ -29,6 +29,9 @@ categories:
- title: '📖 Docs'
labels:
- 'docs'
- title: '🛠 Examples'
labels:
- 'examples'
- title: '🌎 Accessibility'
labels:
- 'accessibility'
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/about/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Originally [released](https://blog.twitter.com/developer/en_us/a/2011/bootstrap-

With Bootstrap 4, we once again rewrote the project to account for two key architectural changes: a migration to Sass and the move to CSS's flexbox. Our intention is to help in a small way to move the web development community forward by pushing for newer CSS properties, fewer dependencies, and new technologies across more modern browsers.

Our latest release, Bootstrap 5 (currently in development), focuses on improving v4's codebase with as few major breaking changes as possible. We improved existing features and components, removed support for older browsers, dropped jQuery for regular JavaScript, and embraced more future-friendly technologies like CSS custom properties as part of our tooling.
Our latest release, Bootstrap 5, focuses on improving v4's codebase with as few major breaking changes as possible. We improved existing features and components, removed support for older browsers, dropped jQuery for regular JavaScript, and embraced more future-friendly technologies like CSS custom properties as part of our tooling.

## Get involved

Expand Down
4 changes: 2 additions & 2 deletions site/content/docs/5.0/components/scrollspy.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Scroll the area below the navbar and watch the active class change. The dropdown
<p>This is some placeholder content for the scrollspy page. Note that as you scroll down the page, the appropriate navigation link is highlighted. It's repeated throughout the component example. We keep adding some more example copy here to emphasize the scrolling and highlighting.</p>
<h4 id="scrollspyHeading2">Second heading</h4>
<p>This is some placeholder content for the scrollspy page. Note that as you scroll down the page, the appropriate navigation link is highlighted. It's repeated throughout the component example. We keep adding some more example copy here to emphasize the scrolling and highlighting.</p>
<h4 id="scrollspyHeading3">Thidd heading</h4>
<h4 id="scrollspyHeading3">Third heading</h4>
<p>This is some placeholder content for the scrollspy page. Note that as you scroll down the page, the appropriate navigation link is highlighted. It's repeated throughout the component example. We keep adding some more example copy here to emphasize the scrolling and highlighting.</p>
<h4 id="scrollspyHeading4">Fourth heading</h4>
<p>This is some placeholder content for the scrollspy page. Note that as you scroll down the page, the appropriate navigation link is highlighted. It's repeated throughout the component example. We keep adding some more example copy here to emphasize the scrolling and highlighting.</p>
Expand Down Expand Up @@ -87,7 +87,7 @@ Scroll the area below the navbar and watch the active class change. The dropdown
<p>...</p>
<h4 id="scrollspyHeading2">Second heading</h4>
<p>...</p>
<h4 id="scrollspyHeading3">Thidd heading</h4>
<h4 id="scrollspyHeading3">Third heading</h4>
<p>...</p>
<h4 id="scrollspyHeading4">Fourth heading</h4>
<p>...</p>
Expand Down
8 changes: 3 additions & 5 deletions site/content/docs/5.0/examples/heroes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h1 class="display-5 fw-bold">Centered hero</h1>
<div class="col-lg-6 mx-auto">
<p class="lead mb-4">Quickly design and customize responsive mobile-first sites with Bootstrap, the world’s most popular front-end open source toolkit, featuring Sass variables and mixins, responsive grid system, extensive prebuilt components, and powerful JavaScript plugins.</p>
<div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
<button type="button" class="btn btn-primary btn-lg px-4 me-sm-3">Primary button</button>
<button type="button" class="btn btn-primary btn-lg px-4 gap-3">Primary button</button>
<button type="button" class="btn btn-outline-secondary btn-lg px-4">Secondary</button>
</div>
</div>
Expand Down Expand Up @@ -100,10 +100,8 @@ <h1 class="display-4 fw-bold lh-1">Border hero with cropped image and shadows</h
<button type="button" class="btn btn-outline-secondary btn-lg px-4">Default</button>
</div>
</div>
<div class="col-lg-4 offset-lg-1 p-0 position-relative overflow-hidden shadow-lg">
<div class="position-lg-absolute top-0 left-0 overflow-hidden">
<img class="d-block rounded-lg-3" src="bootstrap-docs.png" alt="" width="720">
</div>
<div class="col-lg-4 offset-lg-1 p-0 overflow-hidden shadow-lg">
<img class="rounded-lg-3" src="bootstrap-docs.png" alt="" width="720">
</div>
</div>
</div>
Expand Down
9 changes: 4 additions & 5 deletions site/content/docs/5.0/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ toc: true
- Dropped Internet Explorer 10 and 11
- Dropped Microsoft Edge < 16 (Legacy Edge)
- Dropped Firefox < 60
- Dropped Safari < 10
- Dropped iOS Safari < 10
- Dropped Safari < 12
- Dropped iOS Safari < 12
- Dropped Chrome < 60
- Dropped Android < 6

<hr class="my-5">

Expand Down Expand Up @@ -170,7 +169,7 @@ toc: true

### Accordion

- Added [new accordion component]({{< docsref "/components/accordion" >}}!
- Added [new accordion component]({{< docsref "/components/accordion" >}})!

### Alerts

Expand Down Expand Up @@ -220,7 +219,7 @@ toc: true

- Replaced chevron icons for carousel controls with new SVGs from [Bootstrap Icons]({{< param "icons" >}}).

### Close buttton
### Close button

- <span class="badge bg-danger">Breaking</span> Renamed `.close` to `.btn-close` for a less generic name.

Expand Down

0 comments on commit 82004ff

Please sign in to comment.