+
{#if icon}
@@ -205,78 +205,3 @@
{/if}
-
-
diff --git a/packages/ui/src/components/ListView.svelte b/packages/ui/src/components/ListView.svelte
index 2c8162f5cc..6dbd8aa7b4 100644
--- a/packages/ui/src/components/ListView.svelte
+++ b/packages/ui/src/components/ListView.svelte
@@ -20,6 +20,7 @@
export let count: number
export let addClass: string | undefined = undefined
export let noScroll: boolean = false
+ export let kind: 'default' | 'thin' = 'default'
const refs: HTMLElement[] = []
@@ -60,7 +61,7 @@
{#if count}
{
dispatch('changeContent')
@@ -95,6 +96,15 @@
min-width: 0;
border-radius: 0.25rem;
}
+ &.thin {
+ .list-item {
+ margin: 0 0.375rem;
+ border-radius: 0.375rem;
+ }
+ .list-item + .list-item {
+ margin-top: 0.375rem;
+ }
+ }
.selection {
background-color: var(--theme-popup-hover);
}
diff --git a/packages/ui/src/components/NumberInput.svelte b/packages/ui/src/components/NumberInput.svelte
index ce91957659..afb2f11c56 100644
--- a/packages/ui/src/components/NumberInput.svelte
+++ b/packages/ui/src/components/NumberInput.svelte
@@ -23,6 +23,7 @@
import { floorFractionDigits } from '../utils'
import DownOutline from './icons/DownOutline.svelte'
import UpOutline from './icons/UpOutline.svelte'
+ import Button from './Button.svelte'
export let maxWidth: string | undefined = undefined
export let value: number = 0
@@ -145,13 +146,9 @@
on:keypress
on:blur
/>
-
-
value++}>
-
-
-
value--}>
-
-
+
+
@@ -161,9 +158,9 @@
display: inline-flex;
flex-direction: column;
align-items: flex-start;
+ padding: 0rem 0.125rem 0 0.5rem;
+ border: 1px solid var(--theme-divider-color);
border-radius: 0.375rem;
- border: 1px solid var(--theme-table-border-color);
- padding: 0rem 0.5rem;
input {
margin: 0;
@@ -181,6 +178,9 @@
width: 0;
margin: 0;
}
+ &:disabled {
+ color: var(--theme-darker-color);
+ }
&.number::-webkit-outer-spin-button,
&.number::-webkit-inner-spin-button {
diff --git a/packages/ui/src/components/TimeShiftPresenter.svelte b/packages/ui/src/components/TimeShiftPresenter.svelte
index 9d86b59777..26a5c27730 100644
--- a/packages/ui/src/components/TimeShiftPresenter.svelte
+++ b/packages/ui/src/components/TimeShiftPresenter.svelte
@@ -19,17 +19,27 @@
import { DAY, HOUR, MINUTE } from '../types'
export let value: number
+ export let exact: boolean = false
let time: string = ''
async function formatTime (value: number) {
if (value > 0) {
- if (value < HOUR) {
- time = await translate(ui.string.MinutesAfter, { minutes: Math.floor(value / MINUTE) }, $themeStore.language)
- } else if (value < DAY) {
- time = await translate(ui.string.HoursAfter, { hours: Math.floor(value / HOUR) }, $themeStore.language)
+ if (exact) {
+ const d = Math.floor(value / DAY)
+ time = d ? await translate(ui.string.DaysShort, { value: d }, $themeStore.language) : ''
+ const h = Math.floor((value - d * DAY) / HOUR)
+ time += h ? ` ${await translate(ui.string.HoursShort, { value: h }, $themeStore.language)}` : ''
+ const m = Math.floor((value - d * DAY - h * HOUR) / MINUTE)
+ time += m ? ` ${await translate(ui.string.MinutesShort, { value: m }, $themeStore.language)}` : ''
} else {
- time = await translate(ui.string.DaysAfter, { days: Math.floor(value / DAY) }, $themeStore.language)
+ if (value < HOUR) {
+ time = await translate(ui.string.MinutesAfter, { minutes: Math.floor(value / MINUTE) }, $themeStore.language)
+ } else if (value < DAY) {
+ time = await translate(ui.string.HoursAfter, { hours: Math.floor(value / HOUR) }, $themeStore.language)
+ } else {
+ time = await translate(ui.string.DaysAfter, { days: Math.floor(value / DAY) }, $themeStore.language)
+ }
}
} else {
const abs = Math.abs(value)
diff --git a/packages/ui/src/components/calendar/TimeInputBox.svelte b/packages/ui/src/components/calendar/TimeInputBox.svelte
index 39ae2c766f..c8533b37e9 100644
--- a/packages/ui/src/components/calendar/TimeInputBox.svelte
+++ b/packages/ui/src/components/calendar/TimeInputBox.svelte
@@ -142,7 +142,7 @@
selected = index === 0 ? edits[1].id : edits[index - 1].id
}
if (ev.code === 'ArrowRight' && edits[index].el) {
- selected = index === 4 ? edits[0].id : edits[index + 1].id
+ selected = index === 1 ? edits[0].id : edits[index + 1].id
}
if (ev.code === 'Tab') {
if (ed === 'min') dispatch('save')
diff --git a/packages/ui/src/components/icons/Close.svelte b/packages/ui/src/components/icons/Close.svelte
index 3d1b11bb98..30ae93d76f 100644
--- a/packages/ui/src/components/icons/Close.svelte
+++ b/packages/ui/src/components/icons/Close.svelte
@@ -3,8 +3,8 @@
export let fill: string = 'currentColor'
-