diff --git a/src/themes/default/src/scss/_accordion.scss b/src/themes/default/src/scss/_accordion.scss index b05420694..9a0a6d6ef 100644 --- a/src/themes/default/src/scss/_accordion.scss +++ b/src/themes/default/src/scss/_accordion.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + .accordion-button { &:focus-visible { box-shadow: none; diff --git a/src/themes/default/src/scss/_alert.scss b/src/themes/default/src/scss/_alert.scss index 60853c55e..64a3bbf59 100644 --- a/src/themes/default/src/scss/_alert.scss +++ b/src/themes/default/src/scss/_alert.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + .alert-light { border-color: $light; background: $white; diff --git a/src/themes/default/src/scss/_badge.scss b/src/themes/default/src/scss/_badge.scss index 1a54422a4..4eeab2d29 100644 --- a/src/themes/default/src/scss/_badge.scss +++ b/src/themes/default/src/scss/_badge.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // Standalone badges .badge { font-size: $badge-font-size; diff --git a/src/themes/default/src/scss/_banners.scss b/src/themes/default/src/scss/_banners.scss index 207d45b74..093b3ee01 100644 --- a/src/themes/default/src/scss/_banners.scss +++ b/src/themes/default/src/scss/_banners.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + /* stylelint-disable no-descending-specificity, declaration-no-important */ // Banners .bcl-banner { diff --git a/src/themes/default/src/scss/_bcl-theme.scss b/src/themes/default/src/scss/_bcl-theme.scss new file mode 100644 index 000000000..21082647f --- /dev/null +++ b/src/themes/default/src/scss/_bcl-theme.scss @@ -0,0 +1,12 @@ +// Shared Sass dependencies for BCL components. +// This file keeps using @import internally because Bootstrap 5 still relies on the global scope. +// Consumers should @use this file to ensure the legacy globals are available without errors. +@import "@openeuropa/bcl-bootstrap/scss/functions"; +@import "@openeuropa/bcl-bootstrap/scss/variables"; +@import "@openeuropa/bcl-bootstrap/scss/maps"; +@import "@openeuropa/bcl-bootstrap/scss/mixins"; +@import "@openeuropa/bcl-bootstrap/scss/utilities"; + +@import "base/colors"; +@import "base/variables"; +@import "base/mixins"; diff --git a/src/themes/default/src/scss/_blockquote.scss b/src/themes/default/src/scss/_blockquote.scss index 5d5af65da..7f150ddcf 100644 --- a/src/themes/default/src/scss/_blockquote.scss +++ b/src/themes/default/src/scss/_blockquote.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + //Blockquote .blockquote-footer { color: $text-muted; diff --git a/src/themes/default/src/scss/_breadcrumb.scss b/src/themes/default/src/scss/_breadcrumb.scss index c419b5b94..3433145d2 100644 --- a/src/themes/default/src/scss/_breadcrumb.scss +++ b/src/themes/default/src/scss/_breadcrumb.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + @include media-breakpoint-down(md) { .breadcrumb-item + .breadcrumb-item { padding-left: 0; diff --git a/src/themes/default/src/scss/_button.scss b/src/themes/default/src/scss/_button.scss index b6dae2698..92c832a7e 100644 --- a/src/themes/default/src/scss/_button.scss +++ b/src/themes/default/src/scss/_button.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // Button .btn { display: inline-flex; diff --git a/src/themes/default/src/scss/_card.scss b/src/themes/default/src/scss/_card.scss index c20796697..fede5e9cb 100644 --- a/src/themes/default/src/scss/_card.scss +++ b/src/themes/default/src/scss/_card.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + .card { border-color: $gray-300; } diff --git a/src/themes/default/src/scss/_carousel.scss b/src/themes/default/src/scss/_carousel.scss index a4db8f5d1..f6d320ffc 100644 --- a/src/themes/default/src/scss/_carousel.scss +++ b/src/themes/default/src/scss/_carousel.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // stylelint-disable no-descending-specificity $indicator-size: 8px; diff --git a/src/themes/default/src/scss/_circular-progress-bar.scss b/src/themes/default/src/scss/_circular-progress-bar.scss index 4dea72107..4d3a7abc2 100644 --- a/src/themes/default/src/scss/_circular-progress-bar.scss +++ b/src/themes/default/src/scss/_circular-progress-bar.scss @@ -1,5 +1,7 @@ @use "sass:math"; +@import "./bcl-theme"; + //styling $borderWidth: 12px; $animationTime: 1s; diff --git a/src/themes/default/src/scss/_collapse.scss b/src/themes/default/src/scss/_collapse.scss index fe8d6651a..7570290b3 100644 --- a/src/themes/default/src/scss/_collapse.scss +++ b/src/themes/default/src/scss/_collapse.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + [data-bs-toggle="collapse"] { &[aria-expanded="false"] .text-collapsed { display: none; diff --git a/src/themes/default/src/scss/_description_list.scss b/src/themes/default/src/scss/_description_list.scss index 32f72221c..71e6fef83 100644 --- a/src/themes/default/src/scss/_description_list.scss +++ b/src/themes/default/src/scss/_description_list.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + dd { margin-bottom: 0; diff --git a/src/themes/default/src/scss/_footer.scss b/src/themes/default/src/scss/_footer.scss index 4147d2ddb..ee2951601 100644 --- a/src/themes/default/src/scss/_footer.scss +++ b/src/themes/default/src/scss/_footer.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // stylelint-disable declaration-no-important, no-descending-specificity $footer-border-color: #adb5bd !default; diff --git a/src/themes/default/src/scss/_gallery.scss b/src/themes/default/src/scss/_gallery.scss index f4b915a52..119da8743 100644 --- a/src/themes/default/src/scss/_gallery.scss +++ b/src/themes/default/src/scss/_gallery.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + .bcl-gallery { .bcl-gallery__thumbnails { border-radius: $border-radius; diff --git a/src/themes/default/src/scss/_header.scss b/src/themes/default/src/scss/_header.scss index 2437ea7fb..0d9ec4c7b 100644 --- a/src/themes/default/src/scss/_header.scss +++ b/src/themes/default/src/scss/_header.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // header $header-background: #004494 !default; $header-background-start: #039 !default; diff --git a/src/themes/default/src/scss/_icon.scss b/src/themes/default/src/scss/_icon.scss index b527f3910..df0fee408 100644 --- a/src/themes/default/src/scss/_icon.scss +++ b/src/themes/default/src/scss/_icon.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // icon $icon: ( diff --git a/src/themes/default/src/scss/_inpage-navigation.scss b/src/themes/default/src/scss/_inpage-navigation.scss index 36ca2a394..4dbb28895 100644 --- a/src/themes/default/src/scss/_inpage-navigation.scss +++ b/src/themes/default/src/scss/_inpage-navigation.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + /* stylelint-disable no-descending-specificity */ .bcl-sidebar:has(> .bcl-inpage-navigation) { position: sticky; diff --git a/src/themes/default/src/scss/_input.scss b/src/themes/default/src/scss/_input.scss index 6ea48d0de..a18718179 100644 --- a/src/themes/default/src/scss/_input.scss +++ b/src/themes/default/src/scss/_input.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + /* stylelint-disable no-duplicate-selectors, selector-no-qualifying-type, no-descending-specificity */ $default-border-color: $gray-600; diff --git a/src/themes/default/src/scss/_language-list.scss b/src/themes/default/src/scss/_language-list.scss index 67302c005..700228c5e 100644 --- a/src/themes/default/src/scss/_language-list.scss +++ b/src/themes/default/src/scss/_language-list.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // stylelint-disable no-descending-specificity .bcl-language-list { diff --git a/src/themes/default/src/scss/_mega-menu.scss b/src/themes/default/src/scss/_mega-menu.scss index c03217668..f0865bd09 100644 --- a/src/themes/default/src/scss/_mega-menu.scss +++ b/src/themes/default/src/scss/_mega-menu.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + /* stylelint-disable no-descending-specificity, declaration-no-important */ /* ------------------------------------- diff --git a/src/themes/default/src/scss/_multiselect-2.scss b/src/themes/default/src/scss/_multiselect-2.scss index a1a891ac7..fb896c872 100644 --- a/src/themes/default/src/scss/_multiselect-2.scss +++ b/src/themes/default/src/scss/_multiselect-2.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + /* stylelint-disable selector-no-qualifying-type, selector-max-class, selector-max-compound-selectors, no-descending-specificity, diff --git a/src/themes/default/src/scss/_multiselect.scss b/src/themes/default/src/scss/_multiselect.scss index dbf78ef8b..8ed368cd4 100644 --- a/src/themes/default/src/scss/_multiselect.scss +++ b/src/themes/default/src/scss/_multiselect.scss @@ -1,11 +1,13 @@ +@import "./bcl-theme"; + +$primary-color: $primary; +@import "slim-select/src/slim-select/slimselect.scss"; + /* stylelint-disable selector-no-qualifying-type, selector-max-class, selector-max-compound-selectors, no-descending-specificity, function-calc-no-unspaced-operator, */ -@use "slim-select/src/slim-select/slimselect.scss" with ( - $primary-color: $primary -); // Multiselect Spacers $multiselect-spacers: ( diff --git a/src/themes/default/src/scss/_pagination-v2.scss b/src/themes/default/src/scss/_pagination-v2.scss index bf7298fe8..c3738fa4b 100644 --- a/src/themes/default/src/scss/_pagination-v2.scss +++ b/src/themes/default/src/scss/_pagination-v2.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // Pagination V2 overrides scoped to `.pagination-v2`. .pagination-v2 { // Keep the navigation landmark borderless to match Bootstrap defaults. diff --git a/src/themes/default/src/scss/_pagination.scss b/src/themes/default/src/scss/_pagination.scss index 5a3a3d498..4d44a144d 100644 --- a/src/themes/default/src/scss/_pagination.scss +++ b/src/themes/default/src/scss/_pagination.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + /* stylelint-disable no-descending-specificity */ .pagination { flex-wrap: wrap; diff --git a/src/themes/default/src/scss/_reset.scss b/src/themes/default/src/scss/_reset.scss index 2fa9f9459..854d13db7 100644 --- a/src/themes/default/src/scss/_reset.scss +++ b/src/themes/default/src/scss/_reset.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // General reset body { // needed for full-width banner diff --git a/src/themes/default/src/scss/_search-form.scss b/src/themes/default/src/scss/_search-form.scss index 4f8170141..25d386ed8 100644 --- a/src/themes/default/src/scss/_search-form.scss +++ b/src/themes/default/src/scss/_search-form.scss @@ -1,5 +1,7 @@ @use "sass:math"; +@import "./bcl-theme"; + // Search form Spacers $search-spacers: ( "icon-spacer-left": map-get($spacers, 3), diff --git a/src/themes/default/src/scss/_spinners.scss b/src/themes/default/src/scss/_spinners.scss index c6cc69cd5..cad721d97 100644 --- a/src/themes/default/src/scss/_spinners.scss +++ b/src/themes/default/src/scss/_spinners.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + .spinner-border-lg { width: 3rem; height: 3rem; diff --git a/src/themes/default/src/scss/_tabs.scss b/src/themes/default/src/scss/_tabs.scss index 5cd415430..a0dc8bb5c 100644 --- a/src/themes/default/src/scss/_tabs.scss +++ b/src/themes/default/src/scss/_tabs.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + // stylelint-disable no-descending-specificity .nav { &.bcl__nav { diff --git a/src/themes/default/src/scss/_timeline.scss b/src/themes/default/src/scss/_timeline.scss index fd257df58..7ac8641cf 100644 --- a/src/themes/default/src/scss/_timeline.scss +++ b/src/themes/default/src/scss/_timeline.scss @@ -1,3 +1,5 @@ +@import "./bcl-theme"; + /* stylelint-disable declaration-no-important */ // timeline .bcl-timeline { diff --git a/src/themes/default/src/scss/base/_layout.scss b/src/themes/default/src/scss/base/_layout.scss index 6c084a4b5..db2625cd0 100644 --- a/src/themes/default/src/scss/base/_layout.scss +++ b/src/themes/default/src/scss/base/_layout.scss @@ -1,3 +1,5 @@ +@import "../bcl-theme"; + @include media-breakpoint-down(md) { .bcl-sidebar { .dropdown-toggle, diff --git a/src/themes/default/src/scss/base/_utilities.scss b/src/themes/default/src/scss/base/_utilities.scss index ca33c8045..9e16ac5e7 100644 --- a/src/themes/default/src/scss/base/_utilities.scss +++ b/src/themes/default/src/scss/base/_utilities.scss @@ -1,3 +1,5 @@ +@import "../bcl-theme"; + $utilities: map-merge( $utilities, ( diff --git a/src/themes/default/src/scss/color_scheme/_alert.scss b/src/themes/default/src/scss/color_scheme/_alert.scss index b725abac4..c90d648a8 100644 --- a/src/themes/default/src/scss/color_scheme/_alert.scss +++ b/src/themes/default/src/scss/color_scheme/_alert.scss @@ -1,9 +1,11 @@ +@use "sass:math"; + +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + // Color scheme - Alert // No longer using $alert-bg-scale, $alert-border-scale, $alert-color-scale variables because they are deprecated in bootstrap 5.3.x -@use "sass:math"; - @mixin generate-alerts($color, $value) { $bg: shift-color($value, -80%); $border: shift-color($value, -70%); diff --git a/src/themes/default/src/scss/color_scheme/_background.scss b/src/themes/default/src/scss/color_scheme/_background.scss index de98782f9..704b746ac 100644 --- a/src/themes/default/src/scss/color_scheme/_background.scss +++ b/src/themes/default/src/scss/color_scheme/_background.scss @@ -1,3 +1,5 @@ +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + // Color scheme - Background @mixin generate-background($color, $value) { diff --git a/src/themes/default/src/scss/color_scheme/_badges.scss b/src/themes/default/src/scss/color_scheme/_badges.scss index a5380468b..1f71d2d3b 100644 --- a/src/themes/default/src/scss/color_scheme/_badges.scss +++ b/src/themes/default/src/scss/color_scheme/_badges.scss @@ -1,3 +1,5 @@ +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + // Color scheme - List Group @mixin generate-badges($color, $value) { diff --git a/src/themes/default/src/scss/color_scheme/_buttons.scss b/src/themes/default/src/scss/color_scheme/_buttons.scss index 11641d38a..7902c3585 100644 --- a/src/themes/default/src/scss/color_scheme/_buttons.scss +++ b/src/themes/default/src/scss/color_scheme/_buttons.scss @@ -1,3 +1,5 @@ +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + // Color scheme - buttons @mixin generate-buttons($color, $value) { diff --git a/src/themes/default/src/scss/color_scheme/_link.scss b/src/themes/default/src/scss/color_scheme/_link.scss index 18bae5b6c..8dd48ecb3 100644 --- a/src/themes/default/src/scss/color_scheme/_link.scss +++ b/src/themes/default/src/scss/color_scheme/_link.scss @@ -1,3 +1,5 @@ +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + @mixin generate-link($color, $value) { // Links $link-hover-color: shift-color($value, $link-shade-percentage); diff --git a/src/themes/default/src/scss/color_scheme/_list_group.scss b/src/themes/default/src/scss/color_scheme/_list_group.scss index 8ed16ef5a..afb8ab31a 100644 --- a/src/themes/default/src/scss/color_scheme/_list_group.scss +++ b/src/themes/default/src/scss/color_scheme/_list_group.scss @@ -1,7 +1,9 @@ -// Color scheme - List Group - @use "sass:math"; +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + +// Color scheme - List Group + @mixin generate-list-group($color, $value) { $bg: shift-color($value, -80%); $text: $value; diff --git a/src/themes/default/src/scss/color_scheme/_text.scss b/src/themes/default/src/scss/color_scheme/_text.scss index 07a1514e5..ca904dd73 100644 --- a/src/themes/default/src/scss/color_scheme/_text.scss +++ b/src/themes/default/src/scss/color_scheme/_text.scss @@ -1,3 +1,5 @@ +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + // Color scheme - Text @mixin generate-text($color, $value) { diff --git a/src/themes/default/src/scss/color_scheme/_utilities.scss b/src/themes/default/src/scss/color_scheme/_utilities.scss index a5b0d683f..c0ebfd91f 100644 --- a/src/themes/default/src/scss/color_scheme/_utilities.scss +++ b/src/themes/default/src/scss/color_scheme/_utilities.scss @@ -1,3 +1,5 @@ +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; + // Color scheme - utilities @mixin generate-utilities($color, $value) { diff --git a/src/themes/default/src/scss/color_scheme/generator.scss b/src/themes/default/src/scss/color_scheme/generator.scss index f9acdcee0..da6654272 100644 --- a/src/themes/default/src/scss/color_scheme/generator.scss +++ b/src/themes/default/src/scss/color_scheme/generator.scss @@ -1,3 +1,14 @@ +@import "@openeuropa/bcl-theme-default/src/scss/bcl-theme"; +@import "@openeuropa/bcl-theme-default/src/scss/color-scheme-variables"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/background"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/text"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/link"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/alert"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/buttons"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/list_group"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/badges"; +@import "@openeuropa/bcl-theme-default/src/scss/color_scheme/utilities"; + @each $scheme-name, $scheme-array in $colors-schemes { .#{$scheme-name} { $theme-colors-rgb: map-loop($scheme-array, to-rgb, "$value");