Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Bootstrap to 4.6.2 #690

Merged
merged 2 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/components/molecules/carousel/carousel.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: carousel
title: Carousel
notes: |
Basic carousel using Bootstrap functionality: https://getbootstrap.com/docs/4.0/components/carousel/.
Basic carousel using Bootstrap functionality: https://getbootstrap.com/docs/4.6/components/carousel/.

Use the 'data-interval' attribute to change the automatic slide delay.

Expand Down
2 changes: 1 addition & 1 deletion assets/components/organisms/modal/modal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ name: modal
notes: |
The **Bootstrap Modal component** is a dialog box/popup window that is displayed on top of the current page.

For usage, [see Bootstrap documentation](https://getbootstrap.com/docs/4.0/components/modal/).
For usage, [see Bootstrap documentation](https://getbootstrap.com/docs/4.6/components/modal/).
2 changes: 1 addition & 1 deletion assets/components/pages/layout-demo/layout-demo.twig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="container">
<div class="alert alert-success">
<h4>container</h4>
<p>This <strong>.container</strong> class is the bootstrap defaut one. When used, It will fallback to the default bootstrap behavior, that can be divided with rows, columns, etc... (see <a href="https://getbootstrap.com/docs/4.1/layout/grid/">the Bootstrap documentation)</a></p>
<p>This <strong>.container</strong> class is the bootstrap defaut one. When used, It will fallback to the default bootstrap behavior, that can be divided with rows, columns, etc... (see <a href="https://getbootstrap.com/docs/4.6/layout/grid/">the Bootstrap documentation)</a></p>
</div>
</div>
{% endblock %}
11 changes: 5 additions & 6 deletions assets/config/bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/*!
* Bootstrap v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*
* This list has not changed since the v4.0.0
* Bootstrap v4.6.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors
* Copyright 2011-2022 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

@import "bootstrap/scss/functions";
Expand Down Expand Up @@ -41,5 +39,6 @@
@import "bootstrap/scss/tooltip";
@import "bootstrap/scss/popover";
@import "bootstrap/scss/carousel";
@import "bootstrap/scss/spinners";
@import "bootstrap/scss/utilities";
@import "bootstrap/scss/print";
6 changes: 3 additions & 3 deletions docs/user documentation/create a page.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Bootstrap based

Elements is entirely **based on the [Bootstrap 4](https://getbootstrap.com/) framework**. It means that when you have to build a page, you can use all the **[grid](https://getbootstrap.com/docs/4.1/layout/grid/)** and **[spacing](https://getbootstrap.com/docs/4.1/utilities/spacing/) classes**.
Elements is entirely **based on the [Bootstrap 4](https://getbootstrap.com/) framework**. It means that when you have to build a page, you can use all the **[grid](https://getbootstrap.com/docs/4.6/layout/grid/)** and **[spacing](https://getbootstrap.com/docs/4.6/utilities/spacing/) classes**.

### The grid

Expand All @@ -20,7 +20,7 @@ Based on **12 columns**, the grid is pretty easy to use. For example, **if you w
```
See [the layout demo page](#/pages/layout-demo) to understand the usage we make of bootstrap grid.

Read the [Bootstrap documentation](https://getbootstrap.com/docs/4.1/layout/grid/) to learn more about the grid.
Read the [Bootstrap documentation](https://getbootstrap.com/docs/4.6/layout/grid/) to learn more about the grid.

### Spacing

Expand All @@ -32,7 +32,7 @@ Like with the grid, **Bootstrap provides some very useful classes to refine spac
</div>
```

Read the [documentation](https://getbootstrap.com/docs/4.1/utilities/spacing/) to learn more about the spacing classes.
Read the [documentation](https://getbootstrap.com/docs/4.6/utilities/spacing/) to learn more about the spacing classes.

## Page types

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
},
"dependencies": {
"@selectize/selectize": "^0.13.6",
"bootstrap": "^4.5.2",
"bootstrap": "^4.6.2",
"clipboard": "^2.0.6",
"cookieconsent": "^3.1.1",
"feather-icons": "^4.29.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2402,10 +2402,10 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=

bootstrap@^4.5.2:
version "4.6.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
bootstrap@^4.6.2:
version "4.6.2"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==

boxen@^7.0.0:
version "7.0.0"
Expand Down
Loading