diff --git a/src/assets/css/iconfonts.css b/src/assets/css/iconfonts.css new file mode 100644 index 0000000..7645504 --- /dev/null +++ b/src/assets/css/iconfonts.css @@ -0,0 +1,150 @@ +@font-face { + font-family: 'icomoon'; + src: url('../fonts/icomoon.eot?d07d1g'); + src: url('../fonts/icomoon.eot?d07d1g#iefix') format('embedded-opentype'), + url('../fonts/icomoon.ttf?d07d1g') format('truetype'), + url('../fonts/icomoon.woff?d07d1g') format('woff'), + url('../fonts/icomoon.svg?d07d1g#icomoon') format('svg'); + font-weight: normal; + font-style: normal; + font-display: block; +} + +[class^="icon-"]::before, [class*=" icon-"]::before { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-settings:before { + content: "\e925"; +} +.icon-home:before { + content: "\e926"; +} +.icon-calendar-2:before { + content: "\e927"; +} +.icon-person-2:before { + content: "\e928"; +} +.icon-basket:before { + content: "\e900"; +} +.icon-bell:before { + content: "\e901"; +} +.icon-calendar:before { + content: "\e902"; +} +.icon-cancel:before { + content: "\e903"; +} +.icon-cancel-mini:before { + content: "\e904"; +} +.icon-change-place:before { + content: "\e905"; +} +.icon-close-eye:before { + content: "\e906"; +} +.icon-copy:before { + content: "\e907"; +} +.icon-discord:before { + content: "\e908"; +} +.icon-doc-ok:before { + content: "\e909"; +} +.icon-dots:before { + content: "\e90a"; +} +.icon-down-arrow:before { + content: "\e90b"; +} +.icon-edit:before { + content: "\e90c"; +} +.icon-export:before { + content: "\e90d"; +} +.icon-eye:before { + content: "\e90e"; +} +.icon-files:before { + content: "\e90f"; +} +.icon-filtre:before { + content: "\e910"; +} +.icon-google:before { + content: "\e911"; +} +.icon-group:before { + content: "\e912"; +} +.icon-long-arrow:before { + content: "\e913"; +} +.icon-mail:before { + content: "\e914"; +} +.icon-ok:before { + content: "\e915"; +} +.icon-person:before { + content: "\e916"; +} +.icon-phone:before { + content: "\e917"; +} +.icon-plus:before { + content: "\e918"; +} +.icon-search:before { + content: "\e919"; +} +.icon-slack:before { + content: "\e91a"; +} +.icon-sort-number:before { + content: "\e91b"; +} +.icon-sort-word:before { + content: "\e91c"; +} +.icon-star:before { + content: "\e91d"; +} +.icon-star-black:before { + content: "\e91e"; +} +.icon-table:before { + content: "\e91f"; +} +.icon-telegram:before { + content: "\e920"; +} +.icon-time:before { + content: "\e921"; +} +.icon-up-tag:before { + content: "\e922"; +} +.icon-user-data:before { + content: "\e923"; +} +.icon-vk:before { + content: "\e924"; +} diff --git a/src/assets/fonts/icomoon.eot b/src/assets/fonts/icomoon.eot new file mode 100644 index 0000000..6cc01ab Binary files /dev/null and b/src/assets/fonts/icomoon.eot differ diff --git a/src/assets/fonts/icomoon.svg b/src/assets/fonts/icomoon.svg new file mode 100644 index 0000000..882134c --- /dev/null +++ b/src/assets/fonts/icomoon.svg @@ -0,0 +1,40 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/fonts/icomoon.ttf b/src/assets/fonts/icomoon.ttf new file mode 100644 index 0000000..78f7ea5 Binary files /dev/null and b/src/assets/fonts/icomoon.ttf differ diff --git a/src/assets/fonts/icomoon.woff b/src/assets/fonts/icomoon.woff new file mode 100644 index 0000000..3c8c777 Binary files /dev/null and b/src/assets/fonts/icomoon.woff differ diff --git a/src/components/baseComponents/buttons/ButtonPlus.vue b/src/components/baseComponents/buttons/ButtonPlus.vue index 3337cab..a53e6a7 100644 --- a/src/components/baseComponents/buttons/ButtonPlus.vue +++ b/src/components/baseComponents/buttons/ButtonPlus.vue @@ -1,15 +1,10 @@ @@ -17,9 +12,10 @@ .button-plus outline: none border: none + font-size: 12px cursor: pointer - width: fit-content + color: #4772F2 + padding: 7px 7px 5px 7px background-color: rgba(65, 105, 225, 0.25) - padding: 7px 7px 3px 7px border-radius: 50% diff --git a/src/components/iconsComponents/ArrowDownIcon.vue b/src/components/iconsComponents/ArrowDownIcon.vue deleted file mode 100644 index 007e6e5..0000000 --- a/src/components/iconsComponents/ArrowDownIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/CalendarIcon.vue b/src/components/iconsComponents/CalendarIcon.vue deleted file mode 100644 index 204604a..0000000 --- a/src/components/iconsComponents/CalendarIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/ClockIcon.vue b/src/components/iconsComponents/ClockIcon.vue deleted file mode 100644 index 41e0aff..0000000 --- a/src/components/iconsComponents/ClockIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/CloseIcon.vue b/src/components/iconsComponents/CloseIcon.vue deleted file mode 100644 index c48db87..0000000 --- a/src/components/iconsComponents/CloseIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/HomeIcon.vue b/src/components/iconsComponents/HomeIcon.vue deleted file mode 100644 index ceef05e..0000000 --- a/src/components/iconsComponents/HomeIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/MailIcon.vue b/src/components/iconsComponents/MailIcon.vue deleted file mode 100644 index d82c35c..0000000 --- a/src/components/iconsComponents/MailIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/PlusIcon.vue b/src/components/iconsComponents/PlusIcon.vue deleted file mode 100644 index 62c9788..0000000 --- a/src/components/iconsComponents/PlusIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/SettingsIcon.vue b/src/components/iconsComponents/SettingsIcon.vue deleted file mode 100644 index 87cdb1d..0000000 --- a/src/components/iconsComponents/SettingsIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/UserIcon.vue b/src/components/iconsComponents/UserIcon.vue deleted file mode 100644 index ef86b7f..0000000 --- a/src/components/iconsComponents/UserIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/UserSmallIcon.vue b/src/components/iconsComponents/UserSmallIcon.vue deleted file mode 100644 index aa9b337..0000000 --- a/src/components/iconsComponents/UserSmallIcon.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/iconsComponents/basicIcon/BasicIcon.vue b/src/components/iconsComponents/basicIcon/BasicIcon.vue deleted file mode 100644 index 643f0bc..0000000 --- a/src/components/iconsComponents/basicIcon/BasicIcon.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/src/components/pages/calendarPages/FormAddEvent.vue b/src/components/pages/calendarPages/FormAddEvent.vue index 7894f71..5877e65 100644 --- a/src/components/pages/calendarPages/FormAddEvent.vue +++ b/src/components/pages/calendarPages/FormAddEvent.vue @@ -3,21 +3,18 @@ .form-item-container .close-icon-position span.title-form Ответственный - basic-icon.close-icon(width="16" height="16" icon-color="#252850" @click="closeEventForm") - close-icon + .icon-cancel.close-icon(@click="closeEventForm") .input-container(@click="openSelectResponsible") .form-select .form-item-input.select-container-res {{eventData.responsible}} .option-container(v-if="selectResponsibleOpen" id="responsible" @click="(event)=>chooseOption(event)") .option-item(v-for="(responsible, index) in listResponsible" :key="index" :id="index") {{responsible}} .select-form-separator - basic-icon(width="24" height="24" icon-color="#090A15") - arrow-down-icon + .icon-down-arrow.arrow-icon .form-item-container span.title-form Оновная информация .form-inform-container - basic-icon(width="24" height="24" icon-color="#090A15" ) - clock-icon + .icon-time.container-icon .time-input-container .input-container input.form-item-input(v-model="eventData.timeEvent.firstTime" type="time" min="08:00" max="18:00") @@ -25,8 +22,7 @@ .input-container input.form-item-input(v-model="eventData.timeEvent.secondTime" type="time" min="08:00" max="18:00") .form-inform-container - basic-icon(width="24" height="24" icon-color="#090A15") - user-icon + .icon-person.container-icon .input-container input.form-item-input(v-model="eventData.eventClient" type="text" placeholder="ФИО клиента") .form-item-container(class='additional-information') @@ -45,32 +41,24 @@ .option-container(v-if="selectKindEventOpen" id="kind" @click="(event)=>chooseOption(event)") .option-item(v-for="(kind, index) in kindEvents" :key="index" :id="index") {{kind}} .select-form-separator - basic-icon(width="24" height="24" icon-color="#090A15") - arrow-down-icon + .icon-down-arrow.arrow-icon .form-item-container .form-inform-container span.title-form Контакты button-plus(id="addContact" @click="(e)=>addFriendInfo(e)") .form-inform-container(v-for="(contact, index) in listContacts" :key="index") - basic-icon(width="24" height="20" icon-color="#090A15") - mail-icon + .icon-mail.container-icon .input-container input.form-item-input(v-model="eventData.contacts[contact]" type="text" placeholder="E-mail") add-event-button(@click="createEvent") diff --git a/src/main.js b/src/main.js index e1560c8..9e2f457 100644 --- a/src/main.js +++ b/src/main.js @@ -2,6 +2,7 @@ import { createApp } from 'vue' import App from './App.vue' import router from "./router"; import './assets/sass/styles.sass' +import './assets/css/iconfonts.css' import './assets/css/variables.css' import { Quasar } from 'quasar' import quasarUserOptions from '../quasar-user-options'