Merge pull request #550 from plone/petschki-bs53

Fix SCSS imports for Bootstrap 5.3

Author: petschki

.github/workflows/python-package.yml

@@ -11,37 +11,39 @@ on:
 
 jobs:
     build:
-        runs-on: ubuntu-latest
         strategy:
-            fail-fast: true
             matrix:
-                python-version: ["3.9", "3.10"]
-
+                python-version:
+                - "3.8"
+                - "3.9"
+                - "3.10"
+                - "3.11"
+                os:
+                - ubuntu-latest
+        runs-on: ${{ matrix.os }}
         steps:
-            - uses: actions/setup-python@v2
-              with:
-                  python-version: '3.10'
-            - uses: actions/checkout@v2
-            - uses: actions/cache@v2
+            - uses: actions/checkout@v3
+            - uses: actions/cache@v3
               with:
                   path: ~/.cache/pip
                   key: ${{ runner.os }}-tox-${{ hashFiles('**/tox.ini') }}-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/constraints.txt') }}-${{ hashFiles('**/setup.py') }}
                   restore-keys: |
                     ${{ runner.os }}-pip-
             - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v4
               with:
                   python-version: ${{ matrix.python-version }}
 
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip
-                  if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+                  pip install -r requirements.txt
                   pip install tox-gh-actions>=3.0.0
-                  pip install -e .
             - name: Black-Check
               run: |
                   tox -r -e black-check
             - name: Test with tox
               run: |
                   tox -r
+              env:
+                  PLATFORM: ${{ matrix.os }}

CHANGES.rst

@@ -10,7 +10,7 @@ Breaking changes:
 
 New features:
 
-- *add item here*
+- Fix SCSS imports for latest Bootstrap 5.3.
 
 Bug fixes:
 

bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/package.json.bob

@@ -15,15 +15,15 @@
     "tinymce": "^5.10.2"
   },
   "scripts": {
-    "watch": "nodemon --watch styles/ --ext scss --exec \"npm run css-main\"",
+    "watch": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"",
     "build": "npm-run-all css-compile-main css-prefix-main css-minify-main",
     "css-main": "npm-run-all css-compile-main css-prefix-main css-minify-main",
-    "css-compile-main": "sass --load-path=node_modules --style expanded --source-map --embed-sources --no-error-css styles/theme.scss:styles/theme.css",
+    "css-compile-main": "sass --load-path=node_modules --style expanded --source-map --embed-sources --no-error-css scss/theme.scss:styles/theme.css",
     "css-prefix-main": "postcss --config postcss.config.js --replace \"styles/*.css\" \"!styles/*.min.css\"",
     "css-minify-main": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output styles/theme.min.css styles/theme.css",
-    "css-lint": "stylelint \"styles/**/*.scss\" --cache --cache-location .cache/.stylelintcache"
+    "css-lint": "stylelint \"scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache"
   },
   "dependencies": {
-    "@plone/plonetheme-barceloneta-base": "~3.0.3"
+    "@plone/plonetheme-barceloneta-base": "^3.1.3"
   }
 }

bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/scss/_custom.scss

@@ -0,0 +1,3 @@
+#portal-logo img {
+    filter: invert(60%) sepia(75%) saturate(503%) hue-rotate(62deg) brightness(93%) contrast(91%);
+}

bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/scss/_maps.scss

@@ -0,0 +1,12 @@
+$theme-plone-colors: (
+  "link-color-on-dark": $secondary,
+  "link-hover-color": $tertiary,
+);
+
+$plone-colors: map-merge($plone-colors, $theme-plone-colors);
+
+$theme-state-colors: (
+  "published": $primary,
+);
+
+$state-colors: map-merge($state-colors, $theme-state-colors);

bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/scss/_variables.scss

@@ -0,0 +1,3 @@
+$primary: #4AC728;
+$secondary: #36941D;
+$tertiary: #1B470E;

…+/+package.name+/theme/styles/theme.scss …ce+/+package.name+/theme/scss/theme.scssbobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/styles/theme.scss renamed to bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/scss/theme.scss bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/styles/theme.scss renamed to bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/scss/theme.scss

@@ -1,5 +1,5 @@
 // Theme import structure is based on Bootstrap documentation
-// https://getbootstrap.com/docs/5.2/customize/sass/#importing
+// https://getbootstrap.com/docs/5.3/customize/sass/#importing
 
 // Barceloneta and Bootstrap import are using --load-path=node_modules
 
@@ -10,14 +10,18 @@ $enable-roboto-webfont: false !default;
 @import "bootstrap/scss/functions";
 
 // 2. Include any default variable overrides here
+@import "variables";
 
 // 3. Include remainder of required Barceloneta and Bootstrap stylesheets
 @import "@plone/plonetheme-barceloneta-base/scss/variables.colors.plone";
+@import "@plone/plonetheme-barceloneta-base/scss/variables.colors.dark.plone";
 @import "@plone/plonetheme-barceloneta-base/scss/variables.properties";
 @import "@plone/plonetheme-barceloneta-base/scss/variables.barceloneta";
 @import "bootstrap/scss/variables";
+@import "bootstrap/scss/variables-dark";
 
 // 4. Include any default map overrides here
+@import "maps";
 
 // 5. Include remainder of required parts
 @import "bootstrap/scss/maps";
@@ -93,4 +97,5 @@ $enable-roboto-webfont: false !default;
 // @import "@plone/plonetheme-barceloneta-base/scss/roboto-webfont";
 
 
-// 9. Add additional custom code here
+// 9. Add additional custom code here
+@import "custom";