From 89a81a05063b87a1b42a218078f9787ed6063008 Mon Sep 17 00:00:00 2001 From: Andreas E Date: Wed, 13 Nov 2019 16:40:24 +0100 Subject: [PATCH] Fix Carousel (#93) * Update config.js * Update config.js * New carousel but broken * Basic style * Clean up --- package-lock.json | 11 ++- package.json | 1 + src/.vuepress/components/Carousel.vue | 107 +++++++++++++++++----- src/.vuepress/components/CarouselItem.vue | 10 +- src/.vuepress/config.js | 4 +- src/.vuepress/enhanceApp.js | 2 + 6 files changed, 102 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9ccadfc..0f30ec9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10459,8 +10459,15 @@ "vue": { "version": "2.6.10", "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", - "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==", - "dev": true + "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" + }, + "vue-agile": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/vue-agile/-/vue-agile-1.0.11.tgz", + "integrity": "sha512-iOc3qkTjJx5HldP3e9KGYtrYOg/1TG1FpcJQOQKGXHxPO2WAS0MU10tA4ydNbrTM7DTBaIo8RReZsxevFordNg==", + "requires": { + "vue": "^2.6.10" + } }, "vue-hot-reload-api": { "version": "2.3.4", diff --git a/package.json b/package.json index 6c634543..0e4a9faa 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "iso-639-1": "^2.1.0", "lodash.groupby": "^4.6.0", "lodash.sortby": "^4.7.0", + "vue-agile": "^1.0.11", "vuepress-plugin-clean-urls": "^1.0.3", "vuepress-plugin-container": "^2.0.2" } diff --git a/src/.vuepress/components/Carousel.vue b/src/.vuepress/components/Carousel.vue index 6bdfe651..9f6f9bb6 100644 --- a/src/.vuepress/components/Carousel.vue +++ b/src/.vuepress/components/Carousel.vue @@ -1,46 +1,107 @@ diff --git a/src/.vuepress/components/CarouselItem.vue b/src/.vuepress/components/CarouselItem.vue index 65f3b38c..50260d76 100644 --- a/src/.vuepress/components/CarouselItem.vue +++ b/src/.vuepress/components/CarouselItem.vue @@ -1,5 +1,5 @@ @@ -17,9 +17,9 @@ export default { diff --git a/src/.vuepress/config.js b/src/.vuepress/config.js index 677ad391..94f5ef1c 100644 --- a/src/.vuepress/config.js +++ b/src/.vuepress/config.js @@ -7,9 +7,7 @@ module.exports = { ['link', { rel: "preconnect", href: 'https://fonts.gstatic.com', crossorigin:""} , ''], ['link', { rel: "stylesheet", href: 'https://cdn.materialdesignicons.com/4.4.95/css/materialdesignicons.min.css', crossorigin:""} , ''], ['link', { rel: "stylesheet", href: 'https://fonts.googleapis.com/css?family=Open+Sans'} , ''], - ['link', { rel: "stylesheet", href: 'https://fonts.googleapis.com/icon?family=Material+Icons'} , ''], - ['script', { src: 'https://unpkg.com/flickity@2/dist/flickity.pkgd.min.js'} , ''], - ['link', { rel: "stylesheet", type: "text/css", href: 'https://unpkg.com/flickity@2/dist/flickity.min.css'} , ''], + ['link', { rel: "stylesheet", href: 'https://fonts.googleapis.com/icon?family=Material+Icons'} , ''] ], themeConfig: { repo: 'inorichi/tachiyomi', diff --git a/src/.vuepress/enhanceApp.js b/src/.vuepress/enhanceApp.js index 6ae74df1..7915bffd 100644 --- a/src/.vuepress/enhanceApp.js +++ b/src/.vuepress/enhanceApp.js @@ -3,6 +3,7 @@ import './styles/index.scss'; import { library } from '@fortawesome/fontawesome-svg-core'; import { faDownload } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; +import { VueAgile } from 'vue-agile' library.add(faDownload); @@ -13,4 +14,5 @@ export default ({ siteData // site metadata }) => { Vue.component('font-awesome-icon', FontAwesomeIcon); + Vue.component('agile', VueAgile) };