RESOLVED #JJ294: Upgrade to webtrees 2.1.4 - Rural theme upgrade

https://bugs.jaubart.com/view.php?id=294
jon48 · May 22, 2022 · 407f271 · 407f271
1 parent 7011329
commit 407f271
Show file tree

Hide file tree

Showing 8 changed files with 1,083 additions and 1,010 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
 		}
 	},
 	"require-dev" : {
-		"fisharebest/webtrees" : "2.1.1",
+		"fisharebest/webtrees" : "2.1.4",
 		"consolidation/robo": "^3.0",
         "psr/http-message": "^1.0"
 	},

diff --git a/composer.lock b/composer.lock
diff --git a/module.php b/module.php
@@ -29,6 +29,7 @@
 namespace MyArtJaub\Webtrees\Module;
 
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Site;
 use Fisharebest\Webtrees\View;
 use Fisharebest\Webtrees\Webtrees;
 use Fisharebest\Webtrees\Module\AbstractModule;
@@ -107,7 +108,7 @@ public function customModuleAuthorName(): string
      */
     public function customModuleVersion(): string
     {
-        return '2.1.1-v.1';
+        return '2.1.3-v.1';
     }
 
     /**
@@ -121,7 +122,8 @@ public function customModuleLatestVersionUrl(): string
                 'm' => $this->customModuleVersion(),
                 'w' => Webtrees::VERSION,
                 'p' => PHP_VERSION,
-                'o' => DIRECTORY_SEPARATOR === '/' ? 'u' : 'w'
+                'o' => DIRECTORY_SEPARATOR === '/' ? 'u' : 'w',
+                's' => Site::getPreference('SITE_UUID')
             ]);
     }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "postcss-replace": "^1.1.3",
     "postcss-rtlcss": "^3.6.3",
     "sass": "^1.34.0",
-    "sass-loader": "^12.1.0",
+    "sass-loader": "^13.0.0",
     "stylelint": "^14.6.1",
     "stylelint-config-sass-guidelines": "^9.0.1",
     "stylelint-config-standard": "^25.0.0",

diff --git a/src/sass/rural/_global.scss b/src/sass/rural/_global.scss
@@ -152,10 +152,6 @@ h4 {
     }
 }
 
-.form-group {
-    margin-bottom: $spacer;
-}
-
 .input-group {
     &-text {
         *[class^='wt-icon-'] { color: #fff; }

diff --git a/src/sass/rural/_main.scss b/src/sass/rural/_main.scss
@@ -93,10 +93,6 @@ main {
         .btn-secondary {
             @extend .maj-secondary-button-theme-lighter;
         }
-
-        .form-group {
-            margin-bottom: unset;
-        }
 
         &-label {
             background-color: $maj-c-theme-medium;

diff --git a/src/sass/rural/_pages.scss b/src/sass/rural/_pages.scss
@@ -272,20 +272,7 @@ div {
 
 .wt-tab-stories {
     color: $maj-c-theme-primary;
-
-    .story_title {
-        font-weight: bold;
-    }
-
-    .story_body {
-        padding: 1rem;
-        white-space: normal;
-    }
-
-    .story_edit {
-        padding: 1rem;
-    }
-
+    padding: 1rem;
 }
 
 /* Calendar */