EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2020.02-05'

Browse Source
This commit is contained in:
Björn Fromme
2020-02-06 15:42:18 +01:00
parent e426b6fea4 deaa4b9917
commit a974018375
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ddev/config.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
APIVersion: v1.12.2 APIVersion: v1.13.0
name: ep-reisen name: ep-reisen
type: typo3 type: typo3
docroot: public docroot: public
package-lock.json
Generated
+5 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "epevents", "name": "epevents",
"version": "3.0.0", "version": "4.0.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -261,7 +261,8 @@
"@babel/helper-plugin-utils": { "@babel/helper-plugin-utils": {
"version": "7.8.3", "version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "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": { "@babel/helper-regex": {
"version": "7.8.3", "version": "7.8.3",
@@ -432,6 +433,7 @@
"version": "7.8.3", "version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz", "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==", "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==",
"dev": true,
"requires": { "requires": {
"@babel/helper-plugin-utils": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3",
"@babel/plugin-syntax-object-rest-spread": "^7.8.0" "@babel/plugin-syntax-object-rest-spread": "^7.8.0"
@@ -507,6 +509,7 @@
"version": "7.8.3", "version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "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==", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
"dev": true,
"requires": { "requires": {
"@babel/helper-plugin-utils": "^7.8.0" "@babel/helper-plugin-utils": "^7.8.0"
} }
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss
+8
View File
@@ -10,6 +10,10 @@
@include mq($from: desktop) { @include mq($from: desktop) {
margin-top: 80px; margin-top: 80px;
.ep-core-events & {
margin-top: 160px;
}
} }
.frontpage & { .frontpage & {
@@ -101,6 +105,10 @@
width: auto; width: auto;
top: 55px; top: 55px;
right: 120px; right: 120px;
.ep-core-events & {
top: 0;
}
} }
} }