Merge pull request #109 from pulsardev/staging

Merge staging into master
pulsardev · Feb 6, 2020 · f1d99ae · f1d99ae
2 parents d2a6cd9 + f595b6f
commit f1d99ae
Show file tree

Hide file tree

Showing 17 changed files with 510 additions and 113 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
             # fallback to using the latest cache if no exact match is found
             - v1-dependencies-
 
-      - run: npm install
+      - run: npm ci
 
       - save_cache:
           paths:
@@ -39,20 +39,21 @@ jobs:
       - run: git worktree add ../vue-tour-landing origin/landing
 
       # Download and cache dependencies
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "../vue-tour-landing/package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-            -
+      # - restore_cache:
+      #     keys:
+      #       - v1-dependencies-{{ checksum "../vue-tour-landing/package.json" }}
+      #       # fallback to using the latest cache if no exact match is found
+      #       - v1-dependencies-
+
       - run:
-          command: npm install
+          command: npm ci
           working_directory: ~/vue-tour-landing
 
-      - save_cache:
-          paths:
-            - ../vue-tour-landing/node_modules
-          key: v1-dependencies-{{ checksum "../vue-tour-landing/package.json" }}
+      # - save_cache:
+      #     paths:
+      #       - ../vue-tour-landing/node_modules
+      #       - /home/circleci/.cache/Cypress
+      #     key: v1-dependencies-{{ checksum "../vue-tour-landing/package.json" }}
 
       # run e2e tests!
       - run:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.3.0](https://github.com/pulsardev/vue-tour/compare/v1.2.0...v1.3.0) (2020-02-06)
+
+
+### Features
+
+* add example step title and link to placement options ([4cd8ccc](https://github.com/pulsardev/vue-tour/commit/4cd8ccc0794f739cee2ef3d8141ad291ee92faa2))
+* add options.debug flag for console output ([effbd1d](https://github.com/pulsardev/vue-tour/commit/effbd1dd18708a610670765bdad2416af9e18d7d)), closes [#101](https://github.com/pulsardev/vue-tour/issues/101)
+* **buttons:** support global and per step button configuration ([86fd9b8](https://github.com/pulsardev/vue-tour/commit/86fd9b813fa6416f2c99b45a3f781384361eb162))
+* add BEM compliant class names to step buttons ([34b9625](https://github.com/pulsardev/vue-tour/commit/34b96254c501ac0f243d243fd837b4e9eadb261a))
+* add highlight ([e6a2a2d](https://github.com/pulsardev/vue-tour/commit/e6a2a2d4da7d146340e22e750efb811a214b8d33))
+* **highlight:** add the possibility to highlight elements during the tour ([f828b12](https://github.com/pulsardev/vue-tour/commit/f828b1210257aaf6a39b0151022701c0b1332cac))
+* add enabledButtons new props (all true by default) which can ([1354557](https://github.com/pulsardev/vue-tour/commit/13545575e78327e40e20af9fab7fc9889e8061c6))
+
+
+### Bug Fixes
+
+* pass a copy of the enabledButtons configuration object ([9fb0ec9](https://github.com/pulsardev/vue-tour/commit/9fb0ec92f1176905edf7cca36f18eda0894ffb70))
+
 ## [1.2.0](https://github.com/pulsardev/vue-tour/compare/v1.1.0...v1.2.0) (2019-12-29)
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -34,6 +34,14 @@ Then, when the new version is ready:
 
 The landing page is built by the CI using the last sources.
 
+### Merging PRs
+
+If a PR has a lot of conflicts and you want to make sure it's working or you want to cherry-pick some commits, you can checkout the PR branch locally:
+```
+git fetch origin pull/:ID/head:pr/:ID
+```
+Where `:ID` is the ID of the PR. The previous command will create a new branch `pr/:ID` containing the changes and commits of the PR.
+
 ## Generating a Changelog
 
 By using "standard" guidelines we are able to automatically generate a changelog from our git commit messages.

diff --git a/README.md b/README.md
@@ -59,6 +59,9 @@ The `target` property of each step can target a DOM element in any component of
         steps: [
           {
             target: '#v-step-0',  // We're using document.querySelector() under the hood
+            header: {
+              title: 'Get Started',
+            },
             content: `Discover <strong>Vue Tour</strong>!`
           },
           {
@@ -69,7 +72,7 @@ The `target` property of each step can target a DOM element in any component of
             target: '[data-v-step="2"]',
             content: 'Try it, you\'ll love it!<br>You can put HTML in the steps and completely customize the DOM to suit your needs.',
             params: {
-              placement: 'top'
+              placement: 'top' // Any valid Popper.js placement. See https://popper.js.org/popper-documentation.html#Popper.placements
             }
           }
         ]