Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

This commit is contained in:
James Cole 2023-06-26 06:09:10 +02:00
commit 33317c15a2
3 changed files with 15 additions and 12 deletions

22
composer.lock generated
View File

@ -473,16 +473,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.6.3", "version": "3.6.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "9a747d29e7e6b39509b8f1847e37a23a0163ea6a" "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/9a747d29e7e6b39509b8f1847e37a23a0163ea6a", "url": "https://api.github.com/repos/doctrine/dbal/zipball/19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
"reference": "9a747d29e7e6b39509b8f1847e37a23a0163ea6a", "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -565,7 +565,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.6.3" "source": "https://github.com/doctrine/dbal/tree/3.6.4"
}, },
"funding": [ "funding": [
{ {
@ -581,7 +581,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-06-01T05:46:46+00:00" "time": "2023-06-15T07:40:12+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -9979,16 +9979,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.20", "version": "1.10.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803" "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5",
"reference": "c4c8adb56313fbd59ff5a5f4a496bbed1a6b8803", "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10037,7 +10037,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-06-20T12:07:40+00:00" "time": "2023-06-21T20:07:58+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",

View File

@ -117,6 +117,9 @@
.skin-firefly-iii .btn-success.hover { .skin-firefly-iii .btn-success.hover {
background-color: #004726; background-color: #004726;
} }
.skin-firefly-iii .btn-info {
color: #fff;
}
.skin-firefly-iii .dropdown-menu { .skin-firefly-iii .dropdown-menu {
box-shadow: none; box-shadow: none;
background-color: #353c42; background-color: #353c42;

File diff suppressed because one or more lines are too long