RESOLVED #JJ318: Upgrade to webtrees 2.1.19 - Rural theme upgrade

https://bugs.jaubart.com/view.php?id=318

.stylelintrc.json

@@ -4,7 +4,6 @@
         "stylelint-scss"
     ],
     "rules": {
-        "indentation": 4,
         "max-nesting-depth": [4, { "severity": "warning" }],
         "selector-class-pattern": null,
         "selector-max-compound-selectors": [4, { "severity": "warning" }],

composer.json

@@ -32,7 +32,7 @@
 		}
 	},
 	"require-dev" : {
-		"fisharebest/webtrees" : "2.1.18",
+		"fisharebest/webtrees" : "2.1.19",
 		"consolidation/robo": "^3.0",
         "psr/http-message": "^1.1"
 	},

module.php

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

package.json

@@ -28,18 +28,18 @@
     "postcss": "^8.3.0",
     "postcss-custom-properties": "^13.2.0",
     "postcss-image-inliner": "^7.0.0",
-    "postcss-import": "^15.0.0",
-    "postcss-rtlcss": "^4.0.1",
+    "postcss-import": "^16.1.0",
+    "postcss-rtlcss": "^5.1.0",
     "sass": "^1.34.0",
-    "sass-loader": "^13.0.0",
-    "stylelint": "^15.10.2",
-    "stylelint-config-sass-guidelines": "^10.0.0",
-    "stylelint-config-standard": "^34.0.0",
+    "sass-loader": "^14.1.1",
+    "stylelint": "^16.3.0",
+    "stylelint-config-sass-guidelines": "^11.1.0",
+    "stylelint-config-standard": "^36.0.0",
     "webpack": "^5.37.1",
     "webpack-cli": "^5.0.0"
   },
   "dependencies": {
-    "bootstrap": "5.3.2"
+    "bootstrap": "5.3.3"
   },
   "browserslist": [
     ">0.1% and not dead"

src/sass/_vendor-patches.scss

@@ -25,3 +25,19 @@
   * Use this file to apply temporary patches to upstream libraries.
   * To be reviewed at each release.
   */
+
+
+/*webtrees 2.1.19 switched to datatables.net-bs5 2.0, which comes with breaking changes
+ * Temporarily revert/neutralise them, to give time to analyse the best way to address the version change
+ */ 
+
+table.dataTable {
+    &.table {
+        margin-bottom: 6px;
+        border-spacing: 2px;
+    }
+
+    th.dt-type-numeric, td.dt-type-numeric {
+        text-align: unset;
+    }
+}

src/sass/rural/_global.scss

@@ -169,28 +169,17 @@ select,
 }
 
 .pagination {
-    .page-link {
-        background-image: $maj-bg-theme-medium-background-image;
-    }
-
     .page-item {
+        .page-link, &.disabled .page-link {
+            background-image: $maj-bg-theme-medium-background-image;
+        }
+
         &.active .page-link {
             background-image: none;
         }
-		
+        
         &.disabled {
-            .page-link {
-                background-image: none;
-            }
-
-            &.previous,
-            &.next {
-                opacity: 0.5;
-
-                .page-link {
-                    background-image: $maj-bg-theme-medium-background-image;
-                }
-            }
+            opacity: 0.5;
         }
     }
 }

src/sass/rural/_icons.scss

@@ -49,7 +49,9 @@
 
 /* Sex icons */
 
-.wt-icon-sex {	
+.wt-icon-sex {
+    height: 1em;
+
     &-f 	{color: var(--sex-f-fg);}
     &-m 	{color: var(--sex-m-fg);}
     &-u 	{color: var(--sex-u-fg);}

src/sass/rural/_main.scss

@@ -181,7 +181,7 @@ form.wt-page-content {
     border-top-style: none;
     padding: 1em;
 
-    .dataTables_wrapper {
+    .dt-container {
         border-style: none;
     }
 
@@ -285,6 +285,21 @@ form.wt-page-content {
     .btn-light {
         @extend .btn-primary;
     }
+
+    table {
+        td {
+            border-bottom: thin dashed $maj-c-theme-medium;
+            border-right: thin dashed $maj-c-theme-medium;
+
+            &:last-child {
+                border-right-style: none;
+            }
+        }
+
+        tr:last-child td {
+            border-bottom-style: none;
+        }
+    }
 }
 
 /*

src/sass/rural/_pages-blocks.scss

@@ -82,7 +82,7 @@
     .wt-block-content {
         background-color: $maj-c-theme-lighter;
 
-        .dataTables_wrapper {
+        .dt-container {
             border-style: none;
         }
 
@@ -96,6 +96,7 @@
 
         .wt-chart-box {
             width: 15rem;
+            height: unset;
         }
     }
 

src/sass/rural/_pages-datatables.scss

@@ -26,7 +26,7 @@ table.center {
     margin-right: auto;
 }
 
-.dataTables_wrapper {
+.dt-container {
     @extend .table-responsive;
     @extend .maj-content-tabs;
     @extend .mx-auto;
@@ -35,10 +35,10 @@ table.center {
         max-width: 75%;
     }
 
-    .dataTables_info,
-    .dataTables_length,
-    .dataTables_filter,
-    .dataTables_paginate {
+    .dt-info,
+    .dt-length,
+    .dt-search,
+    .dt-paging {
         padding: 0.4em;
     }
 }
@@ -52,7 +52,7 @@ div[role=tabpanel],
 div[id^=table-indi],
 div[id^=table-fam],
 .maj-table-full-width {
-    .dataTables_wrapper {
+    .dt-container {
         max-width: 100%;
     }
 }