Skip to content

Commit 819dde2

Browse files
committed
Added squared icon to comply with macOS Tahoe requirements, updated dependencies, fixed minor CSS glitch in row regarding vertical alignment of content, fixed empty line issue while archiving into an empty done file
1 parent 31a0fc5 commit 819dde2

File tree

10 files changed

+497
-340
lines changed

10 files changed

+497
-340
lines changed

electron-builder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
directories:
22
output: dist
33
buildResources: build
4-
buildVersion: '60'
4+
buildVersion: '61'
55
asar: true
66
files:
77
- "**/*"

package-lock.json

Lines changed: 447 additions & 308 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sleek",
33
"productName": "sleek",
4-
"version": "2.0.21",
4+
"version": "2.0.22-rc.1",
55
"description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
66
"synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
77
"keywords": [
@@ -59,14 +59,14 @@
5959
"react": "^19.1.0",
6060
"react-autosuggest": "^10.1.0",
6161
"react-dom": "^19.1.0",
62-
"react-i18next": "^15.6.0",
62+
"react-i18next": "^16.0.0",
6363
"react-markdown": "^10.1.0",
6464
"react-string-replace": "^1.1.1",
6565
"remark-gfm": "^4.0.1",
6666
"sugar": "^2.0.6"
6767
},
6868
"devDependencies": {
69-
"@electron-toolkit/tsconfig": "^1.0.1",
69+
"@electron-toolkit/tsconfig": "^2.0.0",
7070
"@types/luxon": "^3.6.2",
7171
"@types/node": "^24.0.14",
7272
"@types/react": "^19.1.8",

resources/icon.icns

-566 KB
Binary file not shown.

src/main/Date.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ function processDateWithSugar(string: string, type: string) {
4141

4242
export function extractSpeakingDates(body: string) {
4343
const expressions = [
44-
{ pattern: /due:(?!(\d{4}-\d{2}-\d{2}))(.*?)(?=[^\s]:|$)/g, key: 'due:', type: 'relative' },
45-
{ pattern: /due:(\d{4}-\d{2}-\d{2})/g, key: 'due:', type: 'absolute' },
46-
{ pattern: /t:(?!(\d{4}-\d{2}-\d{2}))(.*?)(?=[^\s]:|$)/g, key: 't:', type: 'relative' },
47-
{ pattern: /t:(\d{4}-\d{2}-\d{2})/g, key: 't:', type: 'absolute' }
44+
{ pattern: /(?<=\b)due:(?!(\d{4}-\d{2}-\d{2}))(.*?)(?=[^\s]:|$)/g, key: 'due:', type: 'relative' },
45+
{ pattern: /(?<=\b)due:(\d{4}-\d{2}-\d{2})/g, key: 'due:', type: 'absolute' },
46+
{ pattern: /(?<=\b)t:(?!(\d{4}-\d{2}-\d{2}))(.*?)(?=[^\s]:|$)/g, key: 't:', type: 'relative' },
47+
{ pattern: /(?<=\b)t:(\d{4}-\d{2}-\d{2})/g, key: 't:', type: 'absolute' }
4848
]
4949

5050
const speakingDates = {

src/main/File/Archive.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,21 @@ function archiveTodos(): string {
6262
activeFile.doneFileBookmark
6363
)
6464

65-
const separator = todosFromDoneFile.toString().endsWith('\n') ? '' : '\n'
65+
const contentForDoneFile = todosFromDoneFile.length > 1
66+
? todosFromDoneFile + completedTodos
67+
: completedTodos;
68+
6669
writeToFile(
67-
todosFromDoneFile + separator + completedTodos,
70+
contentForDoneFile,
6871
activeFile.doneFilePath,
6972
activeFile.doneFileBookmark
7073
)
7174

72-
writeToFile(uncompletedTodos, activeFile.todoFilePath, activeFile.todoFileBookmark)
75+
writeToFile(
76+
uncompletedTodos,
77+
activeFile.todoFilePath,
78+
activeFile.todoFileBookmark
79+
)
7380

7481
return 'Successfully archived'
7582
}

src/renderer/Coloring.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ button:hover:not(.MuiIconButton-root) {
159159
}
160160
}
161161
&.selected {
162-
button {
162+
button, div {
163163
background: color.adjust(#5a5a5a, $lightness: -15%);
164164
}
165165
}

src/renderer/Grid/Grid.scss

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,7 @@
1919
.compact {
2020
#grid {
2121
padding: 0 0.75em 0.75em 0.75em;
22-
.row {
23-
padding: 0.3em;
24-
[data-todotxt-attribute='due'],
25-
[data-todotxt-attribute='t'],
26-
[data-todotxt-attribute='rec'] {
27-
button {
28-
padding: 0 0.5em 0 0;
29-
}
30-
div {
31-
padding: 0.1em 0;
32-
}
33-
}
34-
.filter:not([data-todotxt-attribute='priority']):not([data-todotxt-attribute='t']):not([data-todotxt-attribute='due']):not([data-todotxt-attribute='rec']) {
35-
button {
36-
padding: 0.2em 0.4em;
37-
}
38-
}
39-
}
40-
}
22+
}
4123
}
4224

4325
.dark {

src/renderer/Grid/Row.scss

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
gap: 0.25em;
1111
padding: 0.5em;
1212
align-items: center;
13+
.filter {
14+
display: inline-flex;
15+
vertical-align: middle;
16+
}
1317
.MuiCheckbox-root {
1418
padding: 0.25em;
1519
}
@@ -37,6 +41,31 @@
3741
}
3842
}
3943

44+
.compact {
45+
.row {
46+
padding: 0.3em;
47+
[data-todotxt-attribute='due'],
48+
[data-todotxt-attribute='t'],
49+
[data-todotxt-attribute='rec'] {
50+
button {
51+
padding: 0 0.5em 0 0;
52+
}
53+
54+
div {
55+
padding: 0.1em 0;
56+
}
57+
}
58+
.filter:not([data-todotxt-attribute='priority']):not([data-todotxt-attribute='t']):not([data-todotxt-attribute='due']):not([data-todotxt-attribute='rec']) {
59+
button {
60+
padding: 0.2em 0.4em;
61+
}
62+
}
63+
&.group {
64+
padding-left: 0;
65+
}
66+
}
67+
}
68+
4069
.dark {
4170
.row {
4271
border-color: Variables.$dark-grey;

src/renderer/SplashScreen.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
.container {
3232
padding: 1em 2em;
3333
border-radius: Variables.$radius;
34-
border: 0.15em dashed #ccc;
34+
border: 0.15em dashed Variables.$mid-grey;
3535
}
3636
}
3737

0 commit comments

Comments
 (0)