From dc891cafc92afa24012c0eafda8178e1f90e7e69 Mon Sep 17 00:00:00 2001 From: DwCay Date: Fri, 14 Oct 2022 18:54:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20header=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/iconfonts.css | 2 +- src/assets/icons/edit.svg | 3 + src/assets/icons/export.svg | 3 + src/assets/icons/group.svg | 3 + src/assets/icons/search-black.svg | 3 + src/assets/sass/variables.sass | 1 + src/components/base/BaseInput.vue | 37 ++++++++++++ src/components/base/buttons/BaseAddEvent.vue | 19 ------- .../base/buttons/BaseButtonPlus.vue | 2 +- .../base/buttons/BaseCreateButton.vue | 28 ++++++++++ .../base/buttons/BassExportButton.vue | 27 +++++++++ .../components/CalendarFormAddEvent.vue | 2 +- .../components/ClientsActionButton.vue | 32 +++++++++++ src/pages/clients/components/ClientsTable.vue | 6 +- .../clients/components/ClientsTableHeader.vue | 37 ++++++++++++ .../components/ClientsTableHeaderActions.vue | 56 +++++++++++++++++++ tailwind.config.js | 1 + 17 files changed, 238 insertions(+), 24 deletions(-) create mode 100644 src/assets/icons/edit.svg create mode 100644 src/assets/icons/export.svg create mode 100644 src/assets/icons/group.svg create mode 100644 src/assets/icons/search-black.svg create mode 100644 src/components/base/BaseInput.vue delete mode 100644 src/components/base/buttons/BaseAddEvent.vue create mode 100644 src/components/base/buttons/BaseCreateButton.vue create mode 100644 src/components/base/buttons/BassExportButton.vue create mode 100644 src/pages/clients/components/ClientsActionButton.vue create mode 100644 src/pages/clients/components/ClientsTableHeader.vue create mode 100644 src/pages/clients/components/ClientsTableHeaderActions.vue diff --git a/src/assets/css/iconfonts.css b/src/assets/css/iconfonts.css index 08d3431..a98d367 100644 --- a/src/assets/css/iconfonts.css +++ b/src/assets/css/iconfonts.css @@ -84,7 +84,7 @@ .icon-files:before { content: "\e90f"; } -.icon-filtre:before { +.icon-filter:before { content: "\e910"; } .icon-google:before { diff --git a/src/assets/icons/edit.svg b/src/assets/icons/edit.svg new file mode 100644 index 0000000..6dee7f1 --- /dev/null +++ b/src/assets/icons/edit.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/export.svg b/src/assets/icons/export.svg new file mode 100644 index 0000000..840a2ed --- /dev/null +++ b/src/assets/icons/export.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/group.svg b/src/assets/icons/group.svg new file mode 100644 index 0000000..57efd66 --- /dev/null +++ b/src/assets/icons/group.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/search-black.svg b/src/assets/icons/search-black.svg new file mode 100644 index 0000000..acd2515 --- /dev/null +++ b/src/assets/icons/search-black.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index a3177c6..4f6576b 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -17,3 +17,4 @@ --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 new file mode 100644 index 0000000..bcaf570 --- /dev/null +++ b/src/components/base/BaseInput.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/components/base/buttons/BaseAddEvent.vue b/src/components/base/buttons/BaseAddEvent.vue deleted file mode 100644 index 06695d6..0000000 --- a/src/components/base/buttons/BaseAddEvent.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/src/components/base/buttons/BaseButtonPlus.vue b/src/components/base/buttons/BaseButtonPlus.vue index 3249601..cde6574 100644 --- a/src/components/base/buttons/BaseButtonPlus.vue +++ b/src/components/base/buttons/BaseButtonPlus.vue @@ -1,5 +1,5 @@ + + diff --git a/src/components/base/buttons/BassExportButton.vue b/src/components/base/buttons/BassExportButton.vue new file mode 100644 index 0000000..e2003de --- /dev/null +++ b/src/components/base/buttons/BassExportButton.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index d4ae927..251e3a7 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -59,7 +59,7 @@ + + diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue index faf6a10..97fbf92 100644 --- a/src/pages/clients/components/ClientsTable.vue +++ b/src/pages/clients/components/ClientsTable.vue @@ -1,5 +1,6 @@ + + diff --git a/src/pages/clients/components/ClientsTableHeaderActions.vue b/src/pages/clients/components/ClientsTableHeaderActions.vue new file mode 100644 index 0000000..3cf375e --- /dev/null +++ b/src/pages/clients/components/ClientsTableHeaderActions.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/tailwind.config.js b/tailwind.config.js index 4081d3a..f1a6ef5 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -7,6 +7,7 @@ module.exports = { }, fontSize: { xsm: ["10px", { lineHeight: "12px" }], + ins: ["11px", { lineHeight: "12px" }], xxs: ["12px", { lineHeight: "14px" }], xs: ["13px", { lineHeight: "15px" }], sm: ["14px", { lineHeight: "16px" }],