diff --git a/fonts/AUTHENTICSans-60.otf b/fonts/AUTHENTICSans-60.otf old mode 100755 new mode 100644 index 6f1c166..1db0101 Binary files a/fonts/AUTHENTICSans-60.otf and b/fonts/AUTHENTICSans-60.otf differ diff --git a/fonts/AUTHENTICSans-90.otf b/fonts/AUTHENTICSans-90.otf old mode 100755 new mode 100644 index e1793b6..f296a65 Binary files a/fonts/AUTHENTICSans-90.otf and b/fonts/AUTHENTICSans-90.otf differ diff --git a/makefile b/makefile index 0810f74..3d06fef 100644 --- a/makefile +++ b/makefile @@ -4,7 +4,9 @@ RSYNC := rsync -chavzP SRC := dist/* SSH := ssh -t BUILD := npm run build +RUN := npm run serve +default: serve all: publish build: @@ -12,3 +14,6 @@ build: publish: build $(RSYNC) $(SRC) $(REMOTE):$(DEST) + +serve: + $(RUN) diff --git a/src/App.vue b/src/App.vue index a58d378..bbf79a2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,16 +1,24 @@ @@ -26,4 +34,26 @@ export default { .fade-leave-active { opacity: 0 } + +.slide-leave-active, +.slide-enter-active { + transition: 0.5s; +} +.slide-enter { + transform: translate(100%, 0); +} +.slide-leave-to { + transform: translate(-100%, 0); +} + +.slideback-leave-active, +.slideback-enter-active { + transition: 0.5s; +} +.slideback-enter { + transform: translate(-100%, 0); +} +.slideback-leave-to { + transform: translate(100%, 0); +} diff --git a/src/components/ThirdEdition.vue b/src/components/ThirdEdition.vue new file mode 100644 index 0000000..41cf51e --- /dev/null +++ b/src/components/ThirdEdition.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/src/components/edition2/knife.vue b/src/components/edition2/knife.vue index 67201cc..cb8225e 100644 --- a/src/components/edition2/knife.vue +++ b/src/components/edition2/knife.vue @@ -152,7 +152,7 @@ a { - + @@ -220,9 +220,20 @@ export default { return { } }, - components: { - MenuBar - } +// components: { +// MenuBar +// }, +// beforeRouteLeave(to, from, next) { +// let transitionName = to.meta.transitionName || from.meta.transitionName; + +// if (document.activeElement.id === 'leftarrow') { +// this.transitionName = 'slide'; +// } + +// console.log('thisistransition', this.transitionName); + +// next(); +// }, } diff --git a/src/components/edition3/bananas.vue b/src/components/edition3/bananas.vue index 452e515..ec57c5e 100644 --- a/src/components/edition3/bananas.vue +++ b/src/components/edition3/bananas.vue @@ -1,18 +1,5 @@