Skip to content

Commit

Permalink
MDL-67386 theme_boost: upgrade bootstrap to version 4.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bas Brands committed May 25, 2020
1 parent 71965a8 commit 6a4ce7b
Show file tree
Hide file tree
Showing 159 changed files with 6,392 additions and 8,431 deletions.
28 changes: 14 additions & 14 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,19 @@ media/player/videojs/videojs/video-js.swf
mod/assign/feedback/editpdf/fpdi/
repository/s3/S3.php
theme/boost/scss/bootstrap/
theme/boost/amd/src/alert.js
theme/boost/amd/src/button.js
theme/boost/amd/src/carousel.js
theme/boost/amd/src/collapse.js
theme/boost/amd/src/dropdown.js
theme/boost/amd/src/index.js
theme/boost/amd/src/modal.js
theme/boost/amd/src/popover.js
theme/boost/amd/src/sanitizer.js
theme/boost/amd/src/scrollspy.js
theme/boost/amd/src/tab.js
theme/boost/amd/src/toast.js
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/bootstrap/alert.js
theme/boost/amd/src/bootstrap/button.js
theme/boost/amd/src/bootstrap/carousel.js
theme/boost/amd/src/bootstrap/collapse.js
theme/boost/amd/src/bootstrap/dropdown.js
theme/boost/amd/src/bootstrap/index.js
theme/boost/amd/src/bootstrap/modal.js
theme/boost/amd/src/bootstrap/popover.js
theme/boost/amd/src/bootstrap/tools/sanitizer.js
theme/boost/amd/src/bootstrap/scrollspy.js
theme/boost/amd/src/bootstrap/tab.js
theme/boost/amd/src/bootstrap/toast.js
theme/boost/amd/src/bootstrap/tooltip.js
theme/boost/amd/src/bootstrap/util.js
theme/boost/amd/src/tether.js
theme/boost/scss/fontawesome/
28 changes: 14 additions & 14 deletions .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,19 @@ media/player/videojs/videojs/video-js.swf
mod/assign/feedback/editpdf/fpdi/
repository/s3/S3.php
theme/boost/scss/bootstrap/
theme/boost/amd/src/alert.js
theme/boost/amd/src/button.js
theme/boost/amd/src/carousel.js
theme/boost/amd/src/collapse.js
theme/boost/amd/src/dropdown.js
theme/boost/amd/src/index.js
theme/boost/amd/src/modal.js
theme/boost/amd/src/popover.js
theme/boost/amd/src/sanitizer.js
theme/boost/amd/src/scrollspy.js
theme/boost/amd/src/tab.js
theme/boost/amd/src/toast.js
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/bootstrap/alert.js
theme/boost/amd/src/bootstrap/button.js
theme/boost/amd/src/bootstrap/carousel.js
theme/boost/amd/src/bootstrap/collapse.js
theme/boost/amd/src/bootstrap/dropdown.js
theme/boost/amd/src/bootstrap/index.js
theme/boost/amd/src/bootstrap/modal.js
theme/boost/amd/src/bootstrap/popover.js
theme/boost/amd/src/bootstrap/tools/sanitizer.js
theme/boost/amd/src/bootstrap/scrollspy.js
theme/boost/amd/src/bootstrap/tab.js
theme/boost/amd/src/bootstrap/toast.js
theme/boost/amd/src/bootstrap/tooltip.js
theme/boost/amd/src/bootstrap/util.js
theme/boost/amd/src/tether.js
theme/boost/scss/fontawesome/
2 changes: 1 addition & 1 deletion calendar/templates/minicalendar_day_link.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</div>
{{#js}}
require(['jquery'], function($) {
require(['theme_boost/popover'], function() {
require(['theme_boost/bootstrap/popover'], function() {
var target = $("#calendar-day-popover-link-{{courseid}}-{{year}}-{{yday}}-{{uniqid}}");
target.popover({
content: function() {
Expand Down
4 changes: 1 addition & 3 deletions enrol/manual/tests/behat/quickenrolment.feature
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ Feature: Teacher can search and enrol users one by one into the course
And I should see "Student 001"
And I click on "Enrol users" "button" in the "Enrol users" "dialogue"
Then I should see "Active" in the "Student 001" "table_row"
# The following line is commented out as auto-hidden toasts fire events in the wrong place.
# TODO Uncomment this when we upgrade Bootstrap. This issue is fixed in v4.4.0 - see MDL-67386.
#And I should see "1 enrolled users"
And I should see "1 enrolled users"

@javascript
Scenario: Searching for a non-existing user
Expand Down
2 changes: 1 addition & 1 deletion lib/templates/local/toast/message.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</div>
</div>
{{#js}}
require(['jquery', 'theme_boost/toast'], function(jQuery) {
require(['jquery', 'theme_boost/bootstrap/toast'], function(jQuery) {
// Show the toast.
// Bootstrap toast components are not shown automatically.
jQuery('#toast-{{uniqid}}').toast('show');
Expand Down
2 changes: 0 additions & 2 deletions theme/boost/amd/build/alert.min.js

This file was deleted.

1 change: 0 additions & 1 deletion theme/boost/amd/build/alert.min.js.map

This file was deleted.

Loading

0 comments on commit 6a4ce7b

Please sign in to comment.