diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue index d536a0ed2..9227d1e8b 100644 --- a/webapp/components/CommentForm/CommentForm.vue +++ b/webapp/components/CommentForm/CommentForm.vue @@ -5,7 +5,11 @@
- + {{ $t('actions.cancel') }} @@ -67,7 +71,6 @@ export default { this.$emit('showEditCommentMenu', false) }, handleCancel() { - console.log('handle cancel') if (!this.update) { this.clear() } else { diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index d67af69d9..281f40fd5 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -82,11 +82,7 @@
- + {{ $t('actions.cancel') }} diff --git a/webapp/components/FilterPosts/GeneralFilterMenuItems.vue b/webapp/components/FilterPosts/GeneralFilterMenuItems.vue index cb499c898..c2b7acadd 100644 --- a/webapp/components/FilterPosts/GeneralFilterMenuItems.vue +++ b/webapp/components/FilterPosts/GeneralFilterMenuItems.vue @@ -37,11 +37,7 @@
- + diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue index ba635575a..e1eb0c693 100644 --- a/webapp/components/LoginForm/LoginForm.vue +++ b/webapp/components/LoginForm/LoginForm.vue @@ -50,13 +50,7 @@ {{ $t('login.forgotPassword') }} - + {{ $t('login.login') }} diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.story.js b/webapp/components/_new/generic/BaseButton/BaseButton.story.js index 900c7b9a2..1621939c0 100644 --- a/webapp/components/_new/generic/BaseButton/BaseButton.story.js +++ b/webapp/components/_new/generic/BaseButton/BaseButton.story.js @@ -47,7 +47,7 @@ storiesOf('Generic/BaseButton', module) Small S
- ` + `, })) .add('primary', () => ({ @@ -80,5 +80,5 @@ storiesOf('Generic/BaseButton', module)
- ` + `, })) diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.vue b/webapp/components/_new/generic/BaseButton/BaseButton.vue index 1044a30c7..fb69a00c0 100644 --- a/webapp/components/_new/generic/BaseButton/BaseButton.vue +++ b/webapp/components/_new/generic/BaseButton/BaseButton.vue @@ -3,7 +3,7 @@ :type="type" :class="buttonClass" :disabled="loading" - @click.capture="(event) => $emit('click', event)" + @click.capture="event => $emit('click', event)" > @@ -73,8 +73,8 @@ export default { else if (this.size === 'large') buttonClass += ' --large' return buttonClass - } - } + }, + }, } @@ -93,7 +93,7 @@ export default { overflow: hidden; font-weight: $font-weight-bold; cursor: pointer; - transition: background-color .1s; + transition: background-color 0.1s; &:focus { outline: 1px dashed $color-primary; @@ -168,7 +168,6 @@ export default { } &.--large { - } &.--circle { diff --git a/webapp/components/_new/generic/CounterIcon/CounterIcon.vue b/webapp/components/_new/generic/CounterIcon/CounterIcon.vue index 6202f823c..4f2d79a58 100644 --- a/webapp/components/_new/generic/CounterIcon/CounterIcon.vue +++ b/webapp/components/_new/generic/CounterIcon/CounterIcon.vue @@ -45,7 +45,7 @@ export default { border-radius: 50%; transform: translateX(50%); - color:$color-neutral-100; + color: $color-neutral-100; background-color: $color-primary; font-size: 10px; line-height: 1; diff --git a/webapp/components/_new/generic/LoadingSpinner/LoadingSpinner.vue b/webapp/components/_new/generic/LoadingSpinner/LoadingSpinner.vue index 98e7dc200..74e9d91bc 100644 --- a/webapp/components/_new/generic/LoadingSpinner/LoadingSpinner.vue +++ b/webapp/components/_new/generic/LoadingSpinner/LoadingSpinner.vue @@ -1,14 +1,6 @@ diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index f467b78e3..1e368f01a 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -94,10 +94,7 @@ export default { /* ** Global CSS */ - css: [ - '~assets/_new/styles/resets.scss', - '~assets/styles/main.scss', - ], + css: ['~assets/_new/styles/resets.scss', '~assets/styles/main.scss'], /* ** Global processed styles diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 66d9eebfa..f9223a01b 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -42,7 +42,11 @@ diff --git a/webapp/storybook/config.js b/webapp/storybook/config.js index 60b61d787..576136f92 100644 --- a/webapp/storybook/config.js +++ b/webapp/storybook/config.js @@ -2,6 +2,7 @@ import { addParameters, configure } from '@storybook/vue' import Vue from 'vue' import Vuex from 'vuex' import { action } from '@storybook/addon-actions' +// eslint-disable-next-line import/no-webpack-loader-syntax import '!style-loader!css-loader!sass-loader!../assets/_new/styles/resets.scss' Vue.use(Vuex) @@ -60,7 +61,7 @@ addParameters({ options: { storySort: (a, b) => a[1].kind === b[1].kind ? 0 : a[1].id.localeCompare(b[1].id, { numeric: true }), - } + }, }) configure(loadStories, module)