Skip to content

Commit 77b7ab9

Browse files
committed
Add favicon for lists
1 parent e7ec0e2 commit 77b7ab9

File tree

8 files changed

+41
-26
lines changed

8 files changed

+41
-26
lines changed

src/assets/css/dashboard.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ body {
1212

1313
.title {
1414
font-size: 18px;
15-
font-weight: 650;
15+
font-weight: 600;
1616
}
1717

1818
.setting-header {
19-
font-weight: 550;
20-
font-size: 15px;
19+
font-weight: 600;
20+
font-size: 16px;
2121
}
2222

2323
.description {
@@ -44,6 +44,10 @@ body {
4444
font-size: 14px;
4545
}
4646

47+
.url-list li span{
48+
font-weight: 600;
49+
}
50+
4751
input[type='text'] {
4852
height: 36px;
4953
padding: 0 0 0 5px;
@@ -315,5 +319,5 @@ label {
315319

316320
.url-list .time-value {
317321
margin-top: 5px;
318-
margin-left: 30px;
322+
margin-left: 55px;
319323
}

src/assets/css/general.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
.mt-20 {
2424
margin-top: 20px;
2525
}
26+
.mt-30 {
27+
margin-top: 30px;
28+
}
2629
.mb-20 {
2730
margin-bottom: 20px;
2831
}

src/components/Dashboad.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="main">
33
<div class="settings-item">
4-
<label class="setting-header"> {{ t('dashboard.message') }} </label>
4+
<label class="title"> {{ t('dashboard.message') }} </label>
55
</div>
66
<div class="chart chartByHours">
77
<div class="mt-10 mb-20">

src/components/Limits.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<p class="setting-header mt-0">{{ t('limits.message') }}</p>
3+
<p class="title mt-0">{{ t('limits.message') }}</p>
44
<p class="description">
55
{{ t('limits.description') }}
66
</p>

src/components/ListWithTime.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
height="16"
99
@click="editItemFromList(limit.domain, limit.time)"
1010
/>
11-
{{ limit.domain }}
12-
<p class="time-value">{{ getTime(limit.time) }}</p>
11+
<Favicon :url="limit.domain" :type="TypeOfUrl.WebSite" /> <span>{{ limit.domain }}</span>
12+
<p class="time-value">{{ t('limit.message') }} : {{ getTime(limit.time) }}</p>
1313
</div>
1414
</li>
1515
</ul>
@@ -39,12 +39,13 @@ export default {
3939
</script>
4040

4141
<script lang="ts" setup>
42+
import Favicon from './Favicon.vue';
4243
import { useNotification } from '@kyvg/vue3-notification';
4344
import { useI18n } from 'vue-i18n';
4445
import { injecStorage } from '../storage/inject-storage';
4546
import { Time } from '../utils/time';
4647
import { computed, onMounted, ref } from 'vue';
47-
import { ListWithTime } from '../utils/enums';
48+
import { ListWithTime, TypeOfUrl } from '../utils/enums';
4849
import { StorageParams } from '../storage/storage-params';
4950
import { isDomainEquals } from '../utils/common';
5051
import { extractHostname } from '../compositions/extract-hostname';

src/components/WhiteList.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<div>
3-
<p class="setting-header mt-0">{{ t('whiteList.message') }}</p>
3+
<p class="title mt-0">{{ t('whiteList.message') }}</p>
44
<ul readonly class="url-list">
55
<li v-for="(url, i) of whiteList" :key="i">
66
<div>
77
<img src="../assets/icons/delete.png" height="16" @click="deleteFromWhiteList(url)" />
8-
{{ url }}
8+
<Favicon :url="url" :type="TypeOfUrl.WebSite" /> <span>{{ url }}</span>
99
</div>
1010
</li>
1111
</ul>
@@ -34,8 +34,10 @@ export default {
3434
</script>
3535

3636
<script lang="ts" setup>
37+
import Favicon from './Favicon.vue';
3738
import { onMounted, ref } from 'vue';
3839
import { useI18n } from 'vue-i18n';
40+
import { TypeOfUrl } from '../utils/enums';
3941
import { useNotification } from '@kyvg/vue3-notification';
4042
import { injecStorage } from '../storage/inject-storage';
4143
import { StorageParams } from '../storage/storage-params';

src/pages/Dashboard.vue

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@
2020
<Dashboad v-if="selectedTab == SettingsTab.Dashboard" />
2121
</div>
2222
</div>
23-
<!-- <p class="tab-separator">Settings</p> -->
24-
<div class="settings-tab">
25-
<input
26-
type="radio"
27-
id="general-tab"
28-
name="settings-group"
29-
:checked="selectedTab == SettingsTab.GeneralSettings"
30-
v-on:change="selectTab(SettingsTab.GeneralSettings)"
31-
/>
32-
<label name="tabName" for="general-tab">{{ t('generalSettings.message') }}</label>
33-
34-
<div class="settings-content">
35-
<GeneralSettings v-if="selectedTab == SettingsTab.GeneralSettings" />
36-
</div>
37-
</div>
3823

3924
<div class="settings-tab">
4025
<input
@@ -81,6 +66,21 @@
8166
</div>
8267

8368
<div class="settings-tab">
69+
<input
70+
type="radio"
71+
id="general-tab"
72+
name="settings-group"
73+
:checked="selectedTab == SettingsTab.GeneralSettings"
74+
v-on:change="selectTab(SettingsTab.GeneralSettings)"
75+
/>
76+
<label name="tabName" for="general-tab">{{ t('generalSettings.message') }}</label>
77+
78+
<div class="settings-content">
79+
<GeneralSettings v-if="selectedTab == SettingsTab.GeneralSettings" />
80+
</div>
81+
</div>
82+
83+
<div class="settings-tab mt-30">
8484
<input
8585
type="radio"
8686
id="about-tab"

src/pages/Popup.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,14 @@ function selectTab(type: TypeOfList) {
138138
margin: 7px 10px 0 0;
139139
}
140140
141+
.headerBlock .icons-block a:hover {
142+
color: rgb(99, 99, 243);
143+
}
144+
141145
.headerBlock .icons-block a {
142146
font-size: 12px;
143147
cursor: pointer;
148+
font-weight: 600;
144149
}
145150
146151
.headerBlock .icons-block a img {

0 commit comments

Comments
 (0)