Skip to content

Commit

Permalink
RESOLVED #JJ303: Upgrade to webtrees 2.1.8 - Rural theme upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
jon48 committed Dec 10, 2022
1 parent 9186bfa commit 6517e05
Show file tree
Hide file tree
Showing 10 changed files with 1,881 additions and 3,477 deletions.
19 changes: 19 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm"
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
allow:
- dependency-type: "production"
open-pull-requests-limit: 0
- package-ecosystem: "composer"
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
allow:
- dependency-type: "production"
open-pull-requests-limit: 0
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
},
"require-dev" : {
"fisharebest/webtrees" : "2.1.7",
"fisharebest/webtrees" : "2.1.8",
"consolidation/robo": "^3.0",
"psr/http-message": "^1.0"
},
Expand Down
666 changes: 340 additions & 326 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion module.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function customModuleAuthorName(): string
*/
public function customModuleVersion(): string
{
return '2.1.7-v.1';
return '2.1.8-v.1';
}

/**
Expand Down
4,642 changes: 1,509 additions & 3,133 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@
"laravel-mix": "^6.0.19",
"laravel-mix-clean": "^0.1.0",
"postcss": "^8.3.0",
"postcss-custom-properties": "^12.1.6",
"postcss-image-inliner": "^5.0.0",
"postcss-custom-properties": "^13.0.0",
"postcss-image-inliner": "^6.0.1",
"postcss-import": "^15.0.0",
"postcss-replace": "^1.1.3",
"postcss-rtlcss": "^3.6.3",
"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": "^28.0.0",
"stylelint-config-standard": "^29.0.0",
"webpack": "^5.37.1",
"webpack-cli": "^4.7.0"
"webpack-cli": "^5.0.0"
},
"dependencies": {
"bootstrap": "5.2.0"
"bootstrap": "5.2.3"
},
"browserslist": [
">0.1% and not dead"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,3 @@
* Use this file to apply temporary patches to upstream libraries.
* To be reviewed at each release.
*/

/**
* Bootstrap 5.2.0 introduce background gradient to btn-link buttons.
* See https://github.com/twbs/bootstrap/discussions/36998
*/
.btn-link {
background-image: none;
}
2 changes: 2 additions & 0 deletions src/sass/bootstrap/_pre-default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ $dropdown-link-active-bg: $maj-c-theme-medium;
$dropdown-border-color: $maj-c-theme-medium;
$dropdown-border-radius: 0.4rem;

$form-file-button-color: #fff;

$grid-gutter-width: 2.5rem;

$input-border-color: $maj-c-theme-medium;
Expand Down
2 changes: 0 additions & 2 deletions src/sass/rural/config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
* +---wt-footer wt-footer-xxxxx
*/

@import './vendor-patches';

@import './global';
@import './header';
@import './menus';
Expand Down
3 changes: 3 additions & 0 deletions src/sass/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
// Import Bootstrap config first
@import './bootstrap/config';

// Apply vendors patches
@import './vendor-patches';

@import './mixins';

@import './webtrees/config';
Expand Down

0 comments on commit 6517e05

Please sign in to comment.