Skip to content

Merge Develop to the main branch #1048

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

Merged
jsjiang merged 13 commits into from
Aug 25, 2026
Merged

Merge Develop to the main branch #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1e89e1b
testing update to bootstrap from cdn
sfisher Aug 12, 2026
9c6633d
updating to jquery 4.0.0
sfisher Aug 12, 2026
8669807
Merge branch 'main' into update-bootstrap
jsjiang Aug 17, 2026
4a6138b
Merge branch 'main' into update-bootstrap
jsjiang Aug 19, 2026
6700ada
replace deprecated jquery use cases
jsjiang Aug 20, 2026
ac1c840
remove unused jquery.details.min.js; currently uses better-details-po…
jsjiang Aug 20, 2026
401207f
update for bootstrap 5
jsjiang Aug 21, 2026
52328bb
Fix pagination Go button form selector typo
Copilot Aug 21, 2026
21d46eb
Use jQuery submit in profileSimpleToAdvanced
Copilot Aug 21, 2026
fa95666
fix go to page bug
jsjiang Aug 21, 2026
b22deba
fix page navigation issue on dashboard
jsjiang Aug 21, 2026
f955b64
Merge pull request #1047 from CDLUC3/update-bootstrap_v2
jsjiang Aug 25, 2026
4dc71ff
Merge pull request #1043 from CDLUC3/update-bootstrap
jsjiang Aug 25, 2026
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 dev/component_accordion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Accordion Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_citation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Citation</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_cite.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Cite</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_customize-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Customize Table Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_download.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Download Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3>Geolocation Off</h3>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Header Component with Login Modal</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_home-banner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Home Banner Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_identifier-boxes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Identifier Boxes Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_login-menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Login Menu Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_login-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2>Login Modal Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_pagination.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Pagination Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_share.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Share Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_showhide.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Show / Hide Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_sidebox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Side Box Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Tab Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Table Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_table2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2>Scrollable Table Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_table3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Stackable Table v.2</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/component_testing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Testing</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/element_buttons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Button Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/element_fieldsets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Fieldsets</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/element_form-controls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Form Controls</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/element_headings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Heading Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion dev/element_links.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Link Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
Expand Down
3 changes: 1 addition & 2 deletions dev/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ <h2>Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-4.0.0.min.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/jquery-migrate-3.4.0.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/picturefill.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/js/main2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $(document).ready(function () {
$('#js-header__nav').attr('aria-expanded', 'false');

// Toggle classes and attributes:
$('#js-header__nav-button').click(function () {
$('#js-header__nav-button').on('click', function () {

$('#js-header__nav').toggleClass('header__nav header__nav--selected', 300, 'easeInOutCubic');

Expand All @@ -32,7 +32,7 @@ $(document).ready(function () {

$('#accordion__section-' + urlhash).attr('open', '');

$('.accordion__title').click(function () {
$('.accordion__title').on('click', function () {

// If an accordion title is clicked, close all the other sections if they are open and set their aria-expanded attributes to false:
if ($(this).parent().siblings().attr('open', '')) {
Expand Down
Loading