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.

Sign up for GitHub

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

Jump to bottom

bootstrap-select 1.14.0-beta3 #14282

Merged
merged 1 commit into from
Sep 8, 2023
Merged

bootstrap-select 1.14.0-beta3 #14282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,16 @@ ResourceManifest BuildManifest()
manifest
.DefineStyle("bootstrap-select")
.SetUrl("~/OrchardCore.Resources/Styles/bootstrap-select.min.css", "~/OrchardCore.Resources/Styles/bootstrap-select.css")
.SetCdn("https://cdn.jsdelivr.net/npm/[email protected]beta2/dist/css/bootstrap-select.min.css", "https://cdn.jsdelivr.net/npm/[email protected]beta2/dist/css/bootstrap-select.css")
.SetCdnIntegrity("sha256-UqiEyrW1sB5d6ZDzcWXKfYCR4MKVYMEdXNjJde84cjc=", "sha256-bmB8s0iyqUelK/WUqWRUG6y8K6RZYD2D/GJU2iIpF8s=")
.SetCdn("https://cdn.jsdelivr.net/npm/[email protected]beta3/dist/css/bootstrap-select.min.css", "https://cdn.jsdelivr.net/npm/[email protected]beta3/dist/css/bootstrap-select.css")
.SetCdnIntegrity("sha384-xF1Y2i6HgC34+4EWddbDhlQuru7cLSKRcPT3hoL3mPoKoV+624vVSZJmegPX77vS", "sha384-DtuOZ7LbR+xAYzDGD4YLpe9eiAayUBwZRqAcoy+RepIoV53tAoJbXnr4AX1xTJ43")
.SetVersion("1.14.0");

manifest
.DefineScript("bootstrap-select")
.SetDependencies("jQuery")
.SetUrl("~/OrchardCore.Resources/Scripts/bootstrap-select.min.js", "~/OrchardCore.Resources/Scripts/bootstrap-select.js")
.SetCdn("https://cdn.jsdelivr.net/npm/[email protected]beta2/dist/js/bootstrap-select.min.js", "https://cdn.jsdelivr.net/npm/[email protected]beta2/dist/js/bootstrap-select.js")
.SetCdnIntegrity("sha256-KK/CsQKh6Rb0LsRn4Z8Jcs4h7rRquelIb4EjQm6ige4=", "sha256-igJSxRuCIkTAOsoD48Fqd3mYbVGWL17ajzNLe+Ke2Hk=")
.SetCdn("https://cdn.jsdelivr.net/npm/[email protected]beta3/dist/js/bootstrap-select.min.js", "https://cdn.jsdelivr.net/npm/[email protected]beta3/dist/js/bootstrap-select.js")
.SetCdnIntegrity("sha384-0O3sg2SQIGn4393xwamQISjphC8DIXjCzlhj1gPAMC5xGg+2perF5Mehr5njv0fZ", "sha384-2b0aLFg/Ejp4OF57nW0BUqNzm259RHYYMf/mpKClBijsEH2P+4ea2oWAq0twd8L0")
.SetVersion("1.14.0");

manifest
Expand Down
14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.Resources/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@popperjs/core": "2.10.2",
"bootstrap": "5.1.3",
"bootstrap-scss": "5.1.3",
"bootstrap-select": "1.14.0-beta2",
"bootstrap-select": "1.14.0-beta3",
"nouislider": "15.7.0",
"codemirror": "5.65.7",
"jquery": "3.7.1",
Expand Down
281 changes: 162 additions & 119 deletions src/OrchardCore.Modules/OrchardCore.Resources/wwwroot/Scripts/bootstrap-select.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Resources/wwwroot/Scripts/bootstrap-select.min.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Resources/wwwroot/Styles/bootstrap-select.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* Bootstrap-select v1.14.0-beta2 (https://developer.snapappointments.com/bootstrap-select)
* Bootstrap-select v1.14.0-beta3 (https://developer.snapappointments.com/bootstrap-select)
*
* Copyright 2012-2021 SnapAppointments, LLC
* Copyright 2012-2022 SnapAppointments, LLC
* Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
*/

Expand Down Expand Up @@ -35,8 +35,7 @@ select.selectpicker {
display: none !important;
}
.bootstrap-select {
width: 220px \0;
/*IE9 and below*/
width: 220px;
vertical-align: middle;
}
.bootstrap-select > .dropdown-toggle {
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Resources/wwwroot/Styles/bootstrap-select.min.css
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions src/OrchardCore.Themes/TheAdmin/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Themes/TheAdmin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": {
"@popperjs/core": "2.11.5",
"bootstrap": "5.1.3",
"bootstrap-select": "1.14.0-beta2",
"bootstrap-select": "1.14.0-beta3",
"material-icons": "1.12.0",
"nouislider": "15.7.0"
}
Expand Down
4 changes: 2 additions & 2 deletions src/docs/reference/modules/Resources/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ The `OrchardCore.Resources` module provides some commonly used ones:
| bootstrap | Script | 4.6.1 | popper |
| bootstrap | Script | 5.1.3 | popperjs |
| bootstrap | Style | 4.6.1, 5.1.3 | - |
| bootstrap-select | Script | 1.14.0-beta2 | - |
| bootstrap-select | Style | 1.14.0-beta2 | - |
| bootstrap-select | Script | 1.14.0-beta3 | - |
| bootstrap-select | Style | 1.14.0-beta3 | - |
| codemirror | Script | 5.65.7 | - |
| codemirror | Style | 5.65.7 | - |
| font-awesome | Style | 6.4.2 | - |
Expand Down
2 changes: 1 addition & 1 deletion src/docs/resources/libraries/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The below table lists the different libraries used as Resources:
| Library | Usage | Version | License |
|--- | --- | --- | --- |
| [Bootstrap](https://github.com/twbs/bootstrap) | HTML, CSS, and JavaScript framework for developing responsive, mobile first projects on the web. | 5.1.3 | [MIT](https://github.com/twbs/bootstrap/blob/main/LICENSE) |
| [bootstrap-select](https://github.com/snapappointments/bootstrap-select) | jQuery plugin for select elements. | 1.14.0-beta2 | [MIT](https://github.com/snapappointments/bootstrap-select/blob/v1.14-dev/LICENSE) |
| [bootstrap-select](https://github.com/snapappointments/bootstrap-select) | jQuery plugin for select elements. | 1.14.0-beta3 | [MIT](https://github.com/snapappointments/bootstrap-select/blob/v1.14-dev/LICENSE) |
| [Code Mirror](https://github.com/codemirror/CodeMirror) | In-browser code editor. | 5.65.7 | [MIT](https://github.com/codemirror/CodeMirror/blob/master/LICENSE) |
| [Font Awesome](https://github.com/FortAwesome/Font-Awesome) | The iconic SVG, font, and CSS toolkit. | 6.4.2 | [Font Awesome Free License](https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt) |
| [jQuery](https://github.com/jquery/jquery) | jQuery JavaScript Library. | 3.7.1 | [MIT](https://github.com/jquery/jquery/blob/master/LICENSE.txt) |
Expand Down