Skip to content

Pomodoro #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stigmatoz merged 20 commits into from
Feb 18, 2024
Merged

Pomodoro #131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8a8f338
Add a new tab on dashboard
Stigmatoz Feb 13, 2024
4046368
Icons
Stigmatoz Feb 13, 2024
b162d19
UI and functionality
Stigmatoz Feb 13, 2024
9f9ff96
Change badge icon
Stigmatoz Feb 13, 2024
bd98225
Fix broken datepicker styles
Stigmatoz Feb 13, 2024
299db96
Add link to pomodoro on dashboard
Stigmatoz Feb 14, 2024
044a4a8
Fix work/rest periods
Stigmatoz Feb 14, 2024
4b4ddee
Localization
Stigmatoz Feb 16, 2024
6305818
Fix pomodoro timer
Stigmatoz Feb 16, 2024
46f86c4
Info block on popup
Stigmatoz Feb 16, 2024
affb076
Disable changes settings when pomodoro is enabled
Stigmatoz Feb 16, 2024
07e5655
Localization info block on popup
Stigmatoz Feb 16, 2024
bd681a3
Sounds
Stigmatoz Feb 17, 2024
1d8349c
Save pomodoro sounds
Stigmatoz Feb 17, 2024
2742c4f
Play sound after period
Stigmatoz Feb 17, 2024
18f2a1f
Check empty value
Stigmatoz Feb 17, 2024
5c45b03
Add offscreen for audio sounds
Stigmatoz Feb 17, 2024
a1a4ff9
Fix time
Stigmatoz Feb 18, 2024
b6bf155
Localization
Stigmatoz Feb 18, 2024
7ad9068
Merge branch 'master' into pomodoro
Stigmatoz Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add link to pomodoro on dashboard
  • Loading branch information
@Stigmatoz
Stigmatoz committed Feb 13, 2024
commit 299db96bfa5fdcd3e034be4772cf7c671e56743e
2 changes: 1 addition & 1 deletion src/assets/css/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.dark .headerBlock .icons-block a:hover{
filter: invert(40%) sepia(94%) saturate(3371%) hue-rotate(227deg) brightness(99%) contrast(92%);
}
.dark .headerBlock .icons-block a img {
.dark .headerBlock .icons-block a.filter img {
filter: invert(100%) sepia(17%) saturate(0%) hue-rotate(24deg) brightness(103%) contrast(102%);
}
.dark .header-block {
Expand Down
10 changes: 7 additions & 3 deletions src/pages/Popup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@
v-if="darkMode == false"
@click="changeDarkMode(true)"
/>
<a @click="openPage(SettingsTab.Dashboard)"

<a @click="openPage(SettingsTab.Pomodoro)"
>{{ t('pomodoroMode.message') }}<img src="../assets/icons/pomodoro.svg" height="22"
/></a>
<a class="filter" @click="openPage(SettingsTab.Dashboard)"
>{{ t('dashboard.message') }}<img height="22" src="../assets/icons/dashboard.svg"
/></a>
<a @click="openPage(SettingsTab.GeneralSettings)"
<a class="filter" @click="openPage(SettingsTab.GeneralSettings)"
>{{ t('settings.message') }}<img height="22" src="../assets/icons/settings.svg"
/></a>
</div>
Expand Down Expand Up @@ -153,7 +157,7 @@ function updateTab() {
}
.headerBlock .icons-block {
float: right;
margin: 7px 10px 0 0;
margin: 7px 0 0 0;
}

.headerBlock .icons-block a:hover {
Expand Down