Skip to content

Commit

Permalink
feat(Theme): change most CTA button colors to primary (instead of suc…
Browse files Browse the repository at this point in the history
…cess) (#1269)
  • Loading branch information
raphodn authored Jan 15, 2025
1 parent b4f3974 commit 5c088b5
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/components/BarcodeScannerDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
persistent-hint
>
<template #append-inner>
<v-btn :icon="barcodeManualInputMode === 'search' ? 'mdi-magnify' : 'mdi-plus'" :disabled="!barcodeManualFormValid" @click="barcodeSearchOrSend" />
<v-btn color="primary" :icon="barcodeManualInputMode === 'search' ? 'mdi-magnify' : 'mdi-plus'" :disabled="!barcodeManualFormValid" @click="barcodeSearchOrSend" />
</template>
</v-text-field>
</v-form>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ChallengeTakePicturesCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<v-col>
<v-btn
class="float-right"
color="success"
color="primary"
variant="flat"
to="/proofs/add/multiple"
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ChallengeValidateCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<v-col>
<v-btn
class="float-right"
color="success"
color="primary"
variant="flat"
to="/experiments/price-validation-assistant"
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContributionAssistantPriceFormCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<v-spacer />
<v-btn
v-if="mode === 'Validation'"
color="success"
color="primary"
variant="flat"
@click="validatePriceTag"
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/LocationSelectorDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
persistent-hint
>
<template #append-inner>
<v-btn icon="mdi-magnify" :disabled="!locationOsmSearchForm.q" @click="locationOsmSearch" />
<v-btn color="primary" icon="mdi-magnify" :disabled="!locationOsmSearchForm.q" @click="locationOsmSearch" />
</template>
</v-text-field>
</v-form>
Expand Down Expand Up @@ -106,7 +106,7 @@
persistent-hint
>
<template #append-inner>
<v-btn icon="mdi-plus" :disabled="!locationOnlineFormValid" @click="createOnline" />
<v-btn color="primary" icon="mdi-plus" :disabled="!locationOnlineFormValid" @click="createOnline" />
</template>
</v-text-field>
</v-form>
Expand Down
2 changes: 1 addition & 1 deletion src/components/PriceEditDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<v-card-actions>
<v-btn
class="float-right"
color="success"
color="primary"
variant="flat"
elevation="1"
:loading="loading"
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProofEditDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<v-card-actions>
<v-btn
class="float-right"
color="success"
color="primary"
variant="flat"
elevation="1"
:disabled="!formFilled"
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProofUploadCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<v-card-actions>
<v-spacer />
<v-btn
color="success"
color="primary"
variant="flat"
:loading="loading || step === 2"
:disabled="!proofFormFilled || loading || step === 2"
Expand Down
12 changes: 6 additions & 6 deletions src/views/ContributionAssistant.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<h3 class="mb-4">
{{ $t('ContributionAssistant.LabelsExtractionSteps.SendLabels') }}
</h3>
<v-btn color="success" :disabled="!extractedLabels.length" :loading="processLabelsLoading" @click="processLabels">
<v-btn color="primary" :disabled="!extractedLabels.length" :loading="processLabelsLoading" @click="processLabels">
{{ $t('ContributionAssistant.LabelsExtractionSteps.SendLabelsButton') }}
</v-btn>
</v-col>
Expand Down Expand Up @@ -106,7 +106,7 @@
{{ $t('ContributionAssistant.PriceAddConfirmationMessage', { numberOfPricesAdded: productPriceFormsWithoutPriceId.length, date: proofObject.date, locationName: locationName }) }}
</p>
</v-alert>
<v-btn class="float-right mt-4" color="success" :loading="loading" @click="addPrices">
<v-btn class="float-right mt-4" color="primary" :loading="loading" @click="addPrices">
{{ $t('Common.UploadMultiplePrices', productPriceFormsWithoutPriceId.length) }}
</v-btn>
</v-col>
Expand All @@ -129,16 +129,16 @@
>
<strong>{{ $t('ContributionAssistant.PriceAddProgress', { numberOfPricesAdded: numberOfPricesAdded, totalNumberOfPrices: productPriceFormsWithoutPriceId.length }) }}</strong>
</v-progress-linear>
<v-btn to="/dashboard" class="mt-4" :aria-label="$t('Common.Dashboard')" :disabled="!allDone">
<v-btn class="mt-4" color="primary" :aria-label="$t('Common.Dashboard')" to="/dashboard" :disabled="!allDone">
{{ $t('ContributionAssistant.GoToDashboard') }}
</v-btn>
<v-btn :to="'/proofs/' + proofObject.id" class="mt-4 ml-4" :disabled="!allDone">
<v-btn class="mt-4 ml-4" color="primary" :to="'/proofs/' + proofObject.id" :disabled="!allDone">
{{ $t('ContributionAssistant.GoToProof') }}
</v-btn>
<v-btn class="mt-4 ml-4" :disabled="!allDone" @click="reloadPage">
<v-btn class="mt-4 ml-4" color="primary" :disabled="!allDone" @click="reloadPage">
{{ $t('ContributionAssistant.AddNewProof') }}
</v-btn>
<v-btn v-if="proofIdsFromQueryParam" class="mt-4 ml-4" :disabled="!allDone" @click="nextProof">
<v-btn v-if="proofIdsFromQueryParam" class="mt-4 ml-4" color="primary" :disabled="!allDone" @click="nextProof">
{{ $t('ContributionAssistant.NextProof') }}
</v-btn>
</v-col>
Expand Down
4 changes: 1 addition & 3 deletions src/views/PriceAddMultiple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<v-col>
<v-btn
class="float-right"
color="success"
color="primary"
variant="flat"
type="submit"
:loading="loading"
Expand Down Expand Up @@ -117,7 +117,6 @@
<v-col cols="12" md="6">
<v-btn
color="primary"
variant="outlined"
prepend-icon="mdi-tag-plus-outline"
@click="reloadPage"
>
Expand All @@ -127,7 +126,6 @@
<v-col cols="12" md="6">
<v-btn
color="primary"
variant="outlined"
prepend-icon="mdi-account-circle"
@click="goToDashboard"
>
Expand Down
2 changes: 1 addition & 1 deletion src/views/PriceAddSingle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<v-btn
type="submit"
class="float-right"
:color="formFilled ? 'success' : ''"
color="primary"
:loading="loading"
:disabled="!formFilled"
>
Expand Down
3 changes: 0 additions & 3 deletions src/views/ProofAddMultiple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<v-col cols="12" md="4">
<v-btn
color="primary"
variant="outlined"
prepend-icon="mdi-image-plus"
@click="reloadPage"
>
Expand All @@ -43,7 +42,6 @@
<v-col cols="12" md="4">
<v-btn
color="primary"
variant="outlined"
prepend-icon="mdi-checkbox-marked-circle-plus-outline"
@click="goToPriceValidation"
>
Expand All @@ -53,7 +51,6 @@
<v-col cols="12" md="4">
<v-btn
color="primary"
variant="outlined"
prepend-icon="mdi-account-circle"
@click="goToDashboard"
>
Expand Down
2 changes: 0 additions & 2 deletions src/views/ProofAddSingle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<v-col cols="12" md="6">
<v-btn
color="primary"
variant="outlined"
prepend-icon="mdi-image-plus"
@click="reloadPage"
>
Expand All @@ -39,7 +38,6 @@
<v-col cols="12" md="6">
<v-btn
color="primary"
variant="outlined"
prepend-icon="mdi-account-circle"
@click="goToDashboard"
>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<v-icon :icon="formFilled ? 'mdi-barcode' : 'mdi-barcode-scan'" @click="showBarcodeScannerDialog" />
</template>
<template #append-inner>
<v-btn icon="mdi-magnify" @click="search" />
<v-btn color="primary" icon="mdi-magnify" @click="search" />
</template>
</v-text-field>
</v-form>
Expand Down
10 changes: 5 additions & 5 deletions src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</h3>
<v-switch
v-model="appStore.user.preferedTheme"
color="success"
color="primary"
false-value="light"
true-value="dark"
density="compact"
Expand Down Expand Up @@ -119,7 +119,7 @@
</h3>
<v-switch
v-model="appStore.user.drawer_display_experiments"
color="success"
color="primary"
:label="$t('UserSettings.SideMenuExperimentsDisplay')"
density="compact"
hide-details="auto"
Expand All @@ -131,7 +131,7 @@
<v-switch
v-model="appStore.user.product_display_barcode"
class="mb-4"
color="success"
color="primary"
:label="$t('UserSettings.ProductDisplayBarcode')"
:hint="$t('Common.ExampleWithColonAndValue', { value: '1234567890123' })"
density="compact"
Expand All @@ -140,7 +140,7 @@
/>
<v-switch
v-model="appStore.user.product_display_category_tag"
color="success"
color="primary"
:label="$t('UserSettings.ProductDisplayCategoryTag')"
:hint="$t('Common.ExampleWithColonAndValue', { value: 'en:oranges' })"
density="compact"
Expand All @@ -153,7 +153,7 @@
</h3>
<v-switch
v-model="appStore.user.location_display_osm_id"
color="success"
color="primary"
:label="$t('UserSettings.LocationDisplayOSMID')"
:hint="$t('Common.ExampleWithColonAndValue', { value: 'N652825274' })"
density="compact"
Expand Down
2 changes: 1 addition & 1 deletion src/views/UserSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

<v-row>
<v-col>
<v-btn type="submit" :color="formFilled ? 'success' : ''" :disabled="!formFilled">
<v-btn type="submit" color="primary" :disabled="!formFilled">
{{ $t('UserSettings.Save') }}
</v-btn>
</v-col>
Expand Down

0 comments on commit 5c088b5

Please sign in to comment.