lnbits-exts/nostrmarket
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: colours (#92)

Browse source
This commit is contained in:
Vlad Stan 2023-11-08 15:33:31 +02:00 • committed by GitHub
parent 751271eb65
commit 55624cc2b5
5 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/components/direct-messages/direct-messages.html
View file

@ -6,7 +6,7 @@
<h6 class="text-subtitle1 q-my-none">Messages</h6> <h6 class="text-subtitle1 q-my-none">Messages</h6>
</div> </div>
<div class="col-4"> <div class="col-4">
<q-badge v-if="unreadMessages" color="green"><span v-text="unreadMessages"></span>&nbsp; new</q-badge> <q-badge v-if="unreadMessages" color="primary" outline><span v-text="unreadMessages"></span>&nbsp; new</q-badge>
</div> </div>
<div class="col-6"> <div class="col-6">
<q-btn v-if="activePublicKey" @click="showClientOrders" unelevated outline class="float-right">Client <q-btn v-if="activePublicKey" @click="showClientOrders" unelevated outline class="float-right">Client
@ -26,7 +26,7 @@
</q-select> </q-select>
</div> </div>
<div class="col-2"> <div class="col-2">
<q-btn label="Add" color="green" class="float-right q-mt-md" @click="showAddPublicKey = true"> <q-btn label="Add" color="primary" class="float-right q-mt-md" @click="showAddPublicKey = true">
<q-tooltip> <q-tooltip>
Add a public key to chat with Add a public key to chat with
</q-tooltip> </q-tooltip>

2
static/components/order-list/order-list.html
View file

@ -33,7 +33,7 @@
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props"> <q-tr :props="props">
<q-td auto-width> <q-td auto-width>
<q-btn size="sm" color="accent" round dense @click="props.row.expanded= !props.row.expanded" <q-btn size="sm" color="primary" round dense @click="props.row.expanded= !props.row.expanded"
:icon="props.row.expanded? 'remove' : 'add'" /> :icon="props.row.expanded? 'remove' : 'add'" />
</q-td> </q-td>

10
static/components/stall-details/stall-details.html
View file

@ -55,10 +55,10 @@
</div> </div>
<div class="row items-center q-mt-xl"> <div class="row items-center q-mt-xl">
<div class="col-6 q-pr-lg"> <div class="col-6 q-pr-lg">
<q-btn unelevated color="secondary" class="float-left" @click="updateStall()">Update Stall</q-btn> <q-btn outline unelevated class="float-left" color="primary" @click="updateStall()">Update Stall</q-btn>
</div> </div>
<div class="col-6"> <div class="col-6">
<q-btn unelevated color="pink" icon="cancel" class="float-right" @click="deleteStall()">Delete Stall</q-btn> <q-btn outline unelevated icon="cancel" class="float-right" @click="deleteStall()">Delete Stall</q-btn>
</div> </div>
</div> </div>
</q-tab-panel> </q-tab-panel>
@ -67,7 +67,7 @@
<div class="row items-center no-wrap q-mb-md"> <div class="row items-center no-wrap q-mb-md">
<div class="col-3 q-pr-lg"> <div class="col-3 q-pr-lg">
<q-btn-dropdown @click="showNewProductDialog()" unelevated split color="green" class="float-left" <q-btn-dropdown @click="showNewProductDialog()" outline unelevated split class="float-left" color="primary"
label="New Product"> label="New Product">
<q-item @click="showNewProductDialog()" clickable v-close-popup> <q-item @click="showNewProductDialog()" clickable v-close-popup>
<q-item-section> <q-item-section>
@ -95,10 +95,10 @@
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props"> <q-tr :props="props">
<q-td auto-width> <q-td auto-width>
<q-btn size="sm" color="pink" dense @click="deleteProduct(props.row.id)" icon="delete" /> <q-btn size="sm" color="grey" dense @click="deleteProduct(props.row.id)" icon="delete" />
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn size="sm" color="accent" dense @click="editProduct(props.row)" icon="edit" /> <q-btn size="sm" color="primary" dense @click="editProduct(props.row)" icon="edit" />
</q-td> </q-td>
<q-td key="id" :props="props"> {{props.row.id}} </q-td> <q-td key="id" :props="props"> {{props.row.id}} </q-td>

4
static/components/stall-list/stall-list.html
View file

@ -2,7 +2,7 @@
<div class="row items-center no-wrap q-mb-md"> <div class="row items-center no-wrap q-mb-md">
<div class="col q-pr-lg"> <div class="col q-pr-lg">
<q-btn-dropdown @click="openCreateStallDialog()" unelevated split color="green" class="float-left" <q-btn-dropdown @click="openCreateStallDialog()" outline unelevated split class="float-left" color="primary"
label="New Stall (Store)"> label="New Stall (Store)">
<q-item @click="openCreateStallDialog()" clickable v-close-popup> <q-item @click="openCreateStallDialog()" clickable v-close-popup>
<q-item-section> <q-item-section>
@ -30,7 +30,7 @@
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props"> <q-tr :props="props">
<q-td auto-width> <q-td auto-width>
<q-btn size="sm" color="accent" round dense @click="props.row.expanded= !props.row.expanded" <q-btn size="sm" color="primary" round dense @click="props.row.expanded= !props.row.expanded"
:icon="props.row.expanded? 'remove' : 'add'" /> :icon="props.row.expanded? 'remove' : 'add'" />
</q-td> </q-td>

13
templates/nostrmarket/index.html
View file

@ -6,7 +6,7 @@
<q-card> <q-card>
<q-card-section> <q-card-section>
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-4">
<merchant-details <merchant-details
:merchant-id="merchant.id" :merchant-id="merchant.id"
:inkey="g.user.wallets[0].inkey" :inkey="g.user.wallets[0].inkey"
@ -15,17 +15,17 @@
@merchant-deleted="handleMerchantDeleted" @merchant-deleted="handleMerchantDeleted"
></merchant-details> ></merchant-details>
</div> </div>
<div class="col-2"> <div class="col-6">
<q-toggle <q-toggle
@input="toggleMerchantState()" @input="toggleMerchantState()"
size="md" size="md"
checked-icon="check" checked-icon="check"
v-model="merchant.config.active" v-model="merchant.config.active"
color="green" color="primary"
unchecked-icon="clear" unchecked-icon="clear"
/> <span v-text="merchant.config.active ? 'Active': 'Deactivated'"></span> class="float-left"
/> <span v-text="merchant.config.active ? 'Accepting Orders': 'Orders Paused'"></span>
</div> </div>
<div class="col-5"></div>
<div class="col-2"> <div class="col-2">
<shipping-zones <shipping-zones
:inkey="g.user.wallets[0].inkey" :inkey="g.user.wallets[0].inkey"
@ -148,7 +148,8 @@
<q-card-section class="q-pa-md"> <q-card-section class="q-pa-md">
<q-btn <q-btn
label="Restart Nostr Connection" label="Restart Nostr Connection"
color="pink" color="grey"
outline
@click="restartNostrConnection" @click="restartNostrConnection"
> >
<q-tooltip> <q-tooltip>