mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
let eslint do some magic
This commit is contained in:
parent
ad27404059
commit
56b1a74e64
@ -5,7 +5,11 @@
|
||||
<!-- with client-only the content is not shown -->
|
||||
<hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
|
||||
<div class="buttons">
|
||||
<base-button :disabled="disabled && !update" @click="handleCancel" data-test="cancel-button">
|
||||
<base-button
|
||||
:disabled="disabled && !update"
|
||||
@click="handleCancel"
|
||||
data-test="cancel-button"
|
||||
>
|
||||
{{ $t('actions.cancel') }}
|
||||
</base-button>
|
||||
<base-button type="submit" :loading="loading" :disabled="disabled || errors" primary>
|
||||
@ -67,7 +71,6 @@ export default {
|
||||
this.$emit('showEditCommentMenu', false)
|
||||
},
|
||||
handleCancel() {
|
||||
console.log('handle cancel')
|
||||
if (!this.update) {
|
||||
this.clear()
|
||||
} else {
|
||||
|
||||
@ -82,11 +82,7 @@
|
||||
</ds-text>
|
||||
<ds-space />
|
||||
<div slot="footer" style="text-align: right">
|
||||
<base-button
|
||||
data-test="cancel-button"
|
||||
:disabled="loading"
|
||||
@click="$router.back()"
|
||||
>
|
||||
<base-button data-test="cancel-button" :disabled="loading" @click="$router.back()">
|
||||
{{ $t('actions.cancel') }}
|
||||
</base-button>
|
||||
<base-button type="submit" icon="check" :loading="loading" :disabled="errors" primary>
|
||||
|
||||
@ -37,11 +37,7 @@
|
||||
</ds-flex-item>
|
||||
<div v-for="emotion in emotionsArray" :key="emotion">
|
||||
<ds-flex-item :width="{ lg: '100%' }">
|
||||
<base-button
|
||||
@click="toogleFilteredByEmotions(emotion)"
|
||||
class="emotions-buttons"
|
||||
circle
|
||||
>
|
||||
<base-button @click="toogleFilteredByEmotions(emotion)" class="emotions-buttons" circle>
|
||||
<img :src="iconPath(emotion)" width="40" />
|
||||
</base-button>
|
||||
<ds-space margin-bottom="x-small" />
|
||||
|
||||
@ -50,13 +50,7 @@
|
||||
<ds-space margin-bottom="large">
|
||||
<nuxt-link to="/password-reset/request">{{ $t('login.forgotPassword') }}</nuxt-link>
|
||||
</ds-space>
|
||||
<base-button
|
||||
:loading="pending"
|
||||
primary
|
||||
name="submit"
|
||||
type="submit"
|
||||
icon="sign-in"
|
||||
>
|
||||
<base-button :loading="pending" primary name="submit" type="submit" icon="sign-in">
|
||||
{{ $t('login.login') }}
|
||||
</base-button>
|
||||
<ds-space margin-top="large" margin-bottom="x-small">
|
||||
|
||||
@ -47,7 +47,7 @@ storiesOf('Generic/BaseButton', module)
|
||||
<base-button size="small">Small</base-button>
|
||||
<base-button size="small" circle>S</base-button>
|
||||
</div>
|
||||
`
|
||||
`,
|
||||
}))
|
||||
|
||||
.add('primary', () => ({
|
||||
@ -80,5 +80,5 @@ storiesOf('Generic/BaseButton', module)
|
||||
<div>
|
||||
<base-button size="small" icon="ellipsis-v" circle ghost />
|
||||
</div>
|
||||
`
|
||||
`,
|
||||
}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
:type="type"
|
||||
:class="buttonClass"
|
||||
:disabled="loading"
|
||||
@click.capture="(event) => $emit('click', event)"
|
||||
@click.capture="event => $emit('click', event)"
|
||||
>
|
||||
<loading-spinner v-if="loading" />
|
||||
<base-icon v-if="icon" :name="icon" />
|
||||
@ -73,8 +73,8 @@ export default {
|
||||
else if (this.size === 'large') buttonClass += ' --large'
|
||||
|
||||
return buttonClass
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -1,14 +1,6 @@
|
||||
<template>
|
||||
<svg
|
||||
viewBox="0 0 50 50"
|
||||
class="loading-spinner"
|
||||
>
|
||||
<circle
|
||||
cx="25"
|
||||
cy="25"
|
||||
r="20"
|
||||
class="circle"
|
||||
/>
|
||||
<svg viewBox="0 0 50 50" class="loading-spinner">
|
||||
<circle cx="25" cy="25" r="20" class="circle" />
|
||||
</svg>
|
||||
</template>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -42,7 +42,11 @@
|
||||
<client-only>
|
||||
<nuxt-link :to="{ name: 'post-create' }">
|
||||
<base-button
|
||||
v-tooltip="{ content: $t('contribution.newPost'), placement: 'left', delay: { show: 500 } }"
|
||||
v-tooltip="{
|
||||
content: $t('contribution.newPost'),
|
||||
placement: 'left',
|
||||
delay: { show: 500 },
|
||||
}"
|
||||
class="post-add-button"
|
||||
icon="plus"
|
||||
primary
|
||||
|
||||
@ -17,7 +17,9 @@
|
||||
</ds-text>
|
||||
|
||||
<template slot="footer">
|
||||
<base-button primary @click="submit" :disabled="!checked">{{ $t(`actions.save`) }}</base-button>
|
||||
<base-button primary @click="submit" :disabled="!checked">
|
||||
{{ $t(`actions.save`) }}
|
||||
</base-button>
|
||||
</template>
|
||||
</ds-card>
|
||||
</ds-container>
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user