Bootstrap 5.2.3 update

Upgraded to Bootstrap 5.2.3 and adjusted for the changes to the scrollspy component
This commit is contained in:
David Miller 2023-03-24 15:05:00 -04:00
parent 51bec33d75
commit b2d5d5c6b1
10 changed files with 5027 additions and 3011 deletions

View File

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2022 Start Bootstrap LLC Copyright (c) 2013-2023 Start Bootstrap LLC
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -12,8 +12,6 @@
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/StartBootstrap/startbootstrap-agency/master/LICENSE) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/StartBootstrap/startbootstrap-agency/master/LICENSE)
[![npm version](https://img.shields.io/npm/v/startbootstrap-agency.svg)](https://www.npmjs.com/package/startbootstrap-agency) [![npm version](https://img.shields.io/npm/v/startbootstrap-agency.svg)](https://www.npmjs.com/package/startbootstrap-agency)
[![dependencies Status](https://david-dm.org/StartBootstrap/startbootstrap-agency/status.svg)](https://david-dm.org/StartBootstrap/startbootstrap-agency)
[![devDependencies Status](https://david-dm.org/StartBootstrap/startbootstrap-agency/dev-status.svg)](https://david-dm.org/StartBootstrap/startbootstrap-agency?type=dev)
## Download and Installation ## Download and Installation
@ -81,4 +79,4 @@ Start Bootstrap is based on the [Bootstrap](https://getbootstrap.com/) framework
## Copyright and License ## Copyright and License
Copyright 2013-2022 Start Bootstrap LLC. Code released under the [MIT](https://github.com/StartBootstrap/startbootstrap-agency/blob/master/LICENSE) license. Copyright 2013-2023 Start Bootstrap LLC. Code released under the [MIT](https://github.com/StartBootstrap/startbootstrap-agency/blob/master/LICENSE) license.

4873
dist/css/styles.css vendored

File diff suppressed because it is too large Load Diff

6
dist/index.html vendored
View File

@ -9,7 +9,7 @@
<!-- Favicon--> <!-- Favicon-->
<link rel="icon" type="image/x-icon" href="assets/favicon.ico" /> <link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
<!-- Font Awesome icons (free version)--> <!-- Font Awesome icons (free version)-->
<script src="https://use.fontawesome.com/releases/v6.1.0/js/all.js" crossorigin="anonymous"></script> <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<!-- Google fonts--> <!-- Google fonts-->
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css" /> <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css" /> <link href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css" />
@ -373,7 +373,7 @@
<footer class="footer py-4"> <footer class="footer py-4">
<div class="container"> <div class="container">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-lg-4 text-lg-start">Copyright &copy; Your Website 2022</div> <div class="col-lg-4 text-lg-start">Copyright &copy; Your Website 2023</div>
<div class="col-lg-4 my-3 my-lg-0"> <div class="col-lg-4 my-3 my-lg-0">
<a class="btn btn-dark btn-social mx-2" href="#!" aria-label="Twitter"><i class="fab fa-twitter"></i></a> <a class="btn btn-dark btn-social mx-2" href="#!" aria-label="Twitter"><i class="fab fa-twitter"></i></a>
<a class="btn btn-dark btn-social mx-2" href="#!" aria-label="Facebook"><i class="fab fa-facebook-f"></i></a> <a class="btn btn-dark btn-social mx-2" href="#!" aria-label="Facebook"><i class="fab fa-facebook-f"></i></a>
@ -598,7 +598,7 @@
</div> </div>
</div> </div>
<!-- Bootstrap core JS--> <!-- Bootstrap core JS-->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS--> <!-- Core theme JS-->
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *--> <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *-->

8
dist/js/scripts.js vendored
View File

@ -1,6 +1,6 @@
/*! /*!
* Start Bootstrap - Agency v7.0.11 (https://startbootstrap.com/theme/agency) * Start Bootstrap - Agency v7.0.12 (https://startbootstrap.com/theme/agency)
* Copyright 2013-2022 Start Bootstrap * Copyright 2013-2023 Start Bootstrap
* Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-agency/blob/master/LICENSE) * Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-agency/blob/master/LICENSE)
*/ */
// //
@ -29,12 +29,12 @@ window.addEventListener('DOMContentLoaded', event => {
// Shrink the navbar when page is scrolled // Shrink the navbar when page is scrolled
document.addEventListener('scroll', navbarShrink); document.addEventListener('scroll', navbarShrink);
// Activate Bootstrap scrollspy on the main nav element // Activate Bootstrap scrollspy on the main nav element
const mainNav = document.body.querySelector('#mainNav'); const mainNav = document.body.querySelector('#mainNav');
if (mainNav) { if (mainNav) {
new bootstrap.ScrollSpy(document.body, { new bootstrap.ScrollSpy(document.body, {
target: '#mainNav', target: '#mainNav',
offset: 74, rootMargin: '0px 0px -40%',
}); });
}; };

3116
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
{ {
"title": "Agency", "title": "Agency",
"name": "startbootstrap-agency", "name": "startbootstrap-agency",
"version": "7.0.11", "version": "7.0.12",
"scripts": { "scripts": {
"build": "npm run clean && npm run build:pug && npm run build:scss && npm run build:scripts && npm run build:assets", "build": "npm run clean && npm run build:pug && npm run build:scss && npm run build:scripts && npm run build:assets",
"build:assets": "node scripts/build-assets.js", "build:assets": "node scripts/build-assets.js",
@ -36,18 +36,18 @@
"url": "https://github.com/StartBootstrap/startbootstrap-agency.git" "url": "https://github.com/StartBootstrap/startbootstrap-agency.git"
}, },
"dependencies": { "dependencies": {
"bootstrap": "5.1.3" "bootstrap": "5.2.3"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "10.4.4", "autoprefixer": "10.4.14",
"browser-sync": "2.27.9", "browser-sync": "2.29.1",
"chokidar": "3.5.3", "chokidar": "3.5.3",
"concurrently": "6.3.0", "concurrently": "6.3.0",
"postcss": "8.4.12", "postcss": "8.4.21",
"prettier": "2.6.0", "prettier": "2.8.6",
"pug": "3.0.2", "pug": "3.0.2",
"sass": "1.49.9", "sass": "1.60.0",
"shelljs": "0.8.5", "shelljs": "0.8.5",
"upath": "2.0.1" "upath": "2.0.1"
} }
} }

View File

@ -24,12 +24,12 @@ window.addEventListener('DOMContentLoaded', event => {
// Shrink the navbar when page is scrolled // Shrink the navbar when page is scrolled
document.addEventListener('scroll', navbarShrink); document.addEventListener('scroll', navbarShrink);
// Activate Bootstrap scrollspy on the main nav element // Activate Bootstrap scrollspy on the main nav element
const mainNav = document.body.querySelector('#mainNav'); const mainNav = document.body.querySelector('#mainNav');
if (mainNav) { if (mainNav) {
new bootstrap.ScrollSpy(document.body, { new bootstrap.ScrollSpy(document.body, {
target: '#mainNav', target: '#mainNav',
offset: 74, rootMargin: '0px 0px -40%',
}); });
}; };

View File

@ -14,7 +14,7 @@ html(lang='en')
link(rel='icon', type='image/x-icon', href='assets/favicon.ico') link(rel='icon', type='image/x-icon', href='assets/favicon.ico')
// Font Awesome icons (free version) // Font Awesome icons (free version)
script(src='https://use.fontawesome.com/releases/v6.1.0/js/all.js', crossorigin='anonymous') script(src='https://use.fontawesome.com/releases/v6.3.0/js/all.js', crossorigin='anonymous')
// Google fonts // Google fonts
link(href='https://fonts.googleapis.com/css?family=Montserrat:400,700', rel='stylesheet', type='text/css') link(href='https://fonts.googleapis.com/css?family=Montserrat:400,700', rel='stylesheet', type='text/css')
@ -367,7 +367,7 @@ html(lang='en')
.container .container
.row.align-items-center .row.align-items-center
.col-lg-4.text-lg-start .col-lg-4.text-lg-start
| Copyright &copy; Your Website 2022 | Copyright &copy; Your Website 2023
.col-lg-4.my-3.my-lg-0 .col-lg-4.my-3.my-lg-0
a.btn.btn-dark.btn-social.mx-2(href='#!', aria-label='Twitter') a.btn.btn-dark.btn-social.mx-2(href='#!', aria-label='Twitter')
i.fab.fa-twitter i.fab.fa-twitter
@ -388,7 +388,7 @@ html(lang='en')
include includes/portfolio-modal-6 include includes/portfolio-modal-6
// Bootstrap core JS // Bootstrap core JS
script(src='https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js') script(src='https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js')
// Core theme JS // Core theme JS
script(src='js/scripts.js') script(src='js/scripts.js')

View File

@ -13,7 +13,8 @@ html {
body { body {
position: relative; position: relative;
overflow-x: hidden; // Disabled for now due to incompatibility with ScrollSpy in Bootstrap 5.2.x
// overflow-x: hidden;
} }
// Adjust the line height of paragraphs // Adjust the line height of paragraphs