Skip to content

Commit caa612c

Browse files
committed
Update packages & [email protected].
1 parent 04df691 commit caa612c

File tree

8 files changed

+430
-347
lines changed

8 files changed

+430
-347
lines changed

package-lock.json

Lines changed: 353 additions & 283 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
},
2727
"dependencies": {},
2828
"devDependencies": {
29-
"@vue/cli-plugin-babel": "^3.8.0",
30-
"@vue/cli-plugin-eslint": "^3.8.0",
31-
"@vue/cli-service": "^3.8.4",
29+
"@vue/cli-plugin-babel": "^3.9.2",
30+
"@vue/cli-plugin-eslint": "^3.9.2",
31+
"@vue/cli-service": "^3.9.3",
3232
"@vue/eslint-config-standard": "^4.0.0",
3333
"babel-polyfill": "^6.26.0",
3434
"node-sass": "^4.12.0",
@@ -37,9 +37,9 @@
3737
"sass-loader": "^7.0.1",
3838
"simple-syntax-highlighter": "^1.0.6",
3939
"vue": "^2.6.10",
40-
"vue-cli-plugin-vuetify": "^0.5.0",
40+
"vue-cli-plugin-vuetify": "^0.6.1",
4141
"vue-scrollto": "^2.15.0",
4242
"vue-template-compiler": "^2.6.10",
43-
"vuetify": "^1.5.16"
43+
"vuetify": "^2.0.1"
4444
}
4545
}

src/app.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<template lang="pug">
22
v-app.white(:class="{ ready: ready }" v-scroll="onScroll")
3-
v-container
4-
top-bar(:offset-top="offsetTop")
5-
documentation
3+
v-content
4+
v-container
5+
top-bar(:offset-top="offsetTop")
6+
documentation
67

78
v-fab-transition
89
v-btn(color="primary" fixed bottom right fab v-show="!goTopHidden" small href="#top")

src/components/highlight-message/index.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template lang="pug">
2-
component(:is="tag" :class="'highlight ' + type")
2+
component(:is="tag" :class="'highlight highlight--' + type")
33
v-icon {{ icon }}
44
slot
55
</template>
@@ -53,27 +53,27 @@ export default {
5353
padding: 8px 15px;
5454
border-left: 3px solid;
5555
56-
&.info {
56+
&--info {
5757
background-color: rgba(#09f, 0.08) !important;
5858
border-color: #09f !important;
5959
}
6060
61-
&.success {
61+
&--success {
6262
background-color: rgba(#6c0, 0.1) !important;
6363
border-color: #6c0 !important;
6464
}
6565
66-
&.tips {
66+
&--tips {
6767
background-color: rgba(#ff0, 0.15) !important;
6868
border-color: #fd0 !important;
6969
}
7070
71-
&.warning {
71+
&--warning {
7272
background-color: rgba(#fa0, 0.1) !important;
7373
border-color: #fa0 !important;
7474
}
7575
76-
&.error {
76+
&--error {
7777
background-color: rgba(#f33, 0.08) !important;
7878
border-color: #f33 !important;
7979
}
@@ -87,33 +87,33 @@ export default {
8787
height: 15px;
8888
}
8989
90-
&.info .v-icon {
90+
&--info .v-icon {
9191
background: #09f !important;
9292
transform: rotate(180deg);
9393
font-size: 23px;
9494
top: 0.4em;
9595
}
9696
97-
&.success .v-icon {
97+
&--success .v-icon {
9898
background-color: #6c0 !important;
9999
font-size: 15px;
100100
top: 0.7em;
101101
}
102102
103-
&.error .v-icon {
103+
&--error .v-icon {
104104
background-color: #f33 !important;
105105
font-size: 15px;
106106
top: 0.7em;
107107
}
108108
109-
&.tips .v-icon {
109+
&--tips .v-icon {
110110
background-color: #fd0 !important;
111111
font-size: 14px;
112112
top: 0.7em;
113113
transform: rotate(180deg);
114114
}
115115
116-
&.warning .v-icon {
116+
&--warning .v-icon {
117117
background-color: #fa0 !important;
118118
top: 0.4em;
119119
}

src/components/top-bar.vue

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<template lang="pug">
2-
v-toolbar.top-bar(app light color="white" dense flat fixed align-center :class="{'scrolled': offsetTop > 104}")
3-
v-toolbar-title
2+
v-app-bar.top-bar(app light color="white" dense text fixed align-center :class="{'scrolled': offsetTop > 104}")
3+
v-toolbar-title.top-bar__title
44
h1.primary--text
5-
a.v-toolbar__logo-link(href="#top")
6-
svg.v-toolbar__logo(xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 442 442")
5+
a.top-bar__logo-link(href="#top")
6+
svg.top-bar__logo(xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 442 442")
77
path(d="M166.6 225.2c4 16 27.3 26.3 59.5 26.3 24 0 39.3-8.8 45.6-17a19.7 19.7 0 0 0 3.5-18c-3.6-13-22.4-19.3-52.8-28.2l-8.5-2.5c-31-9-66.3-19.3-73.7-46.2a43.3 43.3 0 0 1 8.5-39.8 10 10 0 0 0-7.8-16.4h-35a10 10 0 0 0-7.7 3.5l-43 50a10 10 0 0 0 0 13l74.3 86.4a10 10 0 0 0 17.5-7.7 10 10 0 0 1 19.6-3.4zm-16.9-26.7c-6.9 1.7-12.7 5.7-16.8 11.1l-57-66.2 34.5-40h13a62.7 62.7 0 0 0-2.5 41.6c10.5 37.6 53.1 50 87.4 60l8.5 2.5c8.5 2.5 18.1 5.3 26 8.3a45.3 45.3 0 0 1 13 6.5c-2.8 3.7-13 9.2-29.7 9.2-27.2 0-39-8.3-40-11a30 30 0 0 0-36.4-22zM263.2 264.5a97 97 0 0 1-37.1 7c-18.8 0-35.8-3.2-49.1-9.3a10 10 0 0 0-11.8 15.6l48.2 56a10 10 0 0 0 15.2 0l46-53.5a10 10 0 0 0-11.4-15.8zM221 312l-19-22a167.4 167.4 0 0 0 37.2 1l-18.2 21z")
88
path(d="M336.2 83.4h-36.6a10 10 0 0 0-7.5 16.6 44.8 44.8 0 0 1 11.4 30.3 10 10 0 0 1-20 0c0-25.3-34.2-36.6-68.1-36.6-27.3 0-44.7 10-51.8 19.5a23 23 0 0 0-4.1 21c4.1 15 27.5 23 60 32.4l8.5 2.5c30.6 9 59.6 17.4 66.4 42 1.6 5.6 2 11.1 1.2 16.6a10 10 0 0 0 17.5 7.9l73.7-85.6a10 10 0 0 0 0-13l-43-50a10 10 0 0 0-7.6-3.6zm-22.8 121.2c-10.3-34.5-47.2-45.2-79.8-54.7l-8.5-2.5c-10-2.9-21.2-6.2-30.7-10-12.5-4.9-15.3-8.1-15.7-8.7-.4-1.4-.3-2 .8-3.4 3-4 14.4-11.6 35.9-11.6 27.5 0 48.1 8.8 48.1 16.6a30 30 0 0 0 60 0c0-9.5-2-18.5-5.7-26.9h13.8l34.4 40-52.6 61.2z")
99
path(d="M439.6 137L362 47a10 10 0 0 0-7.6-3.6h-267a10 10 0 0 0-7.6 3.5L2.4 137a10 10 0 0 0 0 13l211 245.2a10 10 0 0 0 15.2 0l211-245.1a10 10 0 0 0 0-13zM221 373.1L23.2 143.4l68.9-80h257.8l69 80L221 373.2z")
10-
div.v-toolbar__logo-title Vueper Slides&nbsp;
10+
div.top-bar__logo-title Vueper Slides&nbsp;
1111
span.intro A Vue Super Slideshow / Carousel
12-
v-toolbar-items.v-toolbar__items
12+
v-toolbar-items.top-bar__items
1313
v-menu(offset-y open-on-hover left attach transition="slide-y-transition")
14-
v-btn(flat color="secondary" href="#vueper-slides--api" slot="activator")
15-
v-icon school
16-
| &nbsp;
17-
span Doc
14+
template(v-slot:activator="{ on }")
15+
v-btn(text color="secondary" href="#vueper-slides--api" v-on="on")
16+
v-icon school
17+
| &nbsp;
18+
span Doc
1819
v-list.no-wrap
1920
v-list-tile(color="secondary" href="#installation") Installation
2021
v-list-tile(color="secondary" href="#how-to-use") How To Use
@@ -30,10 +31,11 @@ v-toolbar.top-bar(app light color="white" dense flat fixed align-center :class="
3031
v-list-tile(color="secondary" href="#styling") Styling
3132
v-list-tile(color="secondary" href="#notable-version-changes") Notable Version Changes
3233
v-menu(offset-y open-on-hover left attach transition="slide-y-transition")
33-
v-btn(flat color="secondary" href="#examples" slot="activator")
34-
v-icon apps
35-
| &nbsp;
36-
span Examples
34+
template(v-slot:activator="{ on }")
35+
v-btn(text color="secondary" href="#examples" slot="activator" v-on="on")
36+
v-icon apps
37+
| &nbsp;
38+
span Examples
3739
v-list.no-wrap
3840
v-list-tile(color="secondary" href="#ex--simplest-ever") Simplest Ever
3941
v-list-tile(color="secondary" href="#ex--basic") Basic with Autoplay
@@ -81,14 +83,14 @@ $primary: #ff5252;
8183
$secondary: #42b983;
8284
$lighter-text: #ccc;
8385
84-
.v-toolbar {
86+
.top-bar {
8587
z-index: 100;
8688
position: absolute;
8789
border-bottom: 1px solid transparent !important;
8890
transition: 0.3s ease-in-out all, 0.1s 0s ease-in-out border-color;
8991
top: 0;
9092
91-
&__content {
93+
.v-toolbar__content {
9294
padding-left: 0;
9395
padding-right: 0;
9496
}
@@ -209,24 +211,24 @@ $lighter-text: #ccc;
209211
border-bottom-color: $lighter-text !important;
210212
position: fixed;
211213
212-
& .v-toolbar__title {
214+
& .top-bar__title {
213215
width: 100%;
214216
transition: 0.6s ease-in-out all, 0.3s 0.3s ease-in-out background-color;
215217
}
216218
217-
& .v-toolbar__logo {
219+
& .top-bar__logo {
218220
width: 37px;
219221
}
220222
221-
& .v-toolbar__logo-title {
223+
& .top-bar__logo-title {
222224
font-size: 0.7em;
223225
}
224226
225-
& .v-toolbar__logo-title:after {
227+
& .top-bar__logo-title:after {
226228
opacity: 0;
227229
}
228230
229-
& .v-toolbar__items {
231+
& .top-bar__items {
230232
transition: 0.3s 0.3s ease-in-out all;
231233
transform: translateX(0%);
232234
opacity: 1;
@@ -242,11 +244,11 @@ $lighter-text: #ccc;
242244
}
243245
244246
@media screen and (max-width: 449px) {
245-
.v-toolbar__items .v-btn {
247+
.top-bar__items .v-btn {
246248
min-width: 50px;
247249
}
248250
249-
.v-toolbar__items a .v-btn__content span {
251+
.top-bar__items a .v-btn__content span {
250252
display: none;
251253
}
252254
}

src/documentation/index.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -343,13 +343,13 @@
343343
v-layout.flex.xs12.sm6(align-center)
344344
div Try it:
345345
v-layout.flex.xs10.sm11(align-center wrap)
346-
v-btn(color="primary" @click="toggleSlidesTime" small)
346+
v-btn.ma-1(color="primary" @click="toggleSlidesTime" small)
347347
v-icon.pr-2 {{ slidesTimeTimerId ? 'highlight_off' : 'access_time' }}
348348
| {{ slidesTimeTimerId ? 'Stop' : 'Keep' }} updating time
349349
v-slide-x-transition.xs6.sm3
350-
v-chip(v-show="slidesTimeTimerId === 0" small outline disabled) CPU says THANK YOU!
350+
v-chip(v-show="slidesTimeTimerId === 0" small outlined disabled) CPU says THANK YOU!
351351
v-layout.flex.xs12.sm6.mb-4(align-center wrap)
352-
v-btn(color="primary" @click="contentPositionChange" small)
352+
v-btn.ma-1(color="primary" @click="contentPositionChange" small)
353353
v-icon swap_vert
354354
| &nbsp;Move content position
355355
strong.code slide-content-outside="#[span.primary--text {{ contentPosition }}]"
@@ -417,13 +417,13 @@
417417
p
418418
| This example illustrates how to add or remove slides on the fly from a running Vueper Slides instance.#[br]
419419
| You can also completely freeze the slideshow and unfreeze when you want to.#[br]
420-
v-btn(color="primary" @click="appendSlide" small)
420+
v-btn.ma-1(color="primary" @click="appendSlide" small)
421421
v-icon add
422422
| &nbsp; Add Slide
423-
v-btn(color="primary" @click="removeSlide" small)
423+
v-btn.ma-1(color="primary" @click="removeSlide" small)
424424
v-icon remove
425425
| &nbsp; Remove Slide
426-
v-btn(color="secondary" @click="toggleSlideshow" small)
426+
v-btn.ma-1(color="secondary" @click="toggleSlideshow" small)
427427
v-icon {{ slideshowDisabled ? 'check_circle' : 'highlight_off'}}
428428
| &nbsp; {{ slideshowDisabled ? 'Enable' : 'Disable' }} Slideshow
429429
highlight Note that the slideshow disables controls if you have only 1 slide or none.
@@ -629,7 +629,7 @@
629629
p
630630
| This example demonstrates how to create a parallax effect on your slideshow.#[br]
631631
| Two values can be set for different parallax effects: #[span.code 1] for standard effect, and #[span.code -1] for reverse effect.
632-
v-btn(small color="primary" @click="parallax *= -1;$refs.exParallax.refreshParallax()")
632+
v-btn.ma-1(small color="primary" @click="parallax *= -1;$refs.exParallax.refreshParallax()")
633633
v-icon sync
634634
| &nbsp; Reverse parallax effect
635635
strong #[span.code parallax = {{ parallax.toString() }}]
@@ -803,13 +803,13 @@
803803
refer to the #[a(href="#ex--parallax") Parallax Effect] example.
804804

805805
div.text-xs-center.mb-3
806-
v-btn(color="primary" small @click="$refs.myVueperSlides.previous()")
806+
v-btn.ma-1(color="primary" small @click="$refs.myVueperSlides.previous()")
807807
v-icon arrow_back
808808
| &nbsp; Previous
809-
v-btn(color="primary" small @click="$refs.myVueperSlides.goToSlide(5)")
809+
v-btn.ma-1(color="primary" small @click="$refs.myVueperSlides.goToSlide(5)")
810810
v-icon call_made
811811
| &nbsp; Go to slide 6
812-
v-btn(color="primary" small @click="$refs.myVueperSlides.next()")
812+
v-btn.ma-1(color="primary" small @click="$refs.myVueperSlides.next()")
813813
v-icon arrow_forward
814814
| &nbsp; Next
815815
vueper-slides(:slide-ratio="1/5" ref="myVueperSlides")
@@ -1532,12 +1532,12 @@ pre {
15321532
15331533
// APPLICATION
15341534
//=================================================//
1535-
.application {
1535+
.v-application {
15361536
background-color: #fff !important;
15371537
padding-top: 8em;
15381538
}
15391539
1540-
.application--wrap {
1540+
.v-application--wrap {
15411541
padding-top: 16em;
15421542
overflow-x: hidden;
15431543
}

src/main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import 'babel-polyfill'
22
import Vue from 'vue'
3-
import './plugins/vuetify'
3+
import vuetify from './plugins/vuetify'
44
import App from './app.vue'
55

66
Vue.config.productionTip = false
77

88
new Vue({
9-
render: h => h(App)
9+
render: h => h(App),
10+
vuetify
1011
}).$mount('#app')

src/plugins/vuetify.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,23 @@ import Vue from 'vue'
22
import Vuetify from 'vuetify'
33
import 'vuetify/dist/vuetify.min.css'
44

5-
Vue.use(Vuetify, {
6-
iconfont: ['md', 'fa'],
5+
Vue.use(Vuetify)
6+
7+
export default new Vuetify({
8+
icons: {
9+
iconfont: ['md', 'fa']
10+
},
711
theme: {
8-
primary: '#ff5252',
9-
secondary: '#42b983',
10-
maintext: '#999',
11-
darktext: '#444',
12-
lightertext: '#ccc',
13-
lightgrey: '#eee'
12+
dark: false,
13+
themes: {
14+
light: {
15+
primary: '#ff5252',
16+
secondary: '#42b983',
17+
maintext: '#999',
18+
darktext: '#444',
19+
lightertext: '#ccc',
20+
lightgrey: '#eee'
21+
}
22+
}
1423
}
1524
})

0 commit comments

Comments
 (0)