From b5093c89f4f1c49e8bd27b5015a3c1a3410f26e3 Mon Sep 17 00:00:00 2001 From: David Miller Date: Mon, 18 May 2020 17:16:02 -0400 Subject: [PATCH 1/4] dependencies update with Bootstrap 4.5.0 --- dist/css/styles.css | 196 +++++++++++++++++++++++++++----------------- dist/index.html | 6 +- dist/js/scripts.js | 2 +- package-lock.json | 136 +++++++++++++++--------------- package.json | 18 ++-- src/pug/index.pug | 6 +- 6 files changed, 203 insertions(+), 161 deletions(-) diff --git a/dist/css/styles.css b/dist/css/styles.css index 6741482..abfa794 100644 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -1,13 +1,13 @@ @charset "UTF-8"; /*! -* Start Bootstrap - Agency v6.0.0 (https://startbootstrap.com/template-overviews/agency) +* Start Bootstrap - Agency v6.0.1 (https://startbootstrap.com/template-overviews/agency) * Copyright 2013-2020 Start Bootstrap * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-agency/blob/master/LICENSE) */ /*! - * Bootstrap v4.4.1 (https://getbootstrap.com/) - * Copyright 2011-2019 The Bootstrap Authors - * Copyright 2011-2019 Twitter, Inc. + * Bootstrap v4.5.0 (https://getbootstrap.com/) + * Copyright 2011-2020 The Bootstrap Authors + * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ :root { @@ -189,6 +189,7 @@ pre { margin-top: 0; margin-bottom: 1rem; overflow: auto; + -ms-overflow-style: scrollbar; } figure { @@ -256,6 +257,10 @@ select { text-transform: none; } +[role=button] { + cursor: pointer; +} + select { word-wrap: normal; } @@ -288,13 +293,6 @@ input[type=checkbox] { padding: 0; } -input[type=date], -input[type=time], -input[type=datetime-local], -input[type=month] { - -webkit-appearance: listbox; -} - textarea { overflow: auto; resize: vertical; @@ -629,6 +627,7 @@ pre code { .col { flex-basis: 0; flex-grow: 1; + min-width: 0; max-width: 100%; } @@ -836,6 +835,7 @@ pre code { .col-sm { flex-basis: 0; flex-grow: 1; + min-width: 0; max-width: 100%; } @@ -1047,6 +1047,7 @@ pre code { .col-md { flex-basis: 0; flex-grow: 1; + min-width: 0; max-width: 100%; } @@ -1258,6 +1259,7 @@ pre code { .col-lg { flex-basis: 0; flex-grow: 1; + min-width: 0; max-width: 100%; } @@ -1469,6 +1471,7 @@ pre code { .col-xl { flex-basis: 0; flex-grow: 1; + min-width: 0; max-width: 100%; } @@ -2047,6 +2050,15 @@ pre code { opacity: 1; } +input[type=date].form-control, +input[type=time].form-control, +input[type=datetime-local].form-control, +input[type=month].form-control { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + select.form-control:focus::-ms-value { color: #495057; background-color: #fff; @@ -2421,7 +2433,6 @@ textarea.form-control { color: #212529; text-align: center; vertical-align: middle; - cursor: pointer; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -2450,6 +2461,9 @@ textarea.form-control { .btn.disabled, .btn:disabled { opacity: 0.65; } +.btn:not(:disabled):not(.disabled) { + cursor: pointer; +} a.btn.disabled, fieldset:disabled a.btn { pointer-events: none; @@ -2906,7 +2920,6 @@ fieldset:disabled a.btn { } .btn-link:focus, .btn-link.focus { text-decoration: underline; - box-shadow: none; } .btn-link:disabled, .btn-link.disabled { color: #6c757d; @@ -3318,7 +3331,8 @@ input[type=button].btn-block { .input-group > .custom-select, .input-group > .custom-file { position: relative; - flex: 1 1 0%; + flex: 1 1 auto; + width: 1%; min-width: 0; margin-bottom: 0; } @@ -4277,7 +4291,7 @@ input[type=button].btn-block { border-color: rgba(0, 0, 0, 0.1); } .navbar-light .navbar-toggler-icon { - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%280, 0, 0, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); } .navbar-light .navbar-text { color: rgba(0, 0, 0, 0.5); @@ -4315,7 +4329,7 @@ input[type=button].btn-block { border-color: rgba(255, 255, 255, 0.1); } .navbar-dark .navbar-toggler-icon { - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); } .navbar-dark .navbar-text { color: rgba(255, 255, 255, 0.5); @@ -4342,13 +4356,19 @@ input[type=button].btn-block { margin-right: 0; margin-left: 0; } -.card > .list-group:first-child .list-group-item:first-child { - border-top-left-radius: 0.25rem; - border-top-right-radius: 0.25rem; +.card > .list-group { + border-top: inherit; + border-bottom: inherit; } -.card > .list-group:last-child .list-group-item:last-child { - border-bottom-right-radius: 0.25rem; - border-bottom-left-radius: 0.25rem; +.card > .list-group:first-child { + border-top-width: 0; + border-top-left-radius: calc(0.25rem - 1px); + border-top-right-radius: calc(0.25rem - 1px); +} +.card > .list-group:last-child { + border-bottom-width: 0; + border-bottom-right-radius: calc(0.25rem - 1px); + border-bottom-left-radius: calc(0.25rem - 1px); } .card-body { @@ -4544,6 +4564,9 @@ input[type=button].btn-block { border-radius: 0.25rem; } +.breadcrumb-item { + display: flex; +} .breadcrumb-item + .breadcrumb-item { padding-left: 0.5rem; } @@ -4946,6 +4969,7 @@ a.badge-dark:focus, a.badge-dark.focus { display: flex; height: 1rem; overflow: hidden; + line-height: 0; font-size: 0.75rem; background-color: #e9ecef; border-radius: 0.25rem; @@ -4998,6 +5022,7 @@ a.badge-dark:focus, a.badge-dark.focus { flex-direction: column; padding-left: 0; margin-bottom: 0; + border-radius: 0.25rem; } .list-group-item-action { @@ -5024,12 +5049,12 @@ a.badge-dark:focus, a.badge-dark.focus { border: 1px solid rgba(0, 0, 0, 0.125); } .list-group-item:first-child { - border-top-left-radius: 0.25rem; - border-top-right-radius: 0.25rem; + border-top-left-radius: inherit; + border-top-right-radius: inherit; } .list-group-item:last-child { - border-bottom-right-radius: 0.25rem; - border-bottom-left-radius: 0.25rem; + border-bottom-right-radius: inherit; + border-bottom-left-radius: inherit; } .list-group-item.disabled, .list-group-item:disabled { color: #6c757d; @@ -5053,22 +5078,22 @@ a.badge-dark:focus, a.badge-dark.focus { .list-group-horizontal { flex-direction: row; } -.list-group-horizontal .list-group-item:first-child { +.list-group-horizontal > .list-group-item:first-child { border-bottom-left-radius: 0.25rem; border-top-right-radius: 0; } -.list-group-horizontal .list-group-item:last-child { +.list-group-horizontal > .list-group-item:last-child { border-top-right-radius: 0.25rem; border-bottom-left-radius: 0; } -.list-group-horizontal .list-group-item.active { +.list-group-horizontal > .list-group-item.active { margin-top: 0; } -.list-group-horizontal .list-group-item + .list-group-item { +.list-group-horizontal > .list-group-item + .list-group-item { border-top-width: 1px; border-left-width: 0; } -.list-group-horizontal .list-group-item + .list-group-item.active { +.list-group-horizontal > .list-group-item + .list-group-item.active { margin-left: -1px; border-left-width: 1px; } @@ -5077,22 +5102,22 @@ a.badge-dark:focus, a.badge-dark.focus { .list-group-horizontal-sm { flex-direction: row; } - .list-group-horizontal-sm .list-group-item:first-child { + .list-group-horizontal-sm > .list-group-item:first-child { border-bottom-left-radius: 0.25rem; border-top-right-radius: 0; } - .list-group-horizontal-sm .list-group-item:last-child { + .list-group-horizontal-sm > .list-group-item:last-child { border-top-right-radius: 0.25rem; border-bottom-left-radius: 0; } - .list-group-horizontal-sm .list-group-item.active { + .list-group-horizontal-sm > .list-group-item.active { margin-top: 0; } - .list-group-horizontal-sm .list-group-item + .list-group-item { + .list-group-horizontal-sm > .list-group-item + .list-group-item { border-top-width: 1px; border-left-width: 0; } - .list-group-horizontal-sm .list-group-item + .list-group-item.active { + .list-group-horizontal-sm > .list-group-item + .list-group-item.active { margin-left: -1px; border-left-width: 1px; } @@ -5101,22 +5126,22 @@ a.badge-dark:focus, a.badge-dark.focus { .list-group-horizontal-md { flex-direction: row; } - .list-group-horizontal-md .list-group-item:first-child { + .list-group-horizontal-md > .list-group-item:first-child { border-bottom-left-radius: 0.25rem; border-top-right-radius: 0; } - .list-group-horizontal-md .list-group-item:last-child { + .list-group-horizontal-md > .list-group-item:last-child { border-top-right-radius: 0.25rem; border-bottom-left-radius: 0; } - .list-group-horizontal-md .list-group-item.active { + .list-group-horizontal-md > .list-group-item.active { margin-top: 0; } - .list-group-horizontal-md .list-group-item + .list-group-item { + .list-group-horizontal-md > .list-group-item + .list-group-item { border-top-width: 1px; border-left-width: 0; } - .list-group-horizontal-md .list-group-item + .list-group-item.active { + .list-group-horizontal-md > .list-group-item + .list-group-item.active { margin-left: -1px; border-left-width: 1px; } @@ -5125,22 +5150,22 @@ a.badge-dark:focus, a.badge-dark.focus { .list-group-horizontal-lg { flex-direction: row; } - .list-group-horizontal-lg .list-group-item:first-child { + .list-group-horizontal-lg > .list-group-item:first-child { border-bottom-left-radius: 0.25rem; border-top-right-radius: 0; } - .list-group-horizontal-lg .list-group-item:last-child { + .list-group-horizontal-lg > .list-group-item:last-child { border-top-right-radius: 0.25rem; border-bottom-left-radius: 0; } - .list-group-horizontal-lg .list-group-item.active { + .list-group-horizontal-lg > .list-group-item.active { margin-top: 0; } - .list-group-horizontal-lg .list-group-item + .list-group-item { + .list-group-horizontal-lg > .list-group-item + .list-group-item { border-top-width: 1px; border-left-width: 0; } - .list-group-horizontal-lg .list-group-item + .list-group-item.active { + .list-group-horizontal-lg > .list-group-item + .list-group-item.active { margin-left: -1px; border-left-width: 1px; } @@ -5149,35 +5174,33 @@ a.badge-dark:focus, a.badge-dark.focus { .list-group-horizontal-xl { flex-direction: row; } - .list-group-horizontal-xl .list-group-item:first-child { + .list-group-horizontal-xl > .list-group-item:first-child { border-bottom-left-radius: 0.25rem; border-top-right-radius: 0; } - .list-group-horizontal-xl .list-group-item:last-child { + .list-group-horizontal-xl > .list-group-item:last-child { border-top-right-radius: 0.25rem; border-bottom-left-radius: 0; } - .list-group-horizontal-xl .list-group-item.active { + .list-group-horizontal-xl > .list-group-item.active { margin-top: 0; } - .list-group-horizontal-xl .list-group-item + .list-group-item { + .list-group-horizontal-xl > .list-group-item + .list-group-item { border-top-width: 1px; border-left-width: 0; } - .list-group-horizontal-xl .list-group-item + .list-group-item.active { + .list-group-horizontal-xl > .list-group-item + .list-group-item.active { margin-left: -1px; border-left-width: 1px; } } -.list-group-flush .list-group-item { - border-right-width: 0; - border-left-width: 0; +.list-group-flush { border-radius: 0; } -.list-group-flush .list-group-item:first-child { - border-top-width: 0; +.list-group-flush > .list-group-item { + border-width: 0 0 1px; } -.list-group-flush:last-child .list-group-item:last-child { +.list-group-flush > .list-group-item:last-child { border-bottom-width: 0; } @@ -5314,9 +5337,6 @@ button.close { padding: 0; background-color: transparent; border: 0; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; } a.close.disabled { @@ -5430,6 +5450,9 @@ a.close.disabled { .modal-dialog-centered::before { display: block; height: calc(100vh - 1rem); + height: -webkit-min-content; + height: -moz-min-content; + height: min-content; content: ""; } .modal-dialog-centered.modal-dialog-scrollable { @@ -5538,6 +5561,9 @@ a.close.disabled { } .modal-dialog-centered::before { height: calc(100vh - 3.5rem); + height: -webkit-min-content; + height: -moz-min-content; + height: min-content; } .modal-sm { @@ -6014,6 +6040,7 @@ a.close.disabled { } 50% { opacity: 1; + transform: none; } } @@ -6023,6 +6050,7 @@ a.close.disabled { } 50% { opacity: 1; + transform: none; } } .spinner-grow { @@ -7290,6 +7318,27 @@ button.bg-dark:focus { float: none !important; } } +.user-select-all { + -webkit-user-select: all !important; + -moz-user-select: all !important; + -ms-user-select: all !important; + user-select: all !important; +} + +.user-select-auto { + -webkit-user-select: auto !important; + -moz-user-select: auto !important; + -ms-user-select: auto !important; + user-select: auto !important; +} + +.user-select-none { + -webkit-user-select: none !important; + -moz-user-select: none !important; + -ms-user-select: none !important; + user-select: none !important; +} + .overflow-auto { overflow: auto !important; } @@ -7445,18 +7494,6 @@ button.bg-dark:focus { height: 100vh !important; } -.stretched-link::after { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1; - pointer-events: auto; - content: ""; - background-color: rgba(0, 0, 0, 0); -} - .m-0 { margin: 0 !important; } @@ -9621,6 +9658,18 @@ button.bg-dark:focus { margin-left: auto !important; } } +.stretched-link::after { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1; + pointer-events: auto; + content: ""; + background-color: rgba(0, 0, 0, 0); +} + .text-monospace { font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important; } @@ -9840,8 +9889,7 @@ a.text-dark:hover, a.text-dark:focus { } .text-break { - word-break: break-word !important; - overflow-wrap: break-word !important; + word-wrap: break-word !important; } .text-reset { diff --git a/dist/index.html b/dist/index.html index c398c5c..ec46bf0 100644 --- a/dist/index.html +++ b/dist/index.html @@ -8,7 +8,7 @@ Agency - Start Bootstrap Theme - + @@ -486,8 +486,8 @@ - - + + diff --git a/dist/js/scripts.js b/dist/js/scripts.js index 9ef200d..8a272ba 100644 --- a/dist/js/scripts.js +++ b/dist/js/scripts.js @@ -1,5 +1,5 @@ /*! - * Start Bootstrap - Agency v6.0.0 (https://startbootstrap.com/template-overviews/agency) + * Start Bootstrap - Agency v6.0.1 (https://startbootstrap.com/template-overviews/agency) * Copyright 2013-2020 Start Bootstrap * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-agency/blob/master/LICENSE) */ diff --git a/package-lock.json b/package-lock.json index 2cffc22..18859e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,12 +29,6 @@ "negotiator": "0.6.2" } }, - "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", - "dev": true - }, "acorn-globals": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", @@ -186,18 +180,18 @@ "dev": true }, "autoprefixer": { - "version": "9.7.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz", - "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz", + "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==", "dev": true, "requires": { - "browserslist": "^4.11.1", - "caniuse-lite": "^1.0.30001039", + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001061", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.27", - "postcss-value-parser": "^4.0.3" + "postcss": "^7.0.30", + "postcss-value-parser": "^4.1.0" }, "dependencies": { "ansi-styles": { @@ -394,9 +388,9 @@ "dev": true }, "bootstrap": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", - "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==" + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz", + "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==" }, "brace-expansion": { "version": "1.1.11", @@ -524,13 +518,13 @@ } }, "browserslist": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz", - "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001038", - "electron-to-chromium": "^1.3.390", + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", "node-releases": "^1.1.53", "pkg-up": "^2.0.0" } @@ -583,9 +577,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001039", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz", - "integrity": "sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==", + "version": "1.0.30001061", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz", + "integrity": "sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==", "dev": true }, "center-align": { @@ -621,9 +615,9 @@ } }, "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -633,7 +627,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" + "readdirp": "~3.4.0" }, "dependencies": { "anymatch": { @@ -671,9 +665,9 @@ } }, "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "dev": true, "optional": true }, @@ -702,12 +696,12 @@ "dev": true }, "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, "requires": { - "picomatch": "^2.0.7" + "picomatch": "^2.2.1" } }, "to-regex-range": { @@ -834,9 +828,9 @@ "dev": true }, "concurrently": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-5.1.0.tgz", - "integrity": "sha512-9ViZMu3OOCID3rBgU31mjBftro2chOop0G2u1olq1OuwRBVRw/GxHTg80TVJBUTJfoswMmEUeuOg1g1yu1X2dA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-5.2.0.tgz", + "integrity": "sha512-XxcDbQ4/43d6CxR7+iV8IZXhur4KbmEJk1CetVMUqCy34z9l0DkszbY+/9wvmSnToTej0SYomc2WSRH+L0zVJw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -1155,9 +1149,9 @@ "dev": true }, "date-fns": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.1.tgz", - "integrity": "sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.14.0.tgz", + "integrity": "sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==", "dev": true }, "debug": { @@ -1271,9 +1265,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.397", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz", - "integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==", + "version": "1.3.441", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz", + "integrity": "sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==", "dev": true }, "emoji-regex": { @@ -2199,9 +2193,9 @@ "dev": true }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -2896,9 +2890,9 @@ "dev": true }, "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==", + "version": "1.1.55", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", + "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==", "dev": true }, "normalize-package-data": { @@ -3148,9 +3142,9 @@ } }, "picomatch": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", "dev": true }, "pify": { @@ -3211,9 +3205,9 @@ "dev": true }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.30", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz", + "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -3270,15 +3264,15 @@ } }, "postcss-value-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", - "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, "prettier": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz", - "integrity": "sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", "dev": true }, "process-nextick-args": { @@ -3698,9 +3692,9 @@ "dev": true }, "sass": { - "version": "1.26.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.3.tgz", - "integrity": "sha512-5NMHI1+YFYw4sN3yfKjpLuV9B5l7MqQ6FlkTcC4FT+oHbBRUZoSjHrrt/mE0nFXJyY2kQtU9ou9HxvFVjLFuuw==", + "version": "1.26.5", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz", + "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" @@ -3884,9 +3878,9 @@ "dev": true }, "shelljs": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", - "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", "dev": true, "requires": { "glob": "^7.0.0", @@ -4370,9 +4364,9 @@ "dev": true }, "tslib": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", "dev": true }, "ua-parser-js": { diff --git a/package.json b/package.json index 438c3d0..3390b01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "Agency", "name": "startbootstrap-agency", - "version": "6.0.0", + "version": "6.0.1", "scripts": { "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", @@ -36,17 +36,17 @@ "url": "https://github.com/BlackrockDigital/startbootstrap-agency.git" }, "dependencies": { - "bootstrap": "4.4.1" + "bootstrap": "4.5.0" }, "devDependencies": { - "autoprefixer": "9.7.6", + "autoprefixer": "9.8.0", "browser-sync": "2.26.7", - "chokidar": "3.3.1", - "concurrently": "5.1.0", - "postcss": "7.0.27", - "prettier": "2.0.4", + "chokidar": "3.4.0", + "concurrently": "5.2.0", + "postcss": "7.0.30", + "prettier": "2.0.5", "pug": "2.0.4", - "sass": "1.26.3", - "shelljs": "0.8.3" + "sass": "1.26.5", + "shelljs": "0.8.4" } } diff --git a/src/pug/index.pug b/src/pug/index.pug index 4f670e7..fafeb5f 100644 --- a/src/pug/index.pug +++ b/src/pug/index.pug @@ -13,7 +13,7 @@ html(lang='en') link(rel='icon', type='image/x-icon', href='assets/img/favicon.ico') // Font Awesome icons (free version) - script(src='https://use.fontawesome.com/releases/v5.12.1/js/all.js', crossorigin='anonymous') + script(src='https://use.fontawesome.com/releases/v5.13.0/js/all.js', crossorigin='anonymous') // Google fonts link(href='https://fonts.googleapis.com/css?family=Montserrat:400,700', rel='stylesheet', type='text/css') @@ -451,8 +451,8 @@ html(lang='en') | Close Project // Bootstrap core JS - script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js') - script(src='https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js') + script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js') + script(src='https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.bundle.min.js') // Third party plugin JS script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js') From 9d1f6d6494417785ef0abed6a4af512c955eb443 Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 20 May 2020 15:36:28 -0400 Subject: [PATCH 2/4] fix contact form --- src/assets/mail/contact_me.js | 153 ++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 70 deletions(-) diff --git a/src/assets/mail/contact_me.js b/src/assets/mail/contact_me.js index d534819..2a13ab7 100644 --- a/src/assets/mail/contact_me.js +++ b/src/assets/mail/contact_me.js @@ -1,75 +1,88 @@ -$(function() { +$(function () { + $( + "#contactForm input,#contactForm textarea,#contactForm button" + ).jqBootstrapValidation({ + preventSubmit: true, + submitError: function ($form, event, errors) { + // additional error messages or events + }, + submitSuccess: function ($form, event) { + event.preventDefault(); // prevent default submit behaviour + // get values from FORM + var name = $("input#name").val(); + var email = $("input#email").val(); + var phone = $("input#phone").val(); + var message = $("textarea#message").val(); + var firstName = name; // For Success/Failure Message + // Check for white space in name for Success/Fail message + if (firstName.indexOf(" ") >= 0) { + firstName = name.split(" ").slice(0, -1).join(" "); + } + $this = $("#sendMessageButton"); + $this.prop("disabled", true); // Disable submit button until AJAX call is complete to prevent duplicate messages + $.ajax({ + url: "/assets/mail/contact_me.php", + type: "POST", + data: { + name: name, + phone: phone, + email: email, + message: message, + }, + cache: false, + success: function () { + // Success message + $("#success").html("
"); + $("#success > .alert-success") + .html( + ""); + $("#success > .alert-success").append( + "Your message has been sent. " + ); + $("#success > .alert-success").append("
"); + //clear all fields + $("#contactForm").trigger("reset"); + }, + error: function () { + // Fail message + $("#success").html("
"); + $("#success > .alert-danger") + .html( + ""); + $("#success > .alert-danger").append( + $("").text( + "Sorry " + + firstName + + ", it seems that my mail server is not responding. Please try again later!" + ) + ); + $("#success > .alert-danger").append("
"); + //clear all fields + $("#contactForm").trigger("reset"); + }, + complete: function () { + setTimeout(function () { + $this.prop("disabled", false); // Re-enable submit button when AJAX call is complete + }, 1000); + }, + }); + }, + filter: function () { + return $(this).is(":visible"); + }, + }); - $("#contactForm input,#contactForm textarea").jqBootstrapValidation({ - preventSubmit: true, - submitError: function($form, event, errors) { - // additional error messages or events - }, - submitSuccess: function($form, event) { - event.preventDefault(); // prevent default submit behaviour - // get values from FORM - var name = $("input#name").val(); - var email = $("input#email").val(); - var phone = $("input#phone").val(); - var message = $("textarea#message").val(); - var firstName = name; // For Success/Failure Message - // Check for white space in name for Success/Fail message - if (firstName.indexOf(' ') >= 0) { - firstName = name.split(' ').slice(0, -1).join(' '); - } - $this = $("#sendMessageButton"); - $this.prop("disabled", true); // Disable submit button until AJAX call is complete to prevent duplicate messages - $.ajax({ - url: "contact_me.php", - type: "POST", - data: { - name: name, - phone: phone, - email: email, - message: message - }, - cache: false, - success: function() { - // Success message - $('#success').html("
"); - $('#success > .alert-success').html(""); - $('#success > .alert-success') - .append("Your message has been sent. "); - $('#success > .alert-success') - .append('
'); - //clear all fields - $('#contactForm').trigger("reset"); - }, - error: function() { - // Fail message - $('#success').html("
"); - $('#success > .alert-danger').html(""); - $('#success > .alert-danger').append($("").text("Sorry " + firstName + ", it seems that my mail server is not responding. Please try again later!")); - $('#success > .alert-danger').append('
'); - //clear all fields - $('#contactForm').trigger("reset"); - }, - complete: function() { - setTimeout(function() { - $this.prop("disabled", false); // Re-enable submit button when AJAX call is complete - }, 1000); - } - }); - }, - filter: function() { - return $(this).is(":visible"); - }, - }); - - $("a[data-toggle=\"tab\"]").click(function(e) { - e.preventDefault(); - $(this).tab("show"); - }); + $('a[data-toggle="tab"]').click(function (e) { + e.preventDefault(); + $(this).tab("show"); + }); }); /*When clicking on Full hide fail/success boxes */ -$('#name').focus(function() { - $('#success').html(''); +$("#name").focus(function () { + $("#success").html(""); }); From afa129d583d941e303bfc44d1993cc8e87a47284 Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 20 May 2020 15:48:51 -0400 Subject: [PATCH 3/4] build contact form fix --- dist/assets/mail/contact_me.js | 153 ++++++++++++++++++--------------- 1 file changed, 83 insertions(+), 70 deletions(-) diff --git a/dist/assets/mail/contact_me.js b/dist/assets/mail/contact_me.js index d534819..2a13ab7 100644 --- a/dist/assets/mail/contact_me.js +++ b/dist/assets/mail/contact_me.js @@ -1,75 +1,88 @@ -$(function() { +$(function () { + $( + "#contactForm input,#contactForm textarea,#contactForm button" + ).jqBootstrapValidation({ + preventSubmit: true, + submitError: function ($form, event, errors) { + // additional error messages or events + }, + submitSuccess: function ($form, event) { + event.preventDefault(); // prevent default submit behaviour + // get values from FORM + var name = $("input#name").val(); + var email = $("input#email").val(); + var phone = $("input#phone").val(); + var message = $("textarea#message").val(); + var firstName = name; // For Success/Failure Message + // Check for white space in name for Success/Fail message + if (firstName.indexOf(" ") >= 0) { + firstName = name.split(" ").slice(0, -1).join(" "); + } + $this = $("#sendMessageButton"); + $this.prop("disabled", true); // Disable submit button until AJAX call is complete to prevent duplicate messages + $.ajax({ + url: "/assets/mail/contact_me.php", + type: "POST", + data: { + name: name, + phone: phone, + email: email, + message: message, + }, + cache: false, + success: function () { + // Success message + $("#success").html("
"); + $("#success > .alert-success") + .html( + ""); + $("#success > .alert-success").append( + "Your message has been sent. " + ); + $("#success > .alert-success").append("
"); + //clear all fields + $("#contactForm").trigger("reset"); + }, + error: function () { + // Fail message + $("#success").html("
"); + $("#success > .alert-danger") + .html( + ""); + $("#success > .alert-danger").append( + $("").text( + "Sorry " + + firstName + + ", it seems that my mail server is not responding. Please try again later!" + ) + ); + $("#success > .alert-danger").append("
"); + //clear all fields + $("#contactForm").trigger("reset"); + }, + complete: function () { + setTimeout(function () { + $this.prop("disabled", false); // Re-enable submit button when AJAX call is complete + }, 1000); + }, + }); + }, + filter: function () { + return $(this).is(":visible"); + }, + }); - $("#contactForm input,#contactForm textarea").jqBootstrapValidation({ - preventSubmit: true, - submitError: function($form, event, errors) { - // additional error messages or events - }, - submitSuccess: function($form, event) { - event.preventDefault(); // prevent default submit behaviour - // get values from FORM - var name = $("input#name").val(); - var email = $("input#email").val(); - var phone = $("input#phone").val(); - var message = $("textarea#message").val(); - var firstName = name; // For Success/Failure Message - // Check for white space in name for Success/Fail message - if (firstName.indexOf(' ') >= 0) { - firstName = name.split(' ').slice(0, -1).join(' '); - } - $this = $("#sendMessageButton"); - $this.prop("disabled", true); // Disable submit button until AJAX call is complete to prevent duplicate messages - $.ajax({ - url: "contact_me.php", - type: "POST", - data: { - name: name, - phone: phone, - email: email, - message: message - }, - cache: false, - success: function() { - // Success message - $('#success').html("
"); - $('#success > .alert-success').html(""); - $('#success > .alert-success') - .append("Your message has been sent. "); - $('#success > .alert-success') - .append('
'); - //clear all fields - $('#contactForm').trigger("reset"); - }, - error: function() { - // Fail message - $('#success').html("
"); - $('#success > .alert-danger').html(""); - $('#success > .alert-danger').append($("").text("Sorry " + firstName + ", it seems that my mail server is not responding. Please try again later!")); - $('#success > .alert-danger').append('
'); - //clear all fields - $('#contactForm').trigger("reset"); - }, - complete: function() { - setTimeout(function() { - $this.prop("disabled", false); // Re-enable submit button when AJAX call is complete - }, 1000); - } - }); - }, - filter: function() { - return $(this).is(":visible"); - }, - }); - - $("a[data-toggle=\"tab\"]").click(function(e) { - e.preventDefault(); - $(this).tab("show"); - }); + $('a[data-toggle="tab"]').click(function (e) { + e.preventDefault(); + $(this).tab("show"); + }); }); /*When clicking on Full hide fail/success boxes */ -$('#name').focus(function() { - $('#success').html(''); +$("#name").focus(function () { + $("#success").html(""); }); From da78aa8558b1a655f10c7a608a9b75d37293d0df Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 20 May 2020 15:51:11 -0400 Subject: [PATCH 4/4] html cleanup --- dist/index.html | 18 +++++++++--------- src/pug/index.pug | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dist/index.html b/dist/index.html index ec46bf0..193db5d 100644 --- a/dist/index.html +++ b/dist/index.html @@ -20,7 +20,7 @@