Skip to content

Commit

Permalink
(#285)(#383)(#385) Upgrade to Bootstrap 5.3.x
Browse files Browse the repository at this point in the history
This upgrades Bootstrap to 5.3.x. A large effort
was made to update choco-theme to use Bootstraps
css variables and dark mode settings. This will
help future upgrades to Bootstrap and choco-theme.
  • Loading branch information
st3phhays committed Apr 3, 2024
1 parent 506749f commit f896b8d
Show file tree
Hide file tree
Showing 125 changed files with 1,565 additions and 2,070 deletions.
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
"blockquotes",
"bluesky",
"Boxstarter",
"Btns",
"callouts",
"camelcase",
"choco",
"chocolateyfest",
"Chocolatiers",
"combinators",
"corepack",
"cssnano",
"datatables",
"DOCSEARCH",
Expand All @@ -24,6 +26,7 @@
"livestream",
"Livestreams",
"Luxon",
"Navbars",
"navigations",
"nouislider",
"offcanvas",
Expand All @@ -37,12 +40,15 @@
"splide",
"splidejs",
"stylelint",
"stylelintcache",
"svgstyles",
"tarekraafat",
"textbox",
"topnav",
"twbs",
"typeahead",
"webfonts",
"xmark"
"xmark",
"zindex"
]
}
123 changes: 63 additions & 60 deletions README.md

Large diffs are not rendered by default.

47 changes: 5 additions & 42 deletions images/global-shared/use.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions js/blog.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import './src/lib/prism.min.js';
import './src/chocolatey-alerts.js';
import './src/chocolatey-callouts.js';
import './src/ts/chocolatey-code.ts';
import './src/chocolatey-collapse-nested.js';
import './src/chocolatey-markdown.js';
import './src/chocolatey-anchors.js'; // This is dependent on the markdown script above
import './src/chocolatey-placeholders.js';
import './src/chocolatey-sticky-table.js';
import './src/chocolatey-substrings.js';
import './src/ts/chocolatey-tables.ts';
import './src/chocolatey-theme-toggle.js';
import './src/alerts.js';
import './src/callouts.js';
import './src/ts/code.ts';
import './src/collapse-nested.js';
import './src/markdown.js';
import './src/anchors.js'; // This is dependent on the markdown script above
import './src/placeholders.js';
import './src/sticky-table.js';
import './src/substrings.js';
import './src/ts/tables.ts';
import './src/theme-toggle.js';
28 changes: 14 additions & 14 deletions js/boxstarter.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import './src/lib/prism.min.js';
import './src/chocolatey-alerts.js';
import './src/chocolatey-clipboard.js';
import './src/chocolatey-callouts.js';
import './src/ts/chocolatey-code.ts';
import './src/chocolatey-collapse-nested.js';
import './src/chocolatey-collapse-responsive.js';
import './src/chocolatey-collapse-y-height.js';
import './src/chocolatey-docs.js';
import './src/chocolatey-markdown.js';
import './src/chocolatey-anchors.js'; // This is dependent on the markdown script above
import './src/chocolatey-scrollspy.js';
import './src/ts/chocolatey-tab-multiples.ts';
import './src/ts/chocolatey-tables.ts';
import './src/chocolatey-theme-toggle.js';
import './src/alerts.js';
import './src/clipboard.js';
import './src/callouts.js';
import './src/ts/code.ts';
import './src/collapse-nested.js';
import './src/collapse-responsive.js';
import './src/collapse-y-height.js';
import './src/docs.js';
import './src/markdown.js';
import './src/anchors.js'; // This is dependent on the markdown script above
import './src/scrollspy.js';
import './src/ts/tab-multiples.ts';
import './src/ts/tables.ts';
import './src/theme-toggle.js';
2 changes: 1 addition & 1 deletion js/community-package-differ.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import './src/chocolatey-package-differ.js';
import './src/package-differ.js';
2 changes: 1 addition & 1 deletion js/community-package-stats.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import './src/chocolatey-stats.js';
import './src/package-stats.js';
4 changes: 2 additions & 2 deletions js/community-packages.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import './community.js';
import './src/chocolatey-packages.js';
import './src/chocolatey-script-builder.js';
import './src/packages.js';
import './src/script-builder.js';
54 changes: 27 additions & 27 deletions js/community.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import './src/lib/prism.min.js';
import './src/chocolatey-alerts.js';
import './src/chocolatey-announcements.js';
import './src/chocolatey-authentication.js';
import './src/chocolatey-carousels.js';
import './src/chocolatey-clipboard.js';
import './src/chocolatey-callouts.js';
import './src/ts/chocolatey-code.ts';
import './src/chocolatey-collapse-nested.js';
import './src/chocolatey-collapse-responsive.js';
import './src/chocolatey-collapse-topnav.js';
import './src/chocolatey-collapse-y-height.js';
import './src/chocolatey-dropdown-hover.js';
import './src/chocolatey-courses.js';
import './src/chocolatey-internal-url.js';
import './src/chocolatey-lazyload.js';
import './src/chocolatey-loader.js';
import './src/chocolatey-markdown.js';
import './src/chocolatey-modal-auto-close.js';
import './src/chocolatey-org.js';
import './src/chocolatey-scrollspy.js';
import './src/chocolatey-search.js';
import './src/chocolatey-show-hide.js';
import './src/chocolatey-shuffle.js';
import './src/ts/chocolatey-tab-multiples.ts';
import './src/chocolatey-terminal.js';
import './src/chocolatey-tooltips.js';
import './src/chocolatey-theme-toggle.js';
import './src/alerts.js';
import './src/announcements.js';
import './src/authentication.js';
import './src/carousels.js';
import './src/clipboard.js';
import './src/callouts.js';
import './src/ts/code.ts';
import './src/collapse-nested.js';
import './src/collapse-responsive.js';
import './src/collapse-topnav.js';
import './src/collapse-y-height.js';
import './src/dropdown-hover.js';
import './src/courses.js';
import './src/internal-url.js';
import './src/lazyload.js';
import './src/loader.js';
import './src/markdown.js';
import './src/modal-auto-close.js';
import './src/org.js';
import './src/scrollspy.js';
import './src/search.js';
import './src/show-hide.js';
import './src/shuffle.js';
import './src/ts/tab-multiples.ts';
import './src/terminal.js';
import './src/tooltips.js';
import './src/theme-toggle.js';
30 changes: 15 additions & 15 deletions js/design.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import './src/lib/prism.min.js';
import './src/chocolatey-alerts.js';
import './src/chocolatey-code-copy-for-view.js'; // Purposely put before callouts.js because this script needs to execute first
import './src/chocolatey-callouts.js';
import './src/ts/chocolatey-code.ts';
import './src/chocolatey-collapse-nested.js';
import './src/chocolatey-collapse-responsive.js';
import './src/chocolatey-collapse-y-height.js';
import './src/chocolatey-docs.js';
import './src/chocolatey-lazyload.js';
import './src/chocolatey-markdown.js';
import './src/chocolatey-anchors.js'; // This is dependent on the markdown script above
import './src/chocolatey-scrollspy.js';
import './src/ts/chocolatey-tab-multiples.ts';
import './src/ts/chocolatey-tables.ts';
import './src/chocolatey-theme-toggle.js';
import './src/alerts.js';
import './src/code-copy-for-view.js'; // Purposely put before callouts.js because this script needs to execute first
import './src/callouts.js';
import './src/ts/code.ts';
import './src/collapse-nested.js';
import './src/collapse-responsive.js';
import './src/collapse-y-height.js';
import './src/docs.js';
import './src/lazyload.js';
import './src/markdown.js';
import './src/anchors.js'; // This is dependent on the markdown script above
import './src/scrollspy.js';
import './src/ts/tab-multiples.ts';
import './src/ts/tables.ts';
import './src/theme-toggle.js';
28 changes: 14 additions & 14 deletions js/docs.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import './src/lib/prism.min.js';
import './src/chocolatey-alerts.js';
import './src/chocolatey-callouts.js';
import './src/ts/chocolatey-code.ts';
import './src/chocolatey-collapse-nested.js';
import './src/chocolatey-collapse-responsive.js';
import './src/chocolatey-collapse-y-height.js';
import './src/chocolatey-docs.js';
import './src/chocolatey-docsearch.js';
import './src/chocolatey-markdown.js';
import './src/chocolatey-anchors.js'; // This is dependent on the markdown script above
import './src/chocolatey-scrollspy.js';
import './src/ts/chocolatey-tab-multiples.ts';
import './src/ts/chocolatey-tables.ts';
import './src/chocolatey-theme-toggle.js';
import './src/alerts.js';
import './src/callouts.js';
import './src/ts/code.ts';
import './src/collapse-nested.js';
import './src/collapse-responsive.js';
import './src/collapse-y-height.js';
import './src/docs.js';
import './src/docsearch.js';
import './src/markdown.js';
import './src/anchors.js'; // This is dependent on the markdown script above
import './src/scrollspy.js';
import './src/ts/tab-multiples.ts';
import './src/ts/tables.ts';
import './src/theme-toggle.js';
12 changes: 6 additions & 6 deletions js/fest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'lite-youtube-embed';
import './src/chocolatey-alerts.js';
import './src/chocolatey-callouts.js';
import './src/chocolatey-lazyload.js';
import './src/chocolatey-org.js';
import './src/chocolatey-sticky-top.js';
import './src/chocolatey-theme-toggle.js';
import './src/alerts.js';
import './src/callouts.js';
import './src/lazyload.js';
import './src/org.js';
import './src/sticky-top.js';
import './src/theme-toggle.js';
52 changes: 26 additions & 26 deletions js/org.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
import { atcb_init } from 'add-to-calendar-button'; // eslint-disable-line camelcase
import balanceText from 'balance-text';
import './src/lib/prism.min.js';
import './src/chocolatey-alerts.js';
import './src/chocolatey-announcements.js';
import './src/chocolatey-carousels.js';
import './src/chocolatey-clipboard.js';
import './src/chocolatey-callouts.js';
import './src/ts/chocolatey-code.ts';
import './src/chocolatey-collapse-nested.js';
import './src/chocolatey-collapse-responsive.js';
import './src/chocolatey-collapse-topnav.js';
import './src/chocolatey-collapse-y-height.js';
import './src/chocolatey-dropdown-hover.js';
import './src/chocolatey-internal-url.js';
import './src/chocolatey-lazyload.js';
import './src/chocolatey-loader.js';
import './src/chocolatey-markdown.js';
import './src/chocolatey-org.js';
import './src/chocolatey-pricing-calculator.js';
import './src/chocolatey-scrollspy.js';
import './src/chocolatey-show-hide.js';
import './src/chocolatey-shuffle.js';
import './src/chocolatey-splide.js';
import './src/chocolatey-sticky-top.js';
import './src/ts/chocolatey-tab-multiples.ts';
import './src/chocolatey-terminal.js';
import './src/chocolatey-theme-toggle.js';
import './src/chocolatey-toggle-fade-show.js';
import './src/alerts.js';
import './src/announcements.js';
import './src/carousels.js';
import './src/clipboard.js';
import './src/callouts.js';
import './src/ts/code.ts';
import './src/collapse-nested.js';
import './src/collapse-responsive.js';
import './src/collapse-topnav.js';
import './src/collapse-y-height.js';
import './src/dropdown-hover.js';
import './src/internal-url.js';
import './src/lazyload.js';
import './src/loader.js';
import './src/markdown.js';
import './src/org.js';
import './src/pricing-calculator.js';
import './src/scrollspy.js';
import './src/show-hide.js';
import './src/shuffle.js';
import './src/splide.js';
import './src/sticky-top.js';
import './src/ts/tab-multiples.ts';
import './src/terminal.js';
import './src/toggle-fade-show.js';
import './src/theme-toggle.js';
atcb_init();
balanceText();
16 changes: 8 additions & 8 deletions js/portal.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import './src/lib/prism.min.js';
import './src/chocolatey-callouts.js';
import './src/ts/chocolatey-code.ts';
import './src/chocolatey-collapse-nested.js';
import './src/chocolatey-collapse-responsive.js';
import './src/chocolatey-collapse-y-height.js';
import './src/chocolatey-markdown.js';
import './src/chocolatey-scrollspy.js';
import './src/chocolatey-theme-toggle.js';
import './src/callouts.js';
import './src/ts/code.ts';
import './src/collapse-nested.js';
import './src/collapse-responsive.js';
import './src/collapse-y-height.js';
import './src/markdown.js';
import './src/scrollspy.js';
import './src/reset-modal.js';
import './src/reset-toast.js';
import './src/status-modal.js';
import './src/theme-toggle.js';
2 changes: 1 addition & 1 deletion js/src/chocolatey-alerts.js → js/src/alerts.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getCookie, setCookieExpirationNever } from './util/chocolatey-functions';
import { getCookie, setCookieExpirationNever } from './util/functions';

(() => {
const topNoticeAlert = document.getElementById('topNoticeAlert');
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getCookie, setCookieExpirationNever } from './util/chocolatey-functions';
import { getCookie, setCookieExpirationNever } from './util/functions';

(() => {
// Show/Hide right side announcement bar notification badge
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion js/src/chocolatey-birthday.js → js/src/birthday.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import confetti from 'canvas-confetti';
import { getCookie, setCookieExpirationNever } from './util/chocolatey-functions';
import { getCookie, setCookieExpirationNever } from './util/functions';

(() => {
const searchParams = new URLSearchParams(window.location.search.toLowerCase());
Expand Down
2 changes: 1 addition & 1 deletion js/src/chocolatey-callouts.js → js/src/callouts.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
calloutHeaderText = calloutHeaderText.replace(/:.+?:/, '').trim();
}

const calloutHeaderContainer = `<div class="callout-header d-flex align-items-center"><span class="flex-shrink-0 text-bg-${calloutIconColor} h-30-px w-30-px d-flex align-items-center justify-content-center rounded me-3"><span class="fa-solid fa-${calloutIcon}"></span></span><p class="lead"><strong>${calloutHeaderText}</strong></p></div>`;
const calloutHeaderContainer = `<div class="callout-header d-flex align-items-center"><span class="flex-shrink-0 text-bg-${calloutIconColor} h-px-30 w-px-30 d-flex align-items-center justify-content-center rounded me-3"><span class="fa-solid fa-${calloutIcon}"></span></span><p class="lead"><strong>${calloutHeaderText}</strong></p></div>`;

calloutHeader.outerHTML = calloutHeaderContainer;
}
Expand Down
File renamed without changes.
Loading

0 comments on commit f896b8d

Please sign in to comment.