From 733d4e7addd5fb370b117906558df27578425e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Wed, 5 Feb 2020 15:09:25 +0100 Subject: [PATCH 1/3] Update package-lock.json --- package-lock.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c4470cd5..c096772d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "epevents", - "version": "3.0.0", + "version": "4.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -261,7 +261,8 @@ "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true }, "@babel/helper-regex": { "version": "7.8.3", @@ -432,6 +433,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz", "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==", + "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-syntax-object-rest-spread": "^7.8.0" @@ -507,6 +509,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" } From 19d6ea6911799d556feae7e5d698f47b18bb0b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 6 Feb 2020 15:21:46 +0100 Subject: [PATCH 2/3] Update ddev config --- .ddev/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index c57385ea..9ef9ae2f 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.12.2 +APIVersion: v1.13.0 name: ep-reisen type: typo3 docroot: public From deaa4b99179a166e75280a8d7baf21144f25a7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 6 Feb 2020 15:39:47 +0100 Subject: [PATCH 3/3] Avoid overlapping of navbar and headerimage on event pages --- .../Resources/Private/Assets/scss/remix/_pagehead.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss index ad80e557..0c978a59 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss @@ -10,6 +10,10 @@ @include mq($from: desktop) { margin-top: 80px; + + .ep-core-events & { + margin-top: 160px; + } } .frontpage & { @@ -101,6 +105,10 @@ width: auto; top: 55px; right: 120px; + + .ep-core-events & { + top: 0; + } } }