Skip to content

docs: Switch to bootstrap 5, keeping bootstrap 3 css #1428

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
manthey merged 1 commit into from
Nov 18, 2025
Merged

docs: Switch to bootstrap 5, keeping bootstrap 3 css #1428

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
4 changes: 2 additions & 2 deletions examples/annotations/index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ block append mainContent
.modal-dialog
form.modal-content
.modal-header
button.close(type='button', data-dismiss='modal') ×
button.close(type='button', data-bs-dismiss='modal') ×
h4.modal-title Edit Annotation
.modal-body
.row
Expand Down Expand Up @@ -196,4 +196,4 @@ block append mainContent
#edit-validation-error
.modal-footer
button.btn.btn-sm.btn-primary#edit-update(type='submit') Update
button.btn.btn-sm.btn-secondary(data-dismiss='modal') Cancel
button.btn.btn-sm.btn-secondary(data-bs-dismiss='modal') Cancel
4 changes: 2 additions & 2 deletions examples/annotations/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* globals $, geo, utils */
/* globals $, geo, utils, bootstrap */

var annotationDebug = {};

Expand Down Expand Up @@ -489,7 +489,7 @@ function show_edit_dialog(id) {
dlg.one('shown.bs.modal', function () {
$('[option="name"]', dlg).focus();
});
dlg.modal();
new bootstrap.Modal(dlg[0]).show();
}

/**
Expand Down
6 changes: 3 additions & 3 deletions examples/common/index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ html(lang="en")
nav.navbar.navbar-default(role="navigation")
.container-fluid
.navbar-header
button.navbar-toggle(type="button", data-toggle="collapse", data-target="gj-navbar-collapse")
button.navbar-toggle(type="button", data-bs-toggle="collapse", data-bs-target="gj-navbar-collapse")
span.sr-only Toggle navigation
span.icon-bar
span.icon-bar
Expand All @@ -44,7 +44,7 @@ html(lang="en")
| Source
if !about.hidden
li
a.gj-show-about-link(href="#", data-toggle="modal", data-target="#about-modal")
a.gj-show-about-link(href="#", data-bs-toggle="modal", data-bs-target="#about-modal")
| About

if ! about.hidden
Expand All @@ -58,7 +58,7 @@ html(lang="en")
p.text-left !{about.text}
p.text-right © Kitware, Inc.
.modal-footer
button.btn.btn-primary(data-dismiss="modal", data-target="#about-modal") Close
button.btn.btn-primary(data-bs-dismiss="modal") Close

// Add the default main content element
block mainContent
Expand Down
7 changes: 4 additions & 3 deletions examples/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ require('../src/vendor');
window.geo = require('../src/index');

// bootstrap and themes
require('bootstrap/dist/css/bootstrap.css');
require('bootswatch/flatly/bootstrap.css');
require('bootstrap');
require('../website/legacycss/bootstrap3.min.css');
require('../website/legacycss/bootswatch_flatly3.min.css');
require('@fontsource/lato');
window.bootstrap = require('bootstrap/dist/js/bootstrap.bundle');

// codemirror and plugins
window.jsonlint = require('jsonlint-mod');
Expand Down
2 changes: 1 addition & 1 deletion examples/index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mixin thumbnail(ex)
block prepend headerButtons
ul.nav.navbar-nav.navbar-right
li.dropdown
a.dropdown-toggle(href="#", data-toggle="dropdown") Resources
a.dropdown-toggle(href="#", data-bs-toggle="dropdown") Resources
span.caret
ul.dropdown-menu(role="menu")
li
Expand Down
2 changes: 1 addition & 1 deletion examples/layerEvents/index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extends ../common/index.pug

block append mainContent
button.btn.btn-default.layer-toggle(type="button", data-toggle="button")
button.btn.btn-default.layer-toggle(type="button", data-bs-toggle="button")
4 changes: 2 additions & 2 deletions examples/measure/index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ block append mainContent
.modal-dialog
form.modal-content
.modal-header
button.close(type='button', data-dismiss='modal') ×
button.close(type='button', data-bs-dismiss='modal') ×
h4.modal-title Edit Annotation
.modal-body
.row
Expand Down Expand Up @@ -200,4 +200,4 @@ block append mainContent
#edit-validation-error
.modal-footer
button.btn.btn-sm.btn-primary#edit-update(type='submit') Update
button.btn.btn-sm.btn-secondary(data-dismiss='modal') Cancel
button.btn.btn-sm.btn-secondary(data-bs-dismiss='modal') Cancel
4 changes: 2 additions & 2 deletions examples/measure/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* globals $, geo, utils */
/* globals $, geo, utils, bootstrap */

// This is extensively based on the Annotation example.

Expand Down Expand Up @@ -697,7 +697,7 @@ function show_edit_dialog(id) {
dlg.one('shown.bs.modal', function () {
$('[option="name"]', dlg).focus();
});
dlg.modal();
new bootstrap.Modal(dlg[0]).show();
}

/**
Expand Down
6 changes: 3 additions & 3 deletions examples/transitions/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* globals $, d3, geo, utils */
/* globals $, d3, geo, utils, bootstrap */

// Run after the DOM loads
$(function () {
Expand Down Expand Up @@ -101,7 +101,7 @@ $(function () {
var modal = $(
'<div class="modal fade"><div class="modal-dialog">' +
'<div class="modal-content"><div class="modal-header">' +
'<button type="button" class="close" data-dismiss="modal">&times;' +
'<button type="button" class="close" data-bs-dismiss="modal">&times;' +
'</button><h4 class="modal-title">Test Results</h4></div>' +
'<div class="modal-body"/></div></div></div>'
);
Expand All @@ -115,7 +115,7 @@ $(function () {
};
$('.modal-body', modal).append($('<div/>').text(
JSON.stringify(report, undefined, 2)));
modal.modal();
new bootstrap.Modal(modal[0]).show();
}, maxrepeat * list.length * 2250);
});
});
96 changes: 73 additions & 23 deletions 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.

7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@egjs/hammerjs": "^2.0.8",
"d3": "^7.8.5",
"glslang-validator-prebuilt-predownloaded": "^0.0.2",
"vtk.js": "<32.10.0 || >32.10.0"
"vtk.js": "*"
},
"devDependencies": {
"@babel/core": "^7.17.0",
Expand All @@ -40,8 +40,8 @@
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
"babel-loader": "^10.0.0",
"babel-plugin-istanbul": "^7.0.0",
"bootstrap": "^3.4.1",
"bootswatch": "^3.4.1",
"bootstrap": "^5.0.0",
"bootswatch": "^5.0.0",
"codemirror": "^5.65.0",
"colorbrewer": "^1.6.0",
"css-loader": "^7.1.0",
Expand Down Expand Up @@ -86,6 +86,7 @@
"serve-index": "^1.9.1",
"shader-loader": "git+https://github.com/Makio64/shader-loader",
"sinon": "^21.0.0",
"startbootstrap-agency": "^7.0.12",
"style-loader": "^4.0.0",
"stylelint": "<16.3.0 || >16.3.0",
"stylelint-stylus": "^1.0.0",
Expand Down
6 changes: 3 additions & 3 deletions tutorials/common/index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ html(lang="en")
nav.navbar.navbar-default(role="navigation")
.container-fluid
.navbar-header
button.navbar-toggle(type="button", data-toggle="collapse", data-target="gj-navbar-collapse")
button.navbar-toggle(type="button", data-bs-toggle="collapse", data-bs-target="gj-navbar-collapse")
span.sr-only Toggle navigation
span.icon-bar
span.icon-bar
Expand All @@ -103,7 +103,7 @@ html(lang="en")
ul.nav.navbar-nav.navbar-right
if !about.hidden
li
a.gj-show-about-link(href="#", data-toggle="modal", data-target="#about-modal")
a.gj-show-about-link(href="#", data-bs-toggle="modal", data-bs-target="#about-modal")
| About

if !about.hidden
Expand All @@ -117,7 +117,7 @@ html(lang="en")
p.text-left !{about.text}
p.text-right © Kitware, Inc.
.modal-footer
button.btn.btn-primary(data-dismiss="modal", data-target="#about-modal") Close
button.btn.btn-primary(data-bs-dismiss="modal", data-bs-target="#about-modal") Close

// Add the default main content element
block mainContent
Expand Down
7 changes: 4 additions & 3 deletions tutorials/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ require('../src/vendor');
window.geo = require('../src/index');

// bootstrap and themes
require('bootstrap/dist/css/bootstrap.css');
require('bootswatch/flatly/bootstrap.css');
require('bootstrap');
require('../website/legacycss/bootstrap3.min.css');
require('../website/legacycss/bootswatch_flatly3.min.css');
require('@fontsource/lato');
window.bootstrap = require('bootstrap/dist/js/bootstrap.bundle');

// codemirror and plugins
window.jsonlint = require('jsonlint-mod');
Expand Down
2 changes: 1 addition & 1 deletion tutorials/index.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mixin thumbnail(ex)
block prepend headerButtons
ul.nav.navbar-nav.navbar-right
li.dropdown
a.dropdown-toggle(href="#", data-toggle="dropdown") Resources
a.dropdown-toggle(href="#", data-bs-toggle="dropdown") Resources
span.caret
ul.dropdown-menu(role="menu")
li
Expand Down
9 changes: 9 additions & 0 deletions website/legacycss/bootstrap3.min.css
View file
Open in desktop

Large diffs are not rendered by default.

72 changes: 72 additions & 0 deletions website/legacycss/bootswatch_flatly3.min.css
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ap/fonts/glyphicons-halflings-regular.eot → ...egacycss/glyphicons-halflings-regular.eot
View file
Open in desktop
File renamed without changes.
0 ...ap/fonts/glyphicons-halflings-regular.svg → ...egacycss/glyphicons-halflings-regular.svg
View file
Open in desktop
File renamed without changes
0 ...ap/fonts/glyphicons-halflings-regular.ttf → ...egacycss/glyphicons-halflings-regular.ttf
View file
Open in desktop
File renamed without changes.
0 ...p/fonts/glyphicons-halflings-regular.woff → ...gacycss/glyphicons-halflings-regular.woff
View file
Open in desktop
File renamed without changes.
0 .../fonts/glyphicons-halflings-regular.woff2 → ...acycss/glyphicons-halflings-regular.woff2
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions website/themes/agency/_config.yml
View file
Open in desktop

This file was deleted.

Loading