Merge branch 'master' into UC-13

src/components/HeaderInputs.vue

@@ -1,15 +1,15 @@
 <template lang="pug">
   .header-inputs-wrapper.flex.items-center.font-medium.text-base(:class="{ open: isOpen }")
     .select-container(@click="changeState")
-      .select-wrapper.flex.items-center.mx-4.my-2
-        img.icon-wrapper.flex.justify-center.items-center.loupe(src="@/assets/icons/search.svg" alt="Search")
+      .select-wrapper.flex.items-center.cursor-pointer.mx-4.my-2
+        img.icon-wrapper.flex.justify-center.items-center(src="@/assets/icons/search.svg" alt="Search")
         span.custom-input.select-input.inline-block.box-border.align-middle.pl-2.pr-1 {{ selectedFilter }}
-        .arrow.icon-down-arrow.flex.justify-center.items-center
+        .arrow.icon-down-arrow.text-xsm.mt-px.flex.justify-center.items-center
       .options-wrapper.flex.flex-col.box-border.p-4.mt-1(v-if="isOpen")
-        .option-list.flex.flex-row.mb-4(v-for="filter in filters" :key="filter" @click="selectFilter(filter)")
+        .option-list.cursor-pointer.flex.flex-row.mb-4(v-for="filter in filters" :key="filter" @click="selectFilter(filter)")
           .icon-wrapper.mr-2.flex.justify-center
-            .icon-ok.flex.justify-center.items-center(v-if="filter === selectedFilter")
-          .options-text {{ filter }}
+            .icon-ok.text-xs.flex.justify-center.items-center(v-if="filter === selectedFilter")
+          .flex.items-center {{ filter }}
     input.custom-input.search-input.inline-block.box-border.align-middle.px-4(class="py-2.5" placeholder="Искать ...")
 </template>
 
@@ -41,10 +41,8 @@ export default {
   .arrow
     transform: rotate(180deg)
 
-.wrapper
-  background-color: var(--bg-white-color)
-  display: flex
-  align-items: center
+.header-inputs-wrapper
+  background-color: var(--default-white)
 
 .select-container
   border-radius: 4px 0 0 4px
@@ -55,9 +53,6 @@ export default {
   width: 24px
   height: 24px
 
-.loupe
-  font-size: 21px
-
 .custom-input
   border: none
   outline: none
@@ -68,14 +63,13 @@ export default {
 .select-wrapper
   position: relative
   z-index: 2
-  cursor: pointer
 
 .select-input
   width: 100px
 
 .options-wrapper
   width: 172px
-  background-color: var(--bg-white-color)
+  background-color: var(--default-white)
   color: var(--font-dark-blue-color)
   border-radius: 4px
   position: absolute
@@ -88,23 +82,14 @@ export default {
     color: var(--font-grey-color)
 
 .option-list
-  cursor: pointer
   &:last-child
     margin: 0
   &:hover
     color: var(--btn-blue-color)
 
-.options-text
-  display: flex
-  align-items: center
-
 .arrow
-  font-size: 8px
   color: var(--btn-blue-color)
 
-.icon-ok
-  font-size: 13px
-
 .icon-down-arrow
   width: 16px
   height: 16px

src/components/TheHeader.vue

@@ -1,15 +1,15 @@
 <template lang="pug">
   .header-wrapper.flex.flex-row.space-between.justify-between.box-border.py-2.px-6
-    .left-side.flex.items-center.box-border
+    .flex.items-center.box-border.cursor-pointer
       img.logo-img(src="@/assets/images/logo.svg" alt="Logo")
     .flex.flex-row
       header-inputs.mr-10
       button.header-buttons.flex.justify-center.items-center.mr-8.p-0
-        .icon-bell
+        .icon-bell.text-xxl
       .flex.flex-row.justify-centflexer.items-center
         img.avatar-img.mr-2(:src="avatarSrc")
         button.header-buttons
-          .icon-down-arrow.flex.justify-center.items-center.p-0
+          .icon-down-arrow.text-xxs.flex.justify-center.items-center.p-0
 </template>
 
 <script>
@@ -31,18 +31,14 @@ export default {
   outline: none
   border: none
   background-color: transparent
-  cursor: pointer
   color: var(--font-dark-blue-color)
 
 .header-wrapper
   width: 100%
-  background-color: var(--bg-white-color)
+  background-color: var(--default-white)
   position: relative
   z-index: 2
 
-.left-side
-  cursor: pointer
-
 .logo-img
   height: 32px
   width: 70px
@@ -50,12 +46,10 @@ export default {
 .icon-down-arrow
   width: 24px
   height: 24px
-  font-size: 12px
 
 .icon-bell
   width: 24px
   height: 24px
-  font-size: 24px
   color: var(--font-dark-blue-color)
 
 .avatar-img

src/components/TheSidebar.vue

@@ -25,6 +25,6 @@ export default {
 .sidebar
   max-width: 80px
   min-width: 80px
-  background-color: #FFFFFF
+  background-color: var(--default-white)
   border-top-right-radius: 4px
 </style>

src/components/base/BaseSelect.vue

@@ -1,11 +1,11 @@
 <template lang="pug">
-  .flex.gap-2.py-2.px-4.w-full.container.cursor-pointer(@click="selectOpen")
+  .flex.gap-2.py-2.px-4.w-full.container.items-center.cursor-pointer(@click="selectOpen")
     .relative.flex.flex-col
       .not-italic.text-base.select.cursor-pointer(:style="{ minWidth : width}") {{optionData}}
         .absolute.options(v-if="isOpen" :id="id" @click="(event)=>chooseOption(event)")
           .not-italic.text-base.option(v-for="(responsible, index) in listData" :key="index" :id="index") {{responsible}}
-    .select-form-separator
-    .text-sm.ml-2.pt-1.icon-down-arrow.icon(:class="{ open: isOpen}")
+    .select-form-separator.cursor-pointer
+    .text-sm.ml-2.pt-1.icon-down-arrow.icon.text-center(:class="{ open: isOpen}")
 </template>
 
 <script>
@@ -25,7 +25,6 @@ export default {
 
 <style lang="sass" scoped>
 .container
-  align-items: center
   border-radius: 4px
   width: fit-content
   background-color: var(--bg-ligth-blue-color)
@@ -33,8 +32,8 @@ export default {
   appearance: none
   border: none
   outline: none
-  color: rgba(9, 10, 21, 0.5)
-  background-color: rgba(9, 10, 21, 0)
+  color: var(--font-black-color-1)
+  background-color: var(--font-black-color-0)
   &::-webkit-calendar-picker-indicator
     display: none
     -webkit-appearance: none
@@ -47,12 +46,11 @@ export default {
   &:hover
     background-color: var(--btn-blue-color)
 .select-form-separator
-  background-color: rgba(65, 105, 225, 0.2)
+  background-color: var(--btn-blue-color-3)
   height: 24px
   width: 1px
   border-radius: 1px
 .icon
-  text-align: center
   color: var(--font-dark-blue-color)
   &:hover
     color: var(--btn-blue-color)

src/components/base/buttons/BaseAddEvent.vue

@@ -13,7 +13,7 @@ export default {
   outline: none
   border: none
   width: fit-content
-  color: var(--bg-white-color)
+  color: var(--default-white)
   background-color: var(--btn-blue-color)
   border-radius: 4px
 </style>

src/components/base/buttons/BaseArrowButton.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  button.arrow-button.flex.items-center.icon-down-arrow.px-2.pt-px
+  button.arrow-button.flex.items-center.icon-down-arrow.text-base.px-2.pt-1
 </template>
 
 <script>
@@ -15,10 +15,9 @@ export default {
 .arrow-button
   width: 32px
   height: 32px
-  background: var(--btn-light-blue-color)
+  background-color: var(--btn-blue-color-1)
   color: var(--btn-blue-color)
   border-radius: 50%
-  font-size: 16px
   &:hover
-    background: #a0b4f0
+    background-color: var(--btn-blue-color-2)
 </style>

src/components/base/buttons/BaseButtonPlus.vue

@@ -16,6 +16,6 @@ export default {
   height: 24px
   max-height: 24px
   color: var(--btn-blue-color)
-  background-color: rgba(65, 105, 225, 0.25)
+  background-color: var(--bg-ligth-blue-color)
   border-radius: 50%
 </style>

src/components/base/buttons/BaseDocOkButton.vue

@@ -0,0 +1,37 @@
+<template lang="pug">
+  button.icon-wrap.flex.items-center.justify-center.py-1.px-2(:class="{disable: isDisable}")
+    span(v-if="numberIsVisible") 3
+    .icon-doc-ok.text-xxl
+</template>
+
+<script>
+export default {
+  name: "DocOkButton",
+  data() {
+    return {
+      numberIsVisible: false,
+      isDisable: true,
+    };
+  },
+};
+</script>
+
+<style lang="sass" scoped>
+.disable
+  opacity: 0.5
+
+.icon-wrap
+  height: 32px
+  background-color: var(--btn-blue-color-1)
+  color: var(--btn-blue-color)
+  border-radius: 4px
+  &:hover
+    background-color: var(--btn-blue-color-2)
+  &:active
+    background-color: var(--font-dark-blue-color)
+    color: var(--default-white)
+
+.icon-doc-ok
+  width: 24px
+  height: 24px
+</style>

src/components/base/buttons/BaseSidebarButton.vue

@@ -23,20 +23,20 @@ export default {
 <style lang="sass" scoped>
 .button
   width: fit-content
-  background-color: rgba(65, 105, 225, 0)
+  background-color: var(--btn-blue-color-0)
   border-radius: 0 4px 4px 0
-  border-left-color: rgba(65, 105, 225, 0)
+  border-left-color: var(--btn-blue-color-0)
   border-left-width: 4px
   border-right: none
   border-top: none
   border-bottom: none
   border-left-style: solid
 .button:focus
-  background-color: rgba(65, 105, 225, 0.3)
-  border-left-color: rgba(65, 105, 225, 1)
+  background-color: var(--btn-blue-color-1)
+  border-left-color: var(--btn-blue-color)
   color: var(--btn-blue-color)
 .button:hover
-  background-color: rgba(65, 105, 225, 0.3)
-  border-left-color: rgba(65, 105, 225, 1)
+  background-color: var(--btn-blue-color-1)
+  border-left-color: var(--btn-blue-color)
   color: var(--btn-blue-color)
 </style>