Skip to content

Commit

Permalink
feat: add ability to have gaps between steps. update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
guastallaigor committed May 14, 2021
1 parent 2ade7ea commit 9a0e902
Show file tree
Hide file tree
Showing 10 changed files with 3,075 additions and 2,019 deletions.
2 changes: 2 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
yarn lint
yarn test:unit
7 changes: 0 additions & 7 deletions .huskyrc.json

This file was deleted.

3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ config
stories
tests
coverage
.eslintrc.js
.eslintrc.js
.husky
64 changes: 32 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-horizontal-timeline",
"version": "0.8.0",
"version": "0.9.0",
"private": false,
"description": "Just a simple horizontal timeline component made with Vue.js",
"homepage": "https://github.com/guastallaigor/vue-horizontal-timeline#readme",
Expand All @@ -24,43 +24,43 @@
"vue": "^2.6.12"
},
"devDependencies": {
"@babel/preset-env": "^7.11.5",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@storybook/addon-a11y": "^6.0.22",
"@storybook/addon-actions": "^6.0.22",
"@storybook/addon-backgrounds": "^6.0.22",
"@storybook/addon-knobs": "^6.0.22",
"@storybook/addon-viewport": "^6.0.22",
"@storybook/vue": "^6.0.22",
"@vue/cli-plugin-babel": "^4.5.6",
"@vue/cli-plugin-eslint": "^4.5.6",
"@vue/cli-plugin-unit-jest": "^4.5.6",
"@vue/cli-service": "^4.5.6",
"@vue/eslint-config-standard": "^5.1.2",
"@vue/test-utils": "^1.1.0",
"autoprefixer": "^10.0.1",
"@babel/preset-env": "^7.14.2",
"@commitlint/cli": "^12.1.4",
"@commitlint/config-conventional": "^12.1.4",
"@storybook/addon-a11y": "^6.2.9",
"@storybook/addon-actions": "^6.2.9",
"@storybook/addon-backgrounds": "^6.2.9",
"@storybook/addon-knobs": "^6.2.9",
"@storybook/addon-viewport": "^6.2.9",
"@storybook/vue": "^6.2.9",
"@vue/cli-plugin-babel": "^4.5.13",
"@vue/cli-plugin-eslint": "^4.5.13",
"@vue/cli-plugin-unit-jest": "^4.5.13",
"@vue/cli-service": "^4.5.13",
"@vue/eslint-config-standard": "^6.0.0",
"@vue/test-utils": "^1.2.0",
"autoprefixer": "^10.2.5",
"babel-core": "6.26.3",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.3.0",
"babel-loader": "^8.1.0",
"babel-jest": "^26.6.3",
"babel-loader": "^8.2.2",
"babel-preset-vue": "^2.0.2",
"clean-css-cli": "^4.3.0",
"commitizen": "^4.2.1",
"core-js": "3.6.5",
"eslint": "^7.10.0",
"clean-css-cli": "^5.3.0",
"commitizen": "^4.2.4",
"core-js": "3.12.1",
"eslint": "^7.26.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2",
"husky": "^4.3.0",
"postcss": "^8.1.1",
"postcss-cli": "^8.0.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-standard": "^5.0.0",
"eslint-plugin-vue": "^7.9.0",
"husky": "^6.0.0",
"postcss": "^8.2.15",
"postcss-cli": "^8.3.1",
"rimraf": "^3.0.2",
"sass": "^1.26.11",
"sass-loader": "^10.0.2",
"vue-cli-plugin-storybook": "^1.3.0",
"sass": "^1.32.13",
"sass-loader": "^11.1.1",
"vue-cli-plugin-storybook": "^2.0.0",
"vue-template-compiler": "^2.6.12"
},
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/style.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/css/style.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
&:last-child {
width: 330px;
}
&:not(:last-child) {
&.add-step:not(:last-child) {
padding-right: 0px;
margin-right: 0px;
&::after {
Expand Down
14 changes: 12 additions & 2 deletions src/components/VueHorizontalTimeline.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,18 @@
<div class="vue-horizontal-timeline" :style="setTimelineStyles">
<section class="timeline">
<ol>
<li v-for="(item, i) in items" :key="i" :style="setLineColor">
<div class="time" :class="getTimeClass(item)" :style="getTimeStyles" @click="cardClicked(item)">
<li
v-for="(item, i) in items"
:key="i"
:style="setLineColor"
:class="{'add-step': $scopedSlots.default || item[titleAttr] || item[contentAttr]}"
>
<div
v-if="$scopedSlots.default || item[titleAttr] || item[contentAttr]"
class="time"
:class="getTimeClass(item)"
:style="getTimeStyles" @click="cardClicked(item)"
>
<slot v-if="$scopedSlots.default" v-bind:item="item"/>
<span
class="title"
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/__snapshots__/vue-horizontal-timeline.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ exports[`When I create the VueHorizontalTimeline component should match snapshot
<div class="vue-horizontal-timeline">
<section class="timeline">
<ol>
<li style="background: rgb(3, 169, 244);">
<li class="add-step" style="background: rgb(3, 169, 244);">
<div class="time" style="min-width: 200px;">
<!----> <span class="title">
Title example 1
</span> <span class="content">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ex dolor, malesuada luctus scelerisque ac, auctor vitae risus. Vivamus risus dolor, faucibus a bibendum quis, facilisis eget odio. Nullam non condimentum orci, a cursus magna. Suspendisse te...
</span></div>
</li>
<li style="background: rgb(3, 169, 244);">
<li class="add-step" style="background: rgb(3, 169, 244);">
<div class="time" style="min-width: 200px;">
<!----> <span class="title">
Title example 2
</span> <span class="content">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ex dolor, malesuada luctus scelerisque ac, auctor vitae risus. Vivamus risus dolor, faucibus a bibendum quis, facilisis eget odio. Nullam non condimentum orci, a cursus magna. Suspendisse te...
</span></div>
</li>
<li style="background: rgb(3, 169, 244);">
<li class="add-step" style="background: rgb(3, 169, 244);">
<div class="time" style="min-width: 200px;">
<!----> <span class="title">
Title example 3
Expand Down

0 comments on commit 9a0e902

Please sign in to comment.