Skip to content
This repository was archived by the owner on Oct 27, 2022. It is now read-only.

Commit e891325

Browse files
committed
Merge branch 'develop' into #73-add-to-home-message
# Conflicts: # jsconfig.json # src/components/element/CookieBanner.vue # src/views/MoreOptions.vue # vue.config.js
2 parents c76de74 + 2f4d0de commit e891325

40 files changed

+629
-477
lines changed

jsconfig.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"include": [
3-
"./src/**/*"
4-
]
5-
}
2+
"include": [
3+
"./src/**/*"
4+
]
5+
}
6+
}

package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"dependencies": {
1212
"axios": "^0.19.2",
1313
"bootstrap": "^4.5.3",
14-
"bootstrap-vue": "^2.20.1",
14+
"bootstrap-vue": "^2.21.0",
1515
"core-js": "^3.8.1",
1616
"firebase": "^7.24.0",
1717
"font-awesome": "^4.7.0",
18-
"husky": "^4.3.5",
18+
"husky": "^4.3.6",
1919
"moment": "^2.29.1",
2020
"nprogress": "^0.2.0",
21-
"register-service-worker": "^1.7.1",
21+
"register-service-worker": "^1.7.2",
2222
"sharer.js": "^0.4.1",
2323
"vue": "^2.6.12",
2424
"vue-cookie-law": "^1.13.3",

src/App.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export default {
4040
4141
.router-view {
4242
background-color: var(--background);
43-
min-height: calc(100vh - 1.75rem);
43+
min-height: calc(100vh - 6.75rem);
44+
margin-bottom: 6rem;
4445
}
4546
</style>

src/assets/cards/Card-blue.png

-527 Bytes
Loading

src/assets/cards/Card-blue.svg

Lines changed: 3 additions & 3 deletions
Loading

src/assets/cards/Card-purple.png

-481 Bytes
Loading

0 commit comments

Comments
 (0)