From 30ee9dc181dc0e844af5f37fa02cf9406eb30321 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 11 Jun 2020 11:45:52 +0200 Subject: [PATCH] Multiple fixes Signed-off-by: Thomas Citharel --- js/package.json | 4 +++ js/public/index.html | 43 ++++++++++++----------- js/src/components/Event/EventListCard.vue | 2 +- js/src/components/SearchField.vue | 3 +- js/src/views/About.vue | 33 ++++++++++++++--- js/src/views/Home.vue | 22 +++++++++++- js/yarn.lock | 9 +---- 7 files changed, 79 insertions(+), 37 deletions(-) diff --git a/js/package.json b/js/package.json index a44f4d251..a496eeb72 100644 --- a/js/package.json +++ b/js/package.json @@ -95,5 +95,9 @@ "vue-i18n-extract": "^1.0.2", "vue-template-compiler": "^2.6.11", "webpack-cli": "^3.3.11" + }, + "resolutions": { + "prosemirror-model": "1.9.1", + "prosemirror-state": "1.3.3" } } diff --git a/js/public/index.html b/js/public/index.html index 37c6a0767..7a8eae898 100644 --- a/js/public/index.html +++ b/js/public/index.html @@ -1,23 +1,24 @@ - - - - - - <%= htmlWebpackPlugin.options.title %> - - - - - -
- - - + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/js/src/components/Event/EventListCard.vue b/js/src/components/Event/EventListCard.vue index dd7e916d0..a8095dd80 100644 --- a/js/src/components/Event/EventListCard.vue +++ b/js/src/components/Event/EventListCard.vue @@ -98,7 +98,7 @@ >{{ $t("Edit") }} -
  • +
  • -
    +
    @@ -46,7 +46,11 @@ />
    - +
    @@ -81,7 +85,11 @@

    - +
    @@ -140,7 +148,11 @@
    - +
    @@ -162,7 +174,11 @@
    - +
    @@ -216,6 +232,12 @@ export default class About extends Vue {