From c70b0b23db545c4588c46ba403cdc3af1494cea7 Mon Sep 17 00:00:00 2001 From: DwCay Date: Mon, 17 Oct 2022 12:20:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/sass/variables.sass | 1 - src/components/base/BaseInput.vue | 2 +- src/pages/clients/components/ClientsTable.vue | 2 +- src/pages/clients/components/ClientsTableHeader.vue | 4 ++-- .../clients/components/ClientsTableHeaderActions.vue | 9 ++------- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index 4f6576b..a3177c6 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -17,4 +17,3 @@ --bg-hover-row-table: rgba(215, 217, 255, 0.25) --default-white: #fff --btn-red-color: #ff6f6f - --br-grey-color: #D3D4DC diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue index bcaf570..44b2fc0 100644 --- a/src/components/base/BaseInput.vue +++ b/src/components/base/BaseInput.vue @@ -30,7 +30,7 @@ export default { .right order: 1 .input-wrapper - border: 2px solid var(--br-grey-color) + border: 2px solid var(--border-light-grey-color) border-radius: 4px .input-search min-width: 220px diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue index 97fbf92..c54e773 100644 --- a/src/pages/clients/components/ClientsTable.vue +++ b/src/pages/clients/components/ClientsTable.vue @@ -103,7 +103,7 @@ export default { if (e.target.id === "all") { this.selectAll = !this.selectAll; this.marked = this.dataClients.map((el) => el.id); - !this.selectAll ? (this.marked = []) : true; + !this.selectAll && (this.marked = []); } else { if (e.target.checked) { this.marked = [...this.marked, e.target.id]; diff --git a/src/pages/clients/components/ClientsTableHeader.vue b/src/pages/clients/components/ClientsTableHeader.vue index 8ed0803..128c08b 100644 --- a/src/pages/clients/components/ClientsTableHeader.vue +++ b/src/pages/clients/components/ClientsTableHeader.vue @@ -4,7 +4,7 @@ base-input(:with-icon="true") button.filter-button.flex.items-center.justify-center.box-border(class="px-2.5") .icon-filter.text-xl.leading-4 - clients-table-header-actions(v-if="!!isOpenActions" :is-selected-one="isOpenActions") + clients-table-header-actions(v-if="!!isOpenActions" :is-selected-one="isOpenActions===1") .flex.w-fit.h-fit.gap-x-2 bass-export-button(:only-icon="true") base-create-button(:with-icon="true") @@ -33,5 +33,5 @@ export default { diff --git a/src/pages/clients/components/ClientsTableHeaderActions.vue b/src/pages/clients/components/ClientsTableHeaderActions.vue index 3cf375e..8e68dea 100644 --- a/src/pages/clients/components/ClientsTableHeaderActions.vue +++ b/src/pages/clients/components/ClientsTableHeaderActions.vue @@ -1,6 +1,6 @@