Merge pull request #46 from dderbentsov/UC-15

Поправлено отображение иконок svg
This commit is contained in:
Алексей Дёмин
2022-10-19 17:39:43 +03:00
committed by GitHub
8 changed files with 145 additions and 86 deletions

View File

@@ -1,10 +1,10 @@
@font-face { @font-face {
font-family: 'icomoon'; font-family: 'icomoon';
src: url('../fonts/icomoon.eot?d07d1g'); src: url('../fonts/icomoon.eot?gy54l');
src: url('../fonts/icomoon.eot?d07d1g#iefix') format('embedded-opentype'), src: url('../fonts/icomoon.eot?gy54l#iefix') format('embedded-opentype'),
url('../fonts/icomoon.ttf?d07d1g') format('truetype'), url('../fonts/icomoon.ttf?gy54l') format('truetype'),
url('../fonts/icomoon.woff?d07d1g') format('woff'), url('../fonts/icomoon.woff?gy54l') format('woff'),
url('../fonts/icomoon.svg?d07d1g#icomoon') format('svg'); url('../fonts/icomoon.svg?gy54l#icomoon') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
font-display: block; font-display: block;
@@ -13,6 +13,7 @@
[class^="icon-"]::before, [class*=" icon-"]::before { [class^="icon-"]::before, [class*=" icon-"]::before {
/* use !important to prevent issues with browser extensions that change fonts */ /* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important; font-family: 'icomoon' !important;
speak: never;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-variant: normal; font-variant: normal;
@@ -24,126 +25,158 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-settings:before {
content: "\e925";
}
.icon-home:before { .icon-home:before {
content: "\e926"; content: "\e931";
color: #252850;
} }
.icon-calendar-2:before { .icon-settings:before {
content: "\e927"; content: "\e932";
color: #252850;
} }
.icon-person-2:before { .icon-checkbox-off:before {
content: "\e928";
}
.icon-basket:before {
content: "\e900"; content: "\e900";
} }
.icon-bell:before { .icon-basket:before {
content: "\e901"; content: "\e901";
} }
.icon-calendar:before { .icon-bell:before {
content: "\e902"; content: "\e902";
} }
.icon-cancel:before { .icon-brush:before {
content: "\e903"; content: "\e903";
} }
.icon-cancel-mini:before { .icon-calendar:before {
content: "\e904"; content: "\e904";
} }
.icon-change-place:before { .icon-calendar-2:before {
content: "\e905"; content: "\e905";
} }
.icon-close-eye:before { .icon-camera:before {
content: "\e906"; content: "\e906";
} }
.icon-copy:before { .icon-camera-reverse:before {
content: "\e907"; content: "\e907";
} }
.icon-discord:before { .icon-cancel:before {
content: "\e908"; content: "\e908";
} }
.icon-doc-ok:before { .icon-cancel-mini:before {
content: "\e909"; content: "\e909";
} }
.icon-dots:before { .icon-change-place:before {
content: "\e90a"; content: "\e90a";
} }
.icon-down-arrow:before { .icon-checkbox-on:before {
content: "\e90b"; content: "\e90b";
} }
.icon-edit:before { .icon-computer:before {
content: "\e90c"; content: "\e90c";
} }
.icon-export:before { .icon-copy:before {
content: "\e90d"; content: "\e90d";
} }
.icon-eye:before { .icon-discord:before {
content: "\e90e"; content: "\e90e";
} }
.icon-files:before { .icon-doc-ok:before {
content: "\e90f"; content: "\e90f";
} }
.icon-filter:before { .icon-dots:before {
content: "\e910"; content: "\e910";
} }
.icon-google:before { .icon-down-arrow:before {
content: "\e911"; content: "\e911";
} }
.icon-group:before { .icon-download:before {
content: "\e912"; content: "\e912";
} }
.icon-long-arrow:before { .icon-edit:before {
content: "\e913"; content: "\e913";
} }
.icon-mail:before { .icon-export:before {
content: "\e914"; content: "\e914";
} }
.icon-ok:before { .icon-eye-off:before {
content: "\e915"; content: "\e915";
} }
.icon-person:before { .icon-eye-on:before {
content: "\e916"; content: "\e916";
} }
.icon-phone:before { .icon-files:before {
content: "\e917"; content: "\e917";
} }
.icon-plus:before { .icon-filter:before {
content: "\e918"; content: "\e918";
} }
.icon-search:before { .icon-google:before {
content: "\e919"; content: "\e919";
} }
.icon-slack:before { .icon-group:before {
content: "\e91a"; content: "\e91a";
} }
.icon-sort-number:before { .icon-long-arrow:before {
content: "\e91b"; content: "\e91b";
} }
.icon-sort-word:before { .icon-mail:before {
content: "\e91c"; content: "\e91c";
} }
.icon-star:before { .icon-mirror:before {
content: "\e91d"; content: "\e91d";
} }
.icon-star-black:before { .icon-ok:before {
content: "\e91e"; content: "\e91e";
} }
.icon-table:before { .icon-person:before {
content: "\e91f"; content: "\e91f";
} }
.icon-telegram:before { .icon-person-2:before {
content: "\e920"; content: "\e920";
} }
.icon-time:before { .icon-phone:before {
content: "\e921"; content: "\e921";
} }
.icon-up-tag:before { .icon-photo-filter:before {
content: "\e922"; content: "\e922";
} }
.icon-user-data:before { .icon-plus:before {
content: "\e923"; content: "\e923";
} }
.icon-vk:before { .icon-search:before {
content: "\e924"; content: "\e924";
} }
.icon-slack:before {
content: "\e925";
}
.icon-sort-number:before {
content: "\e926";
}
.icon-sort-word:before {
content: "\e927";
}
.icon-star-off:before {
content: "\e928";
}
.icon-star-on:before {
content: "\e929";
}
.icon-table:before {
content: "\e92a";
}
.icon-tg:before {
content: "\e92b";
}
.icon-time:before {
content: "\e92c";
}
.icon-turn:before {
content: "\e92d";
}
.icon-up-tag:before {
content: "\e92e";
}
.icon-user-data:before {
content: "\e92f";
}
.icon-vk:before {
content: "\e930";
}

Binary file not shown.

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Binary file not shown.

View File

@@ -25,4 +25,9 @@ export default {
color: var(--default-white) color: var(--default-white)
background-color: var(--btn-blue-color) background-color: var(--btn-blue-color)
border-radius: 4px border-radius: 4px
&:hover
opacity: 0.7
&:active
opacity: 1
background-color: var(--font-dark-blue-color)
</style> </style>

View File

@@ -1,7 +1,7 @@
<template lang="pug"> <template lang="pug">
button.button.flex.gap-x-2.px-6.box-border(class="py-2.5") button.button.flex.gap-x-2.px-6.box-border(class="py-2.5")
img(v-if="withIcon || onlyIcon" src="@/assets/icons/export.svg" alt="Export") .icon-download.text(v-if="withIcon || onlyIcon")
span.text.text-base.font-semibold(v-if="!onlyIcon" ) Сохранить span.text-base.font-semibold(v-if="!onlyIcon" ) Сохранить
</template> </template>
<script> <script>
@@ -22,6 +22,7 @@ export default {
.button .button
border: 2px solid var(--btn-blue-color) border: 2px solid var(--btn-blue-color)
border-radius: 4px border-radius: 4px
.text
color: var(--btn-blue-color) color: var(--btn-blue-color)
&:hover
opacity: 0.7
</style> </style>

View File

@@ -43,7 +43,6 @@ export default {
}, },
data() { data() {
return { return {
name: "sdasdasd",
infoClient: { infoClient: {
fullName: "", fullName: "",
priority: "", priority: "",