{formatBytes(summary.bytes)}
- {filesLabel(summary.files)} на диске
+
+ {filesLabel(summary.files)}
+ {summary.trash_bytes > 0
+ ? `· ещё ${formatBytes(summary.trash_bytes)} в корзине`
+ : "на диске"}
+
{#each groups as item (item.group)}
@@ -244,6 +253,13 @@
style:flex-grow={item.bytes}
>
{/each}
+ {#if summary.trash_bytes > 0}
+
+ {/if}
{#each groups as item (item.group)}
@@ -376,8 +392,9 @@
{:else if undo}
{/if}
@@ -431,6 +439,10 @@
font-size: 0.9375rem;
line-height: 1.45;
+ &.rest {
+ margin-top: 0.75rem;
+ }
+
&.warn {
display: flex;
gap: 0.625rem;
diff --git a/frontend/src/lib/format/storage.ts b/frontend/src/lib/format/storage.ts
index e2963e1..a664b7c 100644
--- a/frontend/src/lib/format/storage.ts
+++ b/frontend/src/lib/format/storage.ts
@@ -42,10 +42,10 @@ export function fileExtension(fileName: string): string {
export function purgeLabel(iso: string): string {
const days = Math.ceil((new Date(iso).getTime() - Date.now()) / DAY_MS);
if (days <= 0) {
- return "Удалится сегодня";
+ return "сегодня";
}
if (days === 1) {
- return "Удалится завтра";
+ return "завтра";
}
- return `Удалится через ${days} дн.`;
+ return `через ${days} дн.`;
}
diff --git a/frontend/src/lib/styles/dark-theme.scss b/frontend/src/lib/styles/dark-theme.scss
index d199592..d3ac27c 100644
--- a/frontend/src/lib/styles/dark-theme.scss
+++ b/frontend/src/lib/styles/dark-theme.scss
@@ -5,7 +5,7 @@ html.theme-dark {
--color-storage-audio: #c98500;
--color-storage-other: #3987e5;
--color-storage-warning: #fb8c00;
- --storage-tile-mix: 78%;
+ --storage-tile-mix: 90%;
--color-primary: #8774e1;
--color-primary-opacity: #8378db1e;
--color-primary-opacity-hover: #8378db40;
diff --git a/frontend/src/lib/styles/variables.scss b/frontend/src/lib/styles/variables.scss
index 76a7a8b..128eb1e 100644
--- a/frontend/src/lib/styles/variables.scss
+++ b/frontend/src/lib/styles/variables.scss
@@ -133,13 +133,13 @@
--color-warning: #{$color-warning};
- --color-storage-video: #3390ec;
- --color-storage-file: #eb6834;
- --color-storage-voice: #1baf7a;
- --color-storage-audio: #eda100;
- --color-storage-other: #6250d6;
+ --color-storage-video: #6250d6;
+ --color-storage-file: #c4501c;
+ --color-storage-voice: #12805a;
+ --color-storage-audio: #a36a00;
+ --color-storage-other: #2a78c8;
--color-storage-warning: #a85a00;
- --storage-tile-mix: 62%;
+ --storage-tile-mix: 100%;
--color-yellow: #{$color-yellow};