From a6ca923a7695477f57367bf3dd95bdf41a4b64a4 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 25 May 2020 16:10:14 +0300 Subject: [PATCH] icons update --- .../settings_modal/settings_modal_content.vue | 9 +++++++++ src/components/tab_switcher/tab_switcher.js | 7 +++++-- src/components/tab_switcher/tab_switcher.scss | 5 +++++ static/fontello.json | 12 ++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue index 737c3637..847de1da 100644 --- a/src/components/settings_modal/settings_modal_content.vue +++ b/src/components/settings_modal/settings_modal_content.vue @@ -45,40 +45,47 @@ >
@@ -87,11 +94,13 @@ :label="$t('settings.mutes_and_blocks')" :fullHeight="true" class="full-height" + icon="eye-off" >
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js index bd1f51cb..2d04e15d 100644 --- a/src/components/tab_switcher/tab_switcher.js +++ b/src/components/tab_switcher/tab_switcher.js @@ -94,8 +94,11 @@ export default Vue.component('tab-switcher', { + class={classesTab.join(' ')} + > + {!slot.data.attrs.icon ? '' : ()} + {slot.data.attrs.label} + ) }) diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss index f994380f..129a68b7 100644 --- a/src/components/tab_switcher/tab_switcher.scss +++ b/src/components/tab_switcher/tab_switcher.scss @@ -3,6 +3,11 @@ .tab-switcher { display: flex; + .tab-icon { + font-size: 2em; + display: block; + } + &.top-tabs { flex-direction: column; > .tabs { diff --git a/static/fontello.json b/static/fontello.json index 7f0e7cdd..ac3f0a18 100755 --- a/static/fontello.json +++ b/static/fontello.json @@ -363,6 +363,18 @@ "css": "ok", "code": 59431, "src": "fontawesome" + }, + { + "uid": "4109c474ff99cad28fd5a2c38af2ec6f", + "css": "filter", + "code": 61616, + "src": "fontawesome" + }, + { + "uid": "9a76bc135eac17d2c8b8ad4a5774fc87", + "css": "download", + "code": 59429, + "src": "fontawesome" } ] } \ No newline at end of file