Skip to content

Commit ca456ed

Browse files
committed
Icons for menu
1 parent 77b7ab9 commit ca456ed

File tree

10 files changed

+67
-21
lines changed

10 files changed

+67
-21
lines changed

src/assets/css/dashboard.css

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ body {
3030
.url-list {
3131
border-radius: 3px;
3232
border: 1px solid #ccc;
33-
width: 515px;
34-
min-height: 150px;
33+
width: 655px;
34+
min-height: 300px;
3535
cursor: pointer;
3636
list-style: none;
3737
padding: 10px;
38-
max-height: 300px;
38+
max-height: 600px;
3939
overflow: auto;
4040
}
4141

@@ -283,6 +283,10 @@ label {
283283
.settings-tab [type='radio'] {
284284
display: none;
285285
}
286+
.settings-tab img{
287+
vertical-align: middle;
288+
margin-right: 10px;
289+
}
286290
.settings-content {
287291
position: absolute;
288292
top: 0;
@@ -313,9 +317,6 @@ label {
313317
margin-right: 10px;
314318
cursor: pointer;
315319
}
316-
.url-list {
317-
width: 655px !important;
318-
}
319320

320321
.url-list .time-value {
321322
margin-top: 5px;

src/assets/icons/s-about.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/icons/s-dashboard.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/icons/s-limits.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/assets/icons/s-settings.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/icons/s-whitelist.svg

Lines changed: 3 additions & 0 deletions
Loading

src/components/Favicon.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<template>
2-
<img v-if="faviconValid" class="favicon no-favicon" height="22" :src="NO_FAVICON" />
3-
<img v-else class="favicon" height="30" :src="faviconUrl" />
2+
<div class="container">
3+
<img v-if="faviconValid" class="favicon no-favicon" height="22" :src="NO_FAVICON" />
4+
<img v-else class="favicon" height="30" :src="faviconUrl" />
5+
</div>
46
</template>
57

68
<script lang="ts">
@@ -27,6 +29,11 @@ const faviconUrl = computed(() => `https://www.google.com/s2/favicons?domain=${p
2729
</script>
2830

2931
<style scoped>
32+
.container {
33+
display: inline-block;
34+
height: 30px;
35+
width: 40px;
36+
}
3037
.favicon {
3138
padding: 5px;
3239
}

src/components/TabItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const showWarningMessage = ref<boolean>();
100100
display: inline-block;
101101
}
102102
.tab-item .url:hover {
103-
color: #1a0dab;
103+
color: rgb(99, 99, 243);
104104
}
105105
.tab-item p {
106106
margin: 5px;

src/pages/Dashboard.vue

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@
55
<img class="d-inline-block logo" height="30" src="../assets/icons/48x48.png" />
66
<p class="d-inline-block title">Web Activity Time Tracker</p>
77
</div>
8-
<!-- <p class="tab-separator">Dashboard</p> -->
9-
<div class="settings-tab">
8+
<div class="settings-tab mt-20">
109
<input
1110
type="radio"
1211
id="timeIntervalChart-tab"
1312
name="settings-group"
1413
:checked="selectedTab == SettingsTab.Dashboard"
1514
v-on:change="selectTab(SettingsTab.Dashboard)"
1615
/>
17-
<label name="tabName" for="timeIntervalChart-tab">{{ t('dashboard.message') }}</label>
16+
<label name="tabName" for="timeIntervalChart-tab"
17+
><img src="../assets/icons/s-dashboard.svg" height="30" />{{
18+
t('dashboard.message')
19+
}}</label
20+
>
1821

1922
<div class="settings-content">
2023
<Dashboad v-if="selectedTab == SettingsTab.Dashboard" />
@@ -29,7 +32,11 @@
2932
:checked="selectedTab == SettingsTab.WhiteList"
3033
v-on:change="selectTab(SettingsTab.WhiteList)"
3134
/>
32-
<label name="tabName" for="white-list-tab">{{ t('whiteListSettings.message') }}</label>
35+
<label name="tabName" for="white-list-tab"
36+
><img src="../assets/icons/s-whitelist.svg" height="30" />{{
37+
t('whiteListSettings.message')
38+
}}</label
39+
>
3340

3441
<div class="settings-content">
3542
<WhiteList v-if="selectedTab == SettingsTab.WhiteList" />
@@ -44,7 +51,11 @@
4451
:checked="selectedTab == SettingsTab.Limits"
4552
v-on:change="selectTab(SettingsTab.Limits)"
4653
/>
47-
<label name="tabName" for="limits-tab">{{ t('limitsSettings.message') }}</label>
54+
<label name="tabName" for="limits-tab"
55+
><img src="../assets/icons/s-limits.svg" height="30" />{{
56+
t('limitsSettings.message')
57+
}}</label
58+
>
4859

4960
<div class="settings-content">
5061
<Limits v-if="selectedTab == SettingsTab.Limits" />
@@ -58,7 +69,11 @@
5869
:checked="selectedTab == SettingsTab.Notifications"
5970
v-on:change="selectTab(SettingsTab.Notifications)"
6071
/>
61-
<label name="tabName" for="notification-tab">{{ t('notificationsSettings.message') }}</label>
72+
<label name="tabName" for="notification-tab"
73+
><img src="../assets/icons/s-notifications.svg" height="30" />{{
74+
t('notificationsSettings.message')
75+
}}</label
76+
>
6277

6378
<div class="settings-content">
6479
<DailyNotifications v-if="selectedTab == SettingsTab.Notifications" />
@@ -73,7 +88,11 @@
7388
:checked="selectedTab == SettingsTab.GeneralSettings"
7489
v-on:change="selectTab(SettingsTab.GeneralSettings)"
7590
/>
76-
<label name="tabName" for="general-tab">{{ t('generalSettings.message') }}</label>
91+
<label name="tabName" for="general-tab"
92+
><img src="../assets/icons/s-settings.svg" height="30" />{{
93+
t('generalSettings.message')
94+
}}</label
95+
>
7796

7897
<div class="settings-content">
7998
<GeneralSettings v-if="selectedTab == SettingsTab.GeneralSettings" />
@@ -88,7 +107,11 @@
88107
:checked="selectedTab == SettingsTab.About"
89108
v-on:change="selectTab(SettingsTab.About)"
90109
/>
91-
<label name="tabName" for="about-tab">{{ t('aboutSettings.message') }}</label>
110+
<label name="tabName" for="about-tab"
111+
><img src="../assets/icons/s-about.svg" height="30" />{{
112+
t('aboutSettings.message')
113+
}}</label
114+
>
92115

93116
<div class="settings-content">
94117
<About v-if="selectedTab == SettingsTab.About" />
@@ -133,9 +156,6 @@ function selectTab(value: SettingsTab) {
133156
</script>
134157

135158
<style scoped>
136-
.header-block {
137-
background-color: white;
138-
}
139159
.header-block .title {
140160
vertical-align: top;
141161
margin-top: 15px;
@@ -144,7 +164,7 @@ function selectTab(value: SettingsTab) {
144164
}
145165
146166
.header-block .logo {
147-
margin: 10px 20px;
167+
margin: 10px 10px 10px 35px;
148168
}
149169
.tab-separator {
150170
margin-left: 10px;

0 commit comments

Comments
 (0)