From 017f6a3085f75d6551c0ce84d717c8349234b590 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 4 Jul 2023 15:17:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SidebarButtonSvg.vue | 31 +++++++++++++++++++ src/components/TheSidebar.vue | 14 ++++----- src/components/base/BaseSidebarButton.vue | 13 ++++---- .../components/CalendarDateSwitcherSvg.vue | 20 ++++++++++++ .../newCalendar/components/CalendarHeader.vue | 15 ++++++--- 5 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 src/components/SidebarButtonSvg.vue create mode 100644 src/pages/newCalendar/components/CalendarDateSwitcherSvg.vue diff --git a/src/components/SidebarButtonSvg.vue b/src/components/SidebarButtonSvg.vue new file mode 100644 index 0000000..121d23c --- /dev/null +++ b/src/components/SidebarButtonSvg.vue @@ -0,0 +1,31 @@ + + + diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue index 6a0b53e..997e2af 100644 --- a/src/components/TheSidebar.vue +++ b/src/components/TheSidebar.vue @@ -6,17 +6,17 @@ :path="button.path", :id="button.id", :active="button.active", - :change-style-page="changeStylePage" + :change-style-page="changeStylePage", + :icon="button.icon" ) - q-icon(:name="`app:${button.icon}`", size="25px") .flex.text-4xl.flex-col.gap-y-6 base-button-sidebar( :path="getSettings.path", :id="getSettings.id", :active="getSettings.active", - :change-style-page="changeStylePage" + :change-style-page="changeStylePage", + :icon="getSettings.icon" ) - q-icon(:name="`app:${getSettings.icon}`", size="25px") diff --git a/src/pages/newCalendar/components/CalendarHeader.vue b/src/pages/newCalendar/components/CalendarHeader.vue index 8fa66ae..795c1af 100644 --- a/src/pages/newCalendar/components/CalendarHeader.vue +++ b/src/pages/newCalendar/components/CalendarHeader.vue @@ -63,8 +63,14 @@ :options="displayTypesList", no-caps, toggle-color="light-blue-4", - padding="4px" + padding="0px" ) + template(v-slot:one) + .w-12.h-8.flex.items-center.justify-center + date-switcher-svg(name-svg="expanded", :active="value === 'expanded'") + template(v-slot:two) + .w-12.h-8.flex.items-center.justify-center + date-switcher-svg(name-svg="compressed", :active="value === 'collapsed'")