diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 51bf092788..a1962fb9dc 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -485,6 +485,7 @@ input.search { .h-14 { height: 3.5rem; } .h-16 { height: 4rem; } .h-18 { height: 4.5rem; } +.h-50 { height: 12.5rem; } .w-full { width: 100%; } .w-2 { width: .5rem; } .w-9 { width: 2.25rem; } @@ -504,6 +505,7 @@ input.search { .min-h-0 { min-height: 0; } .min-h-7 { min-height: 1.75rem; } .max-h-125 { max-height: 31.25rem; } +.max-h-30 { max-height: 7.5rem; } .max-h-60 { max-height: 15rem; } .max-w-60 { max-width: 15rem; } .max-w-240 { max-width: 60rem; } diff --git a/packages/ui/src/components/Button.svelte b/packages/ui/src/components/Button.svelte index a65bab92d0..4b487e5c47 100644 --- a/packages/ui/src/components/Button.svelte +++ b/packages/ui/src/components/Button.svelte @@ -147,7 +147,6 @@ .small { height: 1.5rem; font-size: 0.75rem; - line-height: 0.75rem; &.only-icon { width: 1.5rem; } diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json index ec2a802e47..5f50cb04d8 100644 --- a/plugins/tracker-assets/lang/en.json +++ b/plugins/tracker-assets/lang/en.json @@ -201,7 +201,7 @@ "Estimation": "Estimation", "ReportedTime": "Reported Time", "TimeSpendReports": "Time spend reports", - "TimeSpendReport": "Time spend report", + "TimeSpendReport": "Time", "TimeSpendReportAdd": "Add time report", "TimeSpendReportDate": "Date", "TimeSpendReportValue": "Reported time", diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json index 5187fcc375..c1a683c579 100644 --- a/plugins/tracker-assets/lang/ru.json +++ b/plugins/tracker-assets/lang/ru.json @@ -201,7 +201,7 @@ "Estimation": "Оценка", "ReportedTime": "Использовано", "TimeSpendReports": "Отчеты по времени", - "TimeSpendReport": "Отчет по времени", + "TimeSpendReport": "Время", "TimeSpendReportAdd": "Добавить завтраченное время", "TimeSpendReportDate": "Дата", "TimeSpendReportValue": "Затраченное время", diff --git a/plugins/tracker-resources/src/components/issues/ParentNamesPresenter.svelte b/plugins/tracker-resources/src/components/issues/ParentNamesPresenter.svelte index c51e1738d7..3651fcd58c 100644 --- a/plugins/tracker-resources/src/components/issues/ParentNamesPresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/ParentNamesPresenter.svelte @@ -16,10 +16,12 @@ import type { Issue } from '@anticrm/tracker' export let value: Issue | undefined + + export let maxWidth = '' {#if value} -
+
{#each value.parents as parentInfo} {parentInfo.parentTitle} diff --git a/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte index 1c15c47f3d..8977b2d003 100644 --- a/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte +++ b/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte @@ -24,6 +24,7 @@ import tracker from '../../../plugin' import IssuePresenter from '../IssuePresenter.svelte' import ParentNamesPresenter from '../ParentNamesPresenter.svelte' + import EstimationPresenter from './EstimationPresenter.svelte' import TimeSpendReportPopup from './TimeSpendReportPopup.svelte' export let value: string | number | undefined @@ -73,32 +74,45 @@