Skip to content

Commit 566bf43

Browse files
authored
Merge pull request #1395 from kkukelka/feat/colored-buy-button
1311 change label text and set color to green
2 parents 14b6171 + 7add055 commit 566bf43

File tree

7 files changed

+16
-8
lines changed

7 files changed

+16
-8
lines changed

components/rmrk/Gallery/Search/SearchBar.vue

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="card mb-3 mt-5">
3-
<div class="card-content ">
3+
<div class="card-content">
44
<div class="columns">
55
<b-field class="column is-6 mb-0">
66
<b-input
@@ -24,18 +24,17 @@
2424
<slot />
2525
</div>
2626

27-
<transition name="fade">
27+
<transition name="fade">
2828
<div v-if="isVisible" class="columns">
2929
<Sort class="column is-4 mb-0" :value="sortBy" @input="updateSortBy" />
30-
<BasicSwitch class="column is-4" v-model="vListed" label="sort.listed" size="is-medium" />
30+
<BasicSwitch class="column is-4" v-model="vListed" label="sort.listed" size="is-medium" labelColor="is-success" />
3131
</div>
3232
</transition>
33-
3433
</div>
3534
</div>
3635
</template>
3736

38-
<script lang="ts" >
37+
<script lang="ts">
3938
import { Component, Prop, Vue, Emit } from 'nuxt-property-decorator'
4039
import { Debounce } from 'vue-debounce-decorator'
4140
import shouldUpdate from '@/utils/shouldUpdate'
@@ -72,7 +71,6 @@ export default class SearchBar extends Vue {
7271
this.updateListed(listed)
7372
}
7473
75-
7674
get searchQuery(): string {
7775
return this.search
7876
}

components/rmrk/Gallery/Search/SearchBarCollection.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
v-model="vListed"
2222
label="sort.listed"
2323
size="is-medium"
24+
labelColor="is-success"
2425
/>
2526
<slot />
2627
</b-field>

components/shared/form/BasicSwitch.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
v-model="isSwitched"
55
:rounded="false"
66
:size="size"
7+
:class="labelColor"
78
>
89
{{ properLabel }}
910
</b-switch>
@@ -20,6 +21,7 @@ export default class BasicSwitch extends Vue {
2021
@Prop({ type: String, required: true }) label!: string;
2122
@Prop({ type: String }) offLabel!: string;
2223
@Prop({ type: String }) size!: string;
24+
@Prop({ type: String }) labelColor!: string;
2325
2426
get properLabel(): TranslateResult {
2527
const offLabel = this.offLabel || this.label

langDir/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
"UPDATED_AT_ASC": "Long time no interaction",
188188
"PRICE_DESC": "From most expensive",
189189
"PRICE_ASC": "From cheaper",
190-
"listed": "YOLO"
190+
"listed": "Buy now"
191191
},
192192
"mint": {
193193
"submit": "Click to create NFT(s)",

styles/derived-variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$primary: #ff149366;
44

55
// $info: $cyan;
6-
// $success: $green;
6+
$success: $green;
77
// $warning: $yellow;
88
// $danger: $red;
99

styles/global.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ body {
7070
font-size: calc(1rem * 0.75);
7171
}
7272

73+
.switch {
74+
&.is-success {
75+
color: $success;
76+
}
77+
}
78+
7379
.text {
7480
&__stroked {
7581
color: $primary;

styles/initial-variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ $white: hsl(0, 0%, 100%);
1717

1818
// $orange: hsl(14, 100%, 53%);
1919
// $yellow: hsl(48, 100%, 67%);
20+
$green: hsl(111, 34%, 55%);
2021
// $green: hsl(141, 53%, 53%);
2122
// $turquoise: hsl(171, 100%, 41%);
2223
// $cyan: hsl(204, 71%, 53%);

0 commit comments

Comments
 (0)