RESOLVED #JJ312: Upgrade to webtrees 2.1.17 - Rural theme upgrade

https://bugs.jaubart.com/view.php?id=312
Bootstrap 5.3 upgrade
Sass style: replace global functions by Sass modules

composer.json

@@ -32,9 +32,9 @@
 		}
 	},
 	"require-dev" : {
-		"fisharebest/webtrees" : "2.1.16",
+		"fisharebest/webtrees" : "2.1.17",
 		"consolidation/robo": "^3.0",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.1"
 	},
 	"scripts": {
 		"webtrees-theme-rural:package": "./vendor/bin/robo package",

module.php

@@ -108,7 +108,7 @@ public function customModuleAuthorName(): string
      */
     public function customModuleVersion(): string
     {
-        return '2.1.16-v.2';
+        return '2.1.17-v.1';
     }
 
     /**

package.json

@@ -26,20 +26,20 @@
     "laravel-mix": "^6.0.19",
     "laravel-mix-clean": "^0.1.0",
     "postcss": "^8.3.0",
-    "postcss-custom-properties": "^12.1.11",
+    "postcss-custom-properties": "^13.2.0",
     "postcss-image-inliner": "^6.0.1",
     "postcss-import": "^15.0.0",
     "postcss-rtlcss": "^4.0.1",
     "sass": "^1.34.0",
     "sass-loader": "^13.0.0",
-    "stylelint": "^14.6.1",
-    "stylelint-config-sass-guidelines": "^9.0.1",
-    "stylelint-config-standard": "^29.0.0",
+    "stylelint": "^15.10.2",
+    "stylelint-config-sass-guidelines": "^10.0.0",
+    "stylelint-config-standard": "^34.0.0",
     "webpack": "^5.37.1",
     "webpack-cli": "^5.0.0"
   },
   "dependencies": {
-    "bootstrap": "5.2.3"
+    "bootstrap": "5.3.0"
   },
   "browserslist": [
     ">0.1% and not dead"

src/sass/bootstrap/_pre-default.scss

@@ -117,3 +117,4 @@ $table-color: $primary;
 $table-border-color: transparent;
 //$table-group-separator-color: transparent;
 $table-striped-bg: $maj-c-theme-light;
+$table-bg: transparent;

src/sass/bootstrap/config.scss

@@ -23,12 +23,13 @@
 
 @import './pre-default';
 
-// Bootstrap v5.2.0
+// Bootstrap v5.3.0
 // https://github.com/twbs/bootstrap/blob/master/scss/bootstrap.scss
 
 // *** Configuration
 @import '~bootstrap/scss/functions';
 @import '~bootstrap/scss/variables';
+@import '~bootstrap/scss/variables-dark';
 @import '~bootstrap/scss/maps';
 @import '~bootstrap/scss/mixins';
 @import '~bootstrap/scss/utilities';

src/sass/rural/_global.scss

@@ -25,7 +25,7 @@ html {
     font-size: $maj-base-font-size;
 }
 
-.wt-global {
+::backdrop, .wt-global {
     background: #fff linear-gradient(to top, #fff, $maj-c-background) repeat-x;
 
 }

src/sass/rural/_header.scss

@@ -201,7 +201,7 @@
             }
 
             .nav-item +	.nav-item {
-                background-image: linear-gradient(to top, $maj-c-theme-lighter, lighten($maj-c-theme-medium, 30%), lighten($maj-c-theme-medium, 70%), $maj-c-theme-medium);
+                background-image: linear-gradient(to top, $maj-c-theme-lighter, color.adjust($maj-c-theme-medium, $lightness:30%), color.adjust($maj-c-theme-medium, $lightness:70%), $maj-c-theme-medium);
                 background-position: left;
                 background-repeat: no-repeat;
                 background-size: 1px;

src/sass/rural/_main.scss

@@ -71,7 +71,7 @@ main {
         @extend .container;
 
         @include media-breakpoint-up(md) {
-            max-width: map-get($container-max-widths, 'md');
+            max-width: map.get($container-max-widths, 'md');
         }
 
         &.w-100 {
@@ -107,7 +107,7 @@ main {
             padding: 0.5rem 0.75rem;
         }
 
-        .text-muted {
+        .text-muted, .text-body-secondary {
             color: $maj-c-theme-darker !important;
         }
 
@@ -163,7 +163,7 @@ form.wt-page-content {
             font-weight: bold;
         }
 
-        &.text-muted {
+        &.text-muted, &.text-body-secondary {
             display: none;
 
             .wt-tabs-individual & {
@@ -251,6 +251,9 @@ form.wt-page-content {
         border-style: none;
         font-weight: bold;
         text-align: center;
+    }
+
+    tbody > tr > th {
         width: 20%;
     }
 

src/sass/rural/_pages-charts.scss

@@ -176,9 +176,7 @@
 
 // Map sidebar
 
-.wt-pedigree-map-sidebar,
-.wt-place-hierarchy-sidebar,
-.wt-places-tab-sidebar {
+.wt-map-sidebar {
     &.wt-page-options-value {
         border-style: none;
     }
@@ -194,19 +192,19 @@
             font-weight: bold;
         }
     }
-}
-
-.wt-place-hierarchy-sidebar {
-    .gchart {
-        > .row {
-            @extend .mx-0;
-
-            > * {
-                @extend .px-1;
-            }
-
-            .align-digits {
-                text-align: right;
+    
+    #place-hierarchy & {
+        .gchart {
+            > .row {
+                @extend .mx-0;
+                
+                > * {
+                    @extend .px-1;
+                }
+                
+                .align-digits {
+                    text-align: right;
+                }
             }
         }
     }
@@ -233,8 +231,8 @@
 
 @each $nb, $colors in $maj-c-persons {
     .person#{$nb} {
-        background-color: map-get($colors, 'background');
-        border: outset map-get($colors, 'border') 1px;
+        background-color: map.get($colors, 'background');
+        border: outset map.get($colors, 'border') 1px;
         border-radius: 3px;
         margin-right: 0.2rem;
         vertical-align: top;

src/sass/rural/_pages-datatables.scss

@@ -95,7 +95,7 @@ table.dataTable {
         }
     }
 
-    a.text-muted {
+    a.text-muted, a.text-body-secondary {
         color: $maj-c-theme-dark !important;
 
         &:hover {

src/sass/rural/_pages.scss

@@ -236,7 +236,7 @@ form.wt-page-content {
     @extend .mx-auto;
 
     @include media-breakpoint-up(md) {
-        max-width: map-get($container-max-widths, 'md');
+        max-width: map.get($container-max-widths, 'md');
     }
 }
 
@@ -362,7 +362,7 @@ div {
  * Miscellaneous
  */
 
-.text-muted {
+.text-muted, .text-body-secondary {
     color: $maj-c-bluegray !important;
 
     &.nav-link {

src/sass/theme.scss

@@ -22,6 +22,7 @@
  */
 
 @use 'sass:color';
+@use 'sass:map';
 @use 'sass:math';
 
 @import './variables';