diff --git a/lib/sgds/package-lock.json b/lib/sgds/package-lock.json index aa7f00bd..88acc6ab 100644 --- a/lib/sgds/package-lock.json +++ b/lib/sgds/package-lock.json @@ -9,7 +9,7 @@ "version": "2.3.4", "license": "MIT", "dependencies": { - "bootstrap": "5.1.3" + "bootstrap": "~5.2.0" }, "devDependencies": { "concurrently": "^7.0.0", @@ -141,6 +141,7 @@ "version": "2.11.8", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", "peer": true, "funding": { "type": "opencollective", @@ -530,15 +531,22 @@ "dev": true }, "node_modules/bootstrap": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", - "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "license": "MIT", "peerDependencies": { - "@popperjs/core": "^2.10.2" + "@popperjs/core": "^2.11.6" } }, "node_modules/braces": { diff --git a/lib/sgds/package.json b/lib/sgds/package.json index b7bf6d9b..945ed68c 100644 --- a/lib/sgds/package.json +++ b/lib/sgds/package.json @@ -30,6 +30,6 @@ "webpack-cli": "^5.1.4" }, "dependencies": { - "bootstrap": "5.1.3" + "bootstrap": "~5.2.0" } } diff --git a/lib/sgds/sass/_maps.scss b/lib/sgds/sass/_maps.scss new file mode 100644 index 00000000..e5ce562f --- /dev/null +++ b/lib/sgds/sass/_maps.scss @@ -0,0 +1 @@ +@import "~bootstrap/scss/maps"; \ No newline at end of file diff --git a/lib/sgds/sass/_tooltip.scss b/lib/sgds/sass/_tooltip.scss index a514f33e..829f9567 100644 --- a/lib/sgds/sass/_tooltip.scss +++ b/lib/sgds/sass/_tooltip.scss @@ -1,6 +1,7 @@ @import "~bootstrap/scss/tooltip"; .sgds{ &.tooltip{ + position: absolute; .tooltip-inner{ display: flex; gap: 2rem; diff --git a/lib/sgds/sass/_variables.scss b/lib/sgds/sass/_variables.scss index 948fecf7..020bd247 100644 --- a/lib/sgds/sass/_variables.scss +++ b/lib/sgds/sass/_variables.scss @@ -399,6 +399,7 @@ $enable-transitions: true !default; $enable-reduced-motion: true !default; $enable-smooth-scroll: true !default; $enable-grid-classes: true !default; +$enable-container-classes: true !default; $enable-cssgrid: false !default; $enable-button-pointers: true !default; $enable-rfs: true !default; @@ -551,7 +552,7 @@ $grid-row-columns: 6 !default; $gutters: $spacers !default; // Container padding -$container-padding-x: $grid-gutter-width * .5 !default; +$container-padding-x: $grid-gutter-width / .5 !default; // Components @@ -566,13 +567,17 @@ $border-widths: (1: 1px, 4: 4px, 5: 5px) !default; +$border-style: solid !default; $border-color: $gray-400 !default; +$border-color-translucent: rgba($black, .175) !default; // scss-docs-end border-variables // scss-docs-start border-radius-variables $border-radius: .3125rem !default; $border-radius-sm: .2rem !default; $border-radius-lg: .3rem !default; +$border-radius-xl: 1rem !default; +$border-radius-2xl: 2rem !default; $border-radius-pill: 50rem !default; // scss-docs-end border-radius-variables @@ -653,6 +658,7 @@ $font-size-lg: $font-size-base * 1.25 !default; $font-weight-lighter: lighter !default; $font-weight-light: 300 !default; $font-weight-normal: 400 !default; +$font-weight-semibold: 600 !default; $font-weight-bold: 700 !default; $font-weight-bolder: bolder !default; @@ -710,6 +716,8 @@ $display-font-sizes: ( 6: $h6-font-size ) !default; +$display-font-family: null !default; +$display-font-style: null !default; $display-font-weight: $font-weight-bold !default; $display-line-height: $headings-line-height !default; // scss-docs-end display-headings @@ -733,7 +741,11 @@ $blockquote-footer-font-size: $small-font-size !default; $hr-margin-y: $spacer !default; $hr-color: inherit !default; +$hr-bg-color: null !default; // Deprecated in v5.2.0 $hr-height: $border-width !default; +$hr-border-color: null !default; // Allows for inherited colors +$hr-border-width: $border-width !default; + $hr-opacity: .25 !default; $legend-margin-bottom: .5rem !default; @@ -799,6 +811,7 @@ $table-border-width: $border-width !default; $table-border-color: $gray-400 !default; $table-striped-order: odd !default; +$table-striped-columns-order: even !default; $table-group-separator-color: currentColor !default; @@ -939,6 +952,7 @@ $input-padding-x-lg: $input-btn-padding-x-lg !default; $input-font-size-lg: $input-btn-font-size-lg !default; $input-bg: $body-bg !default; +$input-disabled-color: null !default; $input-disabled-bg: $gray-200 !default; $input-disabled-border-color: null !default; @@ -1161,6 +1175,8 @@ $zindex-modal-backdrop: 1050 !default; $zindex-modal: 1055 !default; $zindex-popover: 1070 !default; $zindex-tooltip: 1080 !default; +$zindex-toast: 1090 !default; + // scss-docs-end zindex-stack @@ -1286,7 +1302,9 @@ $dropdown-item-padding-y: $spacer * .25 !default; $dropdown-item-padding-x: $spacer !default; $dropdown-header-color: $gray-600 !default; -$dropdown-header-padding: $dropdown-padding-y $dropdown-item-padding-x !default; +$dropdown-header-padding-x: $dropdown-item-padding-x !default; +$dropdown-header-padding-y: $dropdown-padding-y !default; +$dropdown-header-padding: $dropdown-header-padding-y $dropdown-header-padding-x !default; // scss-docs-end dropdown-variables // scss-docs-start dropdown-dark-variables @@ -1315,6 +1333,9 @@ $pagination-padding-x-sm: .5rem !default; $pagination-padding-y-lg: .75rem !default; $pagination-padding-x-lg: 1.5rem !default; +$pagination-font-size: $font-size-base !default; + + $pagination-color: $link-color !default; $pagination-bg: $white !default; $pagination-border-width: $border-width !default; @@ -1460,6 +1481,7 @@ $popover-border-radius: $border-radius-lg !default; $popover-inner-border-radius: subtract($popover-border-radius, $popover-border-width) !default; $popover-box-shadow: $box-shadow !default; +$popover-header-font-size: $font-size-base !default; $popover-header-bg: shade-color($popover-bg, 6%) !default; $popover-header-color: $headings-color !default; $popover-header-padding-y: .5rem !default; @@ -1548,13 +1570,15 @@ $modal-content-box-shadow-sm-up: $box-shadow !default; $modal-backdrop-bg: $black !default; $modal-backdrop-opacity: .5 !default; $modal-header-border-color: $border-color !default; -$modal-footer-border-color: transparent !default; $modal-header-border-width: $modal-content-border-width !default; -$modal-footer-border-width: $modal-header-border-width !default; $modal-header-padding-y: $modal-inner-padding !default; $modal-header-padding-x: $modal-inner-padding !default; $modal-header-padding: $modal-header-padding-y $modal-header-padding-x !default; // Keep this for backwards compatibility +$modal-footer-bg: null !default; +$modal-footer-border-color: transparent !default; +$modal-footer-border-width: $modal-header-border-width !default; + $modal-sm: 300px !default; $modal-md: 500px !default; $modal-lg: 800px !default; diff --git a/lib/sgds/sass/sgds.scss b/lib/sgds/sass/sgds.scss index abb529ac..0a4dbe09 100644 --- a/lib/sgds/sass/sgds.scss +++ b/lib/sgds/sass/sgds.scss @@ -3,6 +3,7 @@ // Configuration @import "functions"; @import "variables"; +@import "maps"; @import "mixins"; @import "utilities"; diff --git a/portal/_includes/head.html b/portal/_includes/head.html index d567242c..1b8d5323 100644 --- a/portal/_includes/head.html +++ b/portal/_includes/head.html @@ -24,6 +24,7 @@ {% assign latestVersion = site.data.npm-sgds-web-component-latest-metadata.objects[0].package.version %} +