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

Fix mobile navigation js error

Browse Source
This commit is contained in:
Björn Fromme
2018-04-21 12:51:27 +02:00
parent 81e2fbf02f
commit a5f09112dc
9 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+7 -7
View File
@@ -1318,10 +1318,10 @@
"hoek": "2.16.3"
}
},
"bootstrap": {
"bootstrap-sass": {
"version": "3.3.7",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
"integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
"resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz",
"integrity": "sha1-ZZbHq0D2Y3OTMjqwvIDQZPxjBJg="
},
"bourbon": {
"version": "4.3.4",
@@ -5265,16 +5265,16 @@
"dev": true
},
"jquery": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI="
},
"jquery-lazy": {
"version": "1.7.7",
"resolved": "https://registry.npmjs.org/jquery-lazy/-/jquery-lazy-1.7.7.tgz",
"integrity": "sha512-XPPWWMMQ0QPpjv2psFVOT2phmwSCwMQ9G+3QPpnOBFd7mVCnrfqoNKjZgbfKNo+Ely0q3bPCquRMTf99qqn5Dw==",
"requires": {
"jquery": "3.3.1"
"jquery": "2.2.4"
}
},
"js-base64": {
package.json
+8 -8
View File
@@ -10,23 +10,23 @@
"build": "./node_modules/.bin/encore production"
},
"dependencies": {
"@fancyapps/fancybox": "^3.2.5",
"@fengyuanchen/datepicker": "^0.6.4",
"bootstrap-sass": "^3.3.7",
"bourbon": "^4.3.2",
"cookieconsent": "^3.0.4",
"jquery": "^3.2.1",
"font-awesome": "^4.7.0",
"iframe-resizer": "^3.5.5",
"jquery": "^2.2.4",
"jquery-lazy": "^1.7.4",
"moment": "^2.19.4",
"normalize.css": "^7.0.0",
"picturefill": "^3.0.2",
"sass-mq": "^3.3.2",
"slick-carousel": "^1.8.0",
"sticky-js": "^1.2.0",
"vue": "^2.5.11",
"vue-session": "^0.9.10",
"@fancyapps/fancybox": "^3.2.5",
"bootstrap": "^3.3.7",
"font-awesome": "^4.7.0",
"iframe-resizer": "^3.5.5",
"moment": "^2.19.4",
"picturefill": "^3.0.2"
"vue-session": "^0.9.10"
},
"devDependencies": {
"@symfony/webpack-encore": "^0.19.0",
web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js
+3 -1
View File
@@ -23,10 +23,12 @@ import $ from 'jquery'
import moment from 'moment'
import fancybox from '@fancyapps/fancybox'
global.$ = global.jQuery = $;
require('cookieconsent');
require('slick-carousel');
require('jquery-lazy');
require('bootstrap/dist/js/bootstrap');
require('bootstrap-sass/assets/javascripts/bootstrap');
require('picturefill');
require('@fancyapps/fancybox/dist/jquery.fancybox.css');
web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss
+1 -1
View File
@@ -1,5 +1,5 @@
// vendor styles
@import "~bootstrap/dist/css/bootstrap.min.css";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "~cookieconsent/build/cookieconsent.min.css";
@import "mixins";
web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss
+1 -1
View File
@@ -1,5 +1,5 @@
// vendor styles
@import "~bootstrap/dist/css/bootstrap.min.css";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "~cookieconsent/build/cookieconsent.min.css";
@import "mixins";
web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss
+1 -1
View File
@@ -1,5 +1,5 @@
// vendor styles
@import "~bootstrap/dist/css/bootstrap.min.css";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "~cookieconsent/build/cookieconsent.min.css";
@import "mixins";
web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss
+1 -1
View File
@@ -1,5 +1,5 @@
// vendor styles
@import "~bootstrap/dist/css/bootstrap.min.css";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "~cookieconsent/build/cookieconsent.min.css";
@import "mixins";
web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
+1 -1
View File
@@ -59,7 +59,7 @@
<f:section name="SecondLevel">
<a href="{f:uri.page(pageUid: topitem.uid)}" data-target="#"
class="dropdown-toggle" role="button"
class="dropdown-toggle" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"
title="{topitem.linktext}">{topitem.title}<span class="glyphicon glyphicon-chevron-down"></span></a>
<v:menu pageUid="{topitem.uid}" useShortcutUid="true">
webpack.config.js
+1 -1
View File
@@ -11,7 +11,7 @@ Encore
.addStyleEntry('unichamp', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss')
.addStyleEntry('rte', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css')
.createSharedEntry('vendor', [
'jquery', 'vue', 'bootstrap/dist/js/bootstrap', 'slick-carousel',
'jquery', 'vue', 'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',
'moment', 'cookieconsent', 'picturefill', '@fancyapps/fancybox'
])
.addPlugin(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))