mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
rename primary to filled
This commit is contained in:
parent
1b9249c685
commit
34006a25e2
@ -6,7 +6,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
:data-test="categoryButtonsId(category.id)"
|
:data-test="categoryButtonsId(category.id)"
|
||||||
@click="toggleCategory(category.id)"
|
@click="toggleCategory(category.id)"
|
||||||
:primary="isActive(category.id)"
|
:filled="isActive(category.id)"
|
||||||
:disabled="isDisabled(category.id)"
|
:disabled="isDisabled(category.id)"
|
||||||
:icon="category.icon"
|
:icon="category.icon"
|
||||||
size="small"
|
size="small"
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
>
|
>
|
||||||
{{ $t('actions.cancel') }}
|
{{ $t('actions.cancel') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
<base-button type="submit" :loading="loading" :disabled="disabled || errors" primary>
|
<base-button type="submit" :loading="loading" :disabled="disabled || errors" filled>
|
||||||
{{ $t('post.comment.submit') }}
|
{{ $t('post.comment.submit') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -82,10 +82,10 @@
|
|||||||
</ds-text>
|
</ds-text>
|
||||||
<ds-space />
|
<ds-space />
|
||||||
<div slot="footer" style="text-align: right">
|
<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()" danger>
|
||||||
{{ $t('actions.cancel') }}
|
{{ $t('actions.cancel') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
<base-button type="submit" icon="check" :loading="loading" :disabled="errors" primary>
|
<base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>
|
||||||
{{ $t('actions.save') }}
|
{{ $t('actions.save') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<div class="donation-info">
|
<div class="donation-info">
|
||||||
<progress-bar :title="title" :label="label" :goal="goal" :progress="progress" />
|
<progress-bar :title="title" :label="label" :goal="goal" :progress="progress" />
|
||||||
<a target="_blank" href="https://human-connection.org/spenden/">
|
<a target="_blank" href="https://human-connection.org/spenden/">
|
||||||
<base-button primary>{{ $t('donations.donate-now') }}</base-button>
|
<base-button filled>{{ $t('donations.donate-now') }}</base-button>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
<ds-text>
|
<ds-text>
|
||||||
{{ $t('components.enter-nonce.form.description') }}
|
{{ $t('components.enter-nonce.form.description') }}
|
||||||
</ds-text>
|
</ds-text>
|
||||||
<base-button :disabled="disabled" primary name="submit" type="submit">
|
<base-button :disabled="disabled" filled name="submit" type="submit">
|
||||||
{{ $t('components.enter-nonce.form.next') }}
|
{{ $t('components.enter-nonce.form.next') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
<slot></slot>
|
<slot></slot>
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
circle
|
circle
|
||||||
icon="check"
|
icon="check"
|
||||||
@click="resetCategories"
|
@click="resetCategories"
|
||||||
:primary="!filteredCategoryIds.length"
|
:filled="!filteredCategoryIds.length"
|
||||||
/>
|
/>
|
||||||
<ds-flex-item>
|
<ds-flex-item>
|
||||||
<label class="category-labels">{{ $t('filter-posts.categories.all') }}</label>
|
<label class="category-labels">{{ $t('filter-posts.categories.all') }}</label>
|
||||||
@ -41,7 +41,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
circle
|
circle
|
||||||
:icon="category.icon"
|
:icon="category.icon"
|
||||||
:primary="filteredCategoryIds.includes(category.id)"
|
:filled="filteredCategoryIds.includes(category.id)"
|
||||||
@click="toggleCategory(category.id)"
|
@click="toggleCategory(category.id)"
|
||||||
/>
|
/>
|
||||||
<ds-space margin-bottom="small" />
|
<ds-space margin-bottom="small" />
|
||||||
|
|||||||
@ -92,7 +92,7 @@ describe('FilterPosts.vue', () => {
|
|||||||
it('starts with all categories button active', () => {
|
it('starts with all categories button active', () => {
|
||||||
const wrapper = openFilterPosts()
|
const wrapper = openFilterPosts()
|
||||||
allCategoriesButton = wrapper.findAll('button').at(1)
|
allCategoriesButton = wrapper.findAll('button').at(1)
|
||||||
expect(allCategoriesButton.attributes().class).toContain('--primary')
|
expect(allCategoriesButton.attributes().class).toContain('--filled')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('calls TOGGLE_CATEGORY when clicked', () => {
|
it('calls TOGGLE_CATEGORY when clicked', () => {
|
||||||
@ -111,27 +111,27 @@ describe('FilterPosts.vue', () => {
|
|||||||
expect(mutations['posts/TOGGLE_LANGUAGE']).toHaveBeenCalledWith({}, 'en')
|
expect(mutations['posts/TOGGLE_LANGUAGE']).toHaveBeenCalledWith({}, 'en')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('sets category button attribute `primary` when corresponding category is filtered', () => {
|
it('sets category button attribute `filled` when corresponding category is filtered', () => {
|
||||||
getters['posts/filteredCategoryIds'] = jest.fn(() => ['cat9'])
|
getters['posts/filteredCategoryIds'] = jest.fn(() => ['cat9'])
|
||||||
const wrapper = openFilterPosts()
|
const wrapper = openFilterPosts()
|
||||||
democracyAndPoliticsButton = wrapper.findAll('button').at(4)
|
democracyAndPoliticsButton = wrapper.findAll('button').at(4)
|
||||||
expect(democracyAndPoliticsButton.attributes().class).toContain('--primary')
|
expect(democracyAndPoliticsButton.attributes().class).toContain('--filled')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('sets language button attribute `primary` when corresponding language is filtered', () => {
|
it('sets language button attribute `filled` when corresponding language is filtered', () => {
|
||||||
getters['posts/filteredLanguageCodes'] = jest.fn(() => ['es'])
|
getters['posts/filteredLanguageCodes'] = jest.fn(() => ['es'])
|
||||||
const wrapper = openFilterPosts()
|
const wrapper = openFilterPosts()
|
||||||
spanishButton = wrapper
|
spanishButton = wrapper
|
||||||
.findAll('button.language-buttons')
|
.findAll('button.language-buttons')
|
||||||
.at(languages.findIndex(l => l.code === 'es'))
|
.at(languages.findIndex(l => l.code === 'es'))
|
||||||
expect(spanishButton.attributes().class).toContain('--primary')
|
expect(spanishButton.attributes().class).toContain('--filled')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('sets "filter-by-followed-authors-only" button attribute `primary`', () => {
|
it('sets "filter-by-followed-authors-only" button attribute `filled`', () => {
|
||||||
getters['posts/filteredByUsersFollowed'] = jest.fn(() => true)
|
getters['posts/filteredByUsersFollowed'] = jest.fn(() => true)
|
||||||
const wrapper = openFilterPosts()
|
const wrapper = openFilterPosts()
|
||||||
expect(
|
expect(
|
||||||
wrapper.find('.base-button[name="filter-by-followed-authors-only"]').classes('--primary'),
|
wrapper.find('.base-button[name="filter-by-followed-authors-only"]').classes('--filled'),
|
||||||
).toBe(true)
|
).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
slot="default"
|
slot="default"
|
||||||
icon="filter"
|
icon="filter"
|
||||||
:primary="filterActive"
|
:filled="filterActive"
|
||||||
:ghost="!filterActive"
|
:ghost="!filterActive"
|
||||||
slot-scope="{ toggleMenu }"
|
slot-scope="{ toggleMenu }"
|
||||||
@click.prevent="toggleMenu()"
|
@click.prevent="toggleMenu()"
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
name="filter-by-followed-authors-only"
|
name="filter-by-followed-authors-only"
|
||||||
icon="user-plus"
|
icon="user-plus"
|
||||||
circle
|
circle
|
||||||
:primary="filteredByUsersFollowed"
|
:filled="filteredByUsersFollowed"
|
||||||
@click="toggleFilteredByFollowed(user.id)"
|
@click="toggleFilteredByFollowed(user.id)"
|
||||||
v-tooltip="{
|
v-tooltip="{
|
||||||
content: this.$t('contribution.filterFollow'),
|
content: this.$t('contribution.filterFollow'),
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
icon="check"
|
icon="check"
|
||||||
circle
|
circle
|
||||||
:primary="!filteredLanguageCodes.length"
|
:filled="!filteredLanguageCodes.length"
|
||||||
@click="resetLanguages"
|
@click="resetLanguages"
|
||||||
/>
|
/>
|
||||||
<ds-flex-item>
|
<ds-flex-item>
|
||||||
@ -36,7 +36,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
class="language-buttons"
|
class="language-buttons"
|
||||||
circle
|
circle
|
||||||
:primary="filteredLanguageCodes.includes(language.code)"
|
:filled="filteredLanguageCodes.includes(language.code)"
|
||||||
@click="toggleLanguage(language.code)"
|
@click="toggleLanguage(language.code)"
|
||||||
>
|
>
|
||||||
{{ language.code.toUpperCase() }}
|
{{ language.code.toUpperCase() }}
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
:disabled="disabled || !followId"
|
:disabled="disabled || !followId"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:icon="icon"
|
:icon="icon"
|
||||||
:primary="isFollowed && !hovered"
|
:filled="isFollowed && !hovered"
|
||||||
:danger="isFollowed && hovered"
|
:danger="isFollowed && hovered"
|
||||||
@mouseenter.native="onHover"
|
@mouseenter.native="onHover"
|
||||||
@mouseleave.native="hovered = false"
|
@mouseleave.native="hovered = false"
|
||||||
|
|||||||
@ -50,7 +50,7 @@
|
|||||||
<ds-space margin-bottom="large">
|
<ds-space margin-bottom="large">
|
||||||
<nuxt-link to="/password-reset/request">{{ $t('login.forgotPassword') }}</nuxt-link>
|
<nuxt-link to="/password-reset/request">{{ $t('login.forgotPassword') }}</nuxt-link>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
<base-button :loading="pending" primary name="submit" type="submit" icon="sign-in">
|
<base-button :loading="pending" filled name="submit" type="submit" icon="sign-in">
|
||||||
{{ $t('login.login') }}
|
{{ $t('login.login') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
<ds-space margin-top="large" margin-bottom="x-small">
|
<ds-space margin-top="large" margin-bottom="x-small">
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
/>
|
/>
|
||||||
<password-strength :password="formData.password" />
|
<password-strength :password="formData.password" />
|
||||||
<ds-space margin-top="base">
|
<ds-space margin-top="base">
|
||||||
<base-button :loading="loading" :disabled="errors" primary type="submit">
|
<base-button :loading="loading" :disabled="errors" filled type="submit">
|
||||||
{{ $t('settings.security.change-password.button') }}
|
{{ $t('settings.security.change-password.button') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
/>
|
/>
|
||||||
<password-strength :password="formData.password" />
|
<password-strength :password="formData.password" />
|
||||||
<ds-space margin-top="base" margin-bottom="xxx-small">
|
<ds-space margin-top="base" margin-bottom="xxx-small">
|
||||||
<base-button :loading="$apollo.loading" :disabled="errors" primary type="submit">
|
<base-button :loading="$apollo.loading" :disabled="errors" filled type="submit">
|
||||||
{{ $t('settings.security.change-password.button') }}
|
{{ $t('settings.security.change-password.button') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
:loading="$apollo.loading"
|
:loading="$apollo.loading"
|
||||||
primary
|
filled
|
||||||
name="submit"
|
name="submit"
|
||||||
type="submit"
|
type="submit"
|
||||||
icon="envelope"
|
icon="envelope"
|
||||||
|
|||||||
@ -106,6 +106,7 @@
|
|||||||
style="float: right;"
|
style="float: right;"
|
||||||
icon="check"
|
icon="check"
|
||||||
type="submit"
|
type="submit"
|
||||||
|
filled
|
||||||
:loading="$apollo.loading"
|
:loading="$apollo.loading"
|
||||||
:disabled="
|
:disabled="
|
||||||
errors ||
|
errors ||
|
||||||
@ -115,7 +116,6 @@
|
|||||||
!noCommercial ||
|
!noCommercial ||
|
||||||
!noPolitical
|
!noPolitical
|
||||||
"
|
"
|
||||||
primary
|
|
||||||
>
|
>
|
||||||
{{ $t('actions.save') }}
|
{{ $t('actions.save') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
:loading="$apollo.loading"
|
:loading="$apollo.loading"
|
||||||
primary
|
filled
|
||||||
name="submit"
|
name="submit"
|
||||||
type="submit"
|
type="submit"
|
||||||
icon="envelope"
|
icon="envelope"
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<base-button
|
<base-button
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
:primary="shouted"
|
:filled="shouted"
|
||||||
icon="bullhorn"
|
icon="bullhorn"
|
||||||
circle
|
circle
|
||||||
@click="toggle"
|
@click="toggle"
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
@vdropzone-thumbnail="transformImage"
|
@vdropzone-thumbnail="transformImage"
|
||||||
>
|
>
|
||||||
<div class="crop-overlay" ref="cropperOverlay" v-show="showCropper">
|
<div class="crop-overlay" ref="cropperOverlay" v-show="showCropper">
|
||||||
<base-button @click="cropImage" class="crop-confirm" primary>
|
<base-button @click="cropImage" class="crop-confirm" filled>
|
||||||
{{ $t('contribution.teaserImage.cropperConfirm') }}
|
{{ $t('contribution.teaserImage.cropperConfirm') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
<base-button
|
<base-button
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
placeholder="1200"
|
placeholder="1200"
|
||||||
icon="money"
|
icon="money"
|
||||||
/>
|
/>
|
||||||
<base-button primary type="submit" :disabled="!formData.goal || !formData.progress">
|
<base-button filled type="submit" :disabled="!formData.goal || !formData.progress">
|
||||||
{{ $t('actions.save') }}
|
{{ $t('actions.save') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</ds-form>
|
</ds-form>
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
/>
|
/>
|
||||||
</ds-flex-item>
|
</ds-flex-item>
|
||||||
<ds-flex-item width="30px">
|
<ds-flex-item width="30px">
|
||||||
<base-button primary circle type="submit" icon="search" :loading="$apollo.loading" />
|
<base-button filled circle type="submit" icon="search" :loading="$apollo.loading" />
|
||||||
</ds-flex-item>
|
</ds-flex-item>
|
||||||
</ds-flex>
|
</ds-flex>
|
||||||
</ds-form>
|
</ds-form>
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
<!--<donation-info /> -->
|
<!--<donation-info /> -->
|
||||||
<div>
|
<div>
|
||||||
<a target="_blank" href="https://human-connection.org/spenden/">
|
<a target="_blank" href="https://human-connection.org/spenden/">
|
||||||
<base-button primary>{{ $t('donations.donate-now') }}</base-button>
|
<base-button filled>{{ $t('donations.donate-now') }}</base-button>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="sorting-dropdown">
|
<div class="sorting-dropdown">
|
||||||
@ -49,7 +49,7 @@
|
|||||||
}"
|
}"
|
||||||
class="post-add-button"
|
class="post-add-button"
|
||||||
icon="plus"
|
icon="plus"
|
||||||
primary
|
filled
|
||||||
circle
|
circle
|
||||||
/>
|
/>
|
||||||
</nuxt-link>
|
</nuxt-link>
|
||||||
|
|||||||
@ -227,7 +227,7 @@
|
|||||||
class="profile-post-add-button"
|
class="profile-post-add-button"
|
||||||
icon="plus"
|
icon="plus"
|
||||||
circle
|
circle
|
||||||
primary
|
filled
|
||||||
/>
|
/>
|
||||||
</nuxt-link>
|
</nuxt-link>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
|
|||||||
@ -16,10 +16,10 @@
|
|||||||
<ds-text>
|
<ds-text>
|
||||||
{{ $t('settings.embeds.status.change.question') }}
|
{{ $t('settings.embeds.status.change.question') }}
|
||||||
</ds-text>
|
</ds-text>
|
||||||
<base-button @click="submit" :primary="!disabled" :disabled="!disabled">
|
<base-button @click="submit" :filled="!disabled" :disabled="!disabled">
|
||||||
{{ $t('settings.embeds.status.change.deny') }}
|
{{ $t('settings.embeds.status.change.deny') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
<base-button @click="submit" :primary="disabled" :disabled="disabled">
|
<base-button @click="submit" :filled="disabled" :disabled="disabled">
|
||||||
{{ $t('settings.embeds.status.change.allow') }}
|
{{ $t('settings.embeds.status.change.allow') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
|
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
:placeholder="$t('settings.data.labelBio')"
|
:placeholder="$t('settings.data.labelBio')"
|
||||||
/>
|
/>
|
||||||
<template slot="footer">
|
<template slot="footer">
|
||||||
<base-button icon="check" :disabled="errors" type="submit" :loading="loadingData" primary>
|
<base-button icon="check" :disabled="errors" type="submit" :loading="loadingData" filled>
|
||||||
{{ $t('actions.save') }}
|
{{ $t('actions.save') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<template slot="footer">
|
<template slot="footer">
|
||||||
<base-button class="submit-button" icon="check" :disabled="errors" type="submit" primary>
|
<base-button class="submit-button" icon="check" :disabled="errors" type="submit" filled>
|
||||||
{{ $t('actions.save') }}
|
{{ $t('actions.save') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
<ds-space class="backendErrors" v-if="backendErrors">
|
<ds-space class="backendErrors" v-if="backendErrors">
|
||||||
<ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
|
<ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
<base-button icon="check" :disabled="errors" type="submit" primary>
|
<base-button icon="check" :disabled="errors" type="submit" filled>
|
||||||
{{ $t('actions.save') }}
|
{{ $t('actions.save') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -54,7 +54,7 @@
|
|||||||
:placeholder="$t('settings.social-media.placeholder')"
|
:placeholder="$t('settings.social-media.placeholder')"
|
||||||
/>
|
/>
|
||||||
<ds-space margin-top="base">
|
<ds-space margin-top="base">
|
||||||
<base-button primary :disabled="disabled" type="submit">
|
<base-button filled :disabled="disabled" type="submit">
|
||||||
{{ editingLink.id ? $t('actions.save') : $t('settings.social-media.submit') }}
|
{{ editingLink.id ? $t('actions.save') : $t('settings.social-media.submit') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
<base-button v-if="editingLink.id" id="cancel" ghost @click="handleCancel()">
|
<base-button v-if="editingLink.id" id="cancel" ghost @click="handleCancel()">
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
<input id="allow-shouts" type="checkbox" v-model="shoutsAllowed" />
|
<input id="allow-shouts" type="checkbox" v-model="shoutsAllowed" />
|
||||||
<label for="allow-shouts">{{ $t('settings.privacy.make-shouts-public') }}</label>
|
<label for="allow-shouts">{{ $t('settings.privacy.make-shouts-public') }}</label>
|
||||||
</ds-space>
|
</ds-space>
|
||||||
<base-button primary @click="submit" :disabled="disabled">{{ $t('actions.save') }}</base-button>
|
<base-button filled @click="submit" :disabled="disabled">{{ $t('actions.save') }}</base-button>
|
||||||
</ds-card>
|
</ds-card>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
</ds-text>
|
</ds-text>
|
||||||
|
|
||||||
<template slot="footer">
|
<template slot="footer">
|
||||||
<base-button primary @click="submit" :disabled="!checked">
|
<base-button filled @click="submit" :disabled="!checked">
|
||||||
{{ $t(`actions.save`) }}
|
{{ $t(`actions.save`) }}
|
||||||
</base-button>
|
</base-button>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user