diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 1d4065f69d..4c12bb0cd2 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -668,6 +668,9 @@ a.no-line { box-shadow: 0 0 0 3px var(--primary-button-outline); & > .icon { color: var(--theme-caption-color); } } + + &.bordered, + &.bordered:hover { border-color: var(--theme-button-border-pressed); } } .overflow-x-auto { overflow-x: auto; } diff --git a/packages/ui/src/components/internal/Clock.svelte b/packages/ui/src/components/internal/Clock.svelte index e0ab0ad2ee..feff08b8b8 100644 --- a/packages/ui/src/components/internal/Clock.svelte +++ b/packages/ui/src/components/internal/Clock.svelte @@ -20,7 +20,7 @@ onDestroy(() => clearInterval(interval)) -
+
{hours} : {minutes} diff --git a/plugins/activity-resources/src/components/TxView.svelte b/plugins/activity-resources/src/components/TxView.svelte index 664ac2027f..57c28e300d 100644 --- a/plugins/activity-resources/src/components/TxView.svelte +++ b/plugins/activity-resources/src/components/TxView.svelte @@ -42,7 +42,7 @@ export let viewlets: Map export let showIcon: boolean = true export let isNew: boolean = false - export let showDocument = false + // export let showDocument = false let ptx: DisplayTx | undefined diff --git a/plugins/hr-resources/src/components/ScheduleRequests.svelte b/plugins/hr-resources/src/components/ScheduleRequests.svelte index 231b6e3fa2..142d44bfe8 100644 --- a/plugins/hr-resources/src/components/ScheduleRequests.svelte +++ b/plugins/hr-resources/src/components/ScheduleRequests.svelte @@ -19,7 +19,7 @@ import { ContextMenu } from '@hcengineering/view-resources' export let requests: Request[] - export let date: Date + // export let date: Date export let editable: boolean = false const client = getClient() diff --git a/plugins/hr-resources/src/components/ScheduleView.svelte b/plugins/hr-resources/src/components/ScheduleView.svelte index ef4ac63658..51342e8e27 100644 --- a/plugins/hr-resources/src/components/ScheduleView.svelte +++ b/plugins/hr-resources/src/components/ScheduleView.svelte @@ -133,89 +133,3 @@
{/if} - - diff --git a/plugins/hr-resources/src/components/schedule/MonthTableView.svelte b/plugins/hr-resources/src/components/schedule/MonthTableView.svelte index ad0aaa7bf0..92e5c49ed0 100644 --- a/plugins/hr-resources/src/components/schedule/MonthTableView.svelte +++ b/plugins/hr-resources/src/components/schedule/MonthTableView.svelte @@ -242,89 +242,3 @@
{/if} - - diff --git a/plugins/hr-resources/src/components/schedule/MonthView.svelte b/plugins/hr-resources/src/components/schedule/MonthView.svelte index ad033b4ffd..94d080e540 100644 --- a/plugins/hr-resources/src/components/schedule/MonthView.svelte +++ b/plugins/hr-resources/src/components/schedule/MonthView.svelte @@ -191,11 +191,6 @@ width: 2rem; min-width: 1.5rem; border: none; - &.fixed { - width: 5rem; - padding: 0 0.125rem; - hyphens: auto; - } &:first-child { width: 15rem; padding: 0.5rem; diff --git a/plugins/hr-resources/src/components/schedule/YearView.svelte b/plugins/hr-resources/src/components/schedule/YearView.svelte index bdac121a46..5516325e6b 100644 --- a/plugins/hr-resources/src/components/schedule/YearView.svelte +++ b/plugins/hr-resources/src/components/schedule/YearView.svelte @@ -187,9 +187,6 @@ &.today { color: var(--caption-color); } - &.weekend:not(.today) { - color: var(--warning-color); - } } td { height: 3.5rem; @@ -198,9 +195,6 @@ &.today { background-color: var(--theme-bg-accent-hover); } - &.weekend:not(.today) { - background-color: var(--theme-bg-accent-color); - } } td:not(:last-child) { border-right: 1px solid var(--divider-color); @@ -211,20 +205,5 @@ tr.scroller-thead__tr:not(:last-child) { border-right: 1px solid var(--divider-color); } - - .hovered { - position: relative; - - &::after { - position: absolute; - content: ''; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: var(--caption-color); - opacity: 0.15; - } - } } diff --git a/plugins/login-resources/src/components/Form.svelte b/plugins/login-resources/src/components/Form.svelte index 9b764b87bb..37214309d6 100644 --- a/plugins/login-resources/src/components/Form.svelte +++ b/plugins/login-resources/src/components/Form.svelte @@ -14,7 +14,7 @@ // limitations under the License. --> -
+
@@ -44,12 +45,16 @@ justify-content: center; align-items: center; flex-grow: 1; + transition: all 0.15s var(--timing-main); .logo { position: relative; - &::after { + &::after, + &::before { position: absolute; content: ''; transform: translate(-50%, -50%); + } + &::after { width: 63px; height: 79px; } @@ -60,9 +65,6 @@ background: center url('../../img/logo-dark.svg'); } &::before { - position: absolute; - content: ''; - transform: translate(-50%, -50%); width: 16rem; height: 16rem; border: 1.8px solid var(--caption-color); @@ -72,6 +74,7 @@ } } .slogan { + transition: all 0.15s var(--timing-main); margin-bottom: 60px; p { margin: 0; @@ -82,5 +85,52 @@ opacity: 0.8; } } + + &.landscape { + flex-direction: row; + justify-content: center; + align-items: center; + min-width: 20rem; + min-height: 10rem; + margin-bottom: 1.25rem; + + .content .logo::after, + .content .logo::before { + transform: translate(-50%, -50%) scale(0.5); + } + .content { + max-width: 8rem; + max-height: 10rem; + margin: 0 1rem 0 0; + } + .slogan { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin: 0 0 0 1rem; + } + + &.mini { + min-width: 16rem; + min-height: 8rem; + + .content .logo::after, + .content .logo::before { + transform: translate(-50%, -50%) scale(0.35); + } + .content { + max-width: 5.5rem; + max-height: 8rem; + margin: 0 0.5rem 0 0; + } + .slogan { + margin: 0 0 0 0.5rem; + p { + font-size: 0.6rem; + } + } + } + } } diff --git a/plugins/login-resources/src/components/LoginApp.svelte b/plugins/login-resources/src/components/LoginApp.svelte index 77f041d3b6..c423cc370f 100644 --- a/plugins/login-resources/src/components/LoginApp.svelte +++ b/plugins/login-resources/src/components/LoginApp.svelte @@ -47,9 +47,11 @@
768} style:border-radius={$deviceInfo.docWidth <= 480 ? '.75rem' : '1.25rem'} > +
{#if page === 'login'} {:else if page === 'signup'} @@ -62,7 +64,7 @@ {/if}
- + @@ -71,11 +73,14 @@ position: relative; display: flex; flex-direction: column; - min-height: 100%; - height: max-content; + height: 100%; background: var(--popup-bg-color); box-shadow: var(--popup-aside-shadow); + &.minHeight { + min-height: 40rem; + } + $circle-size: calc(1vh + 1vw); $r1: 23; $r2: 17; @@ -87,16 +92,18 @@ z-index: -1; } &::before { - top: calc(-1 * $circle-size * $r1 / 2 + $circle-size * 4); - left: calc(-1 * $circle-size * $r1 / 2); + top: calc(-1 * $circle-size * $r1 / 2 + $circle-size * 5); + left: auto; + right: calc(-1 * $circle-size * $r1 / 2); width: calc($circle-size * $r1); height: calc($circle-size * $r1); border: 1px solid var(--content-color); opacity: 0.05; } &::after { - top: calc(-1 * $circle-size * $r2 / 2 + $circle-size * 4); - left: calc(-1 * $circle-size * $r2 / 2); + top: calc(-1 * $circle-size * $r2 / 2 + $circle-size * 5); + left: auto; + right: calc(-1 * $circle-size * $r2 / 2); width: calc($circle-size * $r2); height: calc($circle-size * $r2); background: var(--dark-color); @@ -106,6 +113,14 @@ &.landscape { margin-right: 1.25rem; width: 41.75rem; + &::before { + left: calc(-1 * $circle-size * $r1 / 2); + right: auto; + } + &::after { + left: calc(-1 * $circle-size * $r2 / 2); + right: auto; + } } } diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte index 0694fc684e..282e422a91 100644 --- a/plugins/login-resources/src/components/SelectWorkspace.svelte +++ b/plugins/login-resources/src/components/SelectWorkspace.svelte @@ -22,7 +22,9 @@ Label, Location, navigate, - setMetadataLocalStorage + setMetadataLocalStorage, + deviceOptionsStore as deviceInfo, + Scroller } from '@hcengineering/ui' import { workbenchId } from '@hcengineering/workbench' import login from '../plugin' @@ -84,28 +86,30 @@ } -
+
{#await _getWorkspaces() then workspaces} -
- {#each workspaces as workspace} -
select(workspace.workspace)} - > - {workspace.workspace} -
- {/each} - {#if !workspaces.length} -
-
- {/if} -
+ +
+ {#each workspaces as workspace} +
select(workspace.workspace)} + > + {workspace.workspace} +
+ {/each} + {#if !workspaces.length} +
+
+ {/if} +
+
- - diff --git a/plugins/tracker-resources/src/components/issues/related/RelatedIssues.svelte b/plugins/tracker-resources/src/components/issues/related/RelatedIssues.svelte index 624bf42dbf..3c96b83414 100644 --- a/plugins/tracker-resources/src/components/issues/related/RelatedIssues.svelte +++ b/plugins/tracker-resources/src/components/issues/related/RelatedIssues.svelte @@ -89,14 +89,3 @@
{/if}
- - diff --git a/plugins/tracker-resources/src/components/issues/timereport/SubIssuesEstimations.svelte b/plugins/tracker-resources/src/components/issues/timereport/SubIssuesEstimations.svelte index 07f3cdf493..a543f872c2 100644 --- a/plugins/tracker-resources/src/components/issues/timereport/SubIssuesEstimations.svelte +++ b/plugins/tracker-resources/src/components/issues/timereport/SubIssuesEstimations.svelte @@ -49,14 +49,3 @@
{/if} - - diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReports.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReports.svelte index a79484f7a5..df5e38c9c6 100644 --- a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReports.svelte +++ b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReports.svelte @@ -56,14 +56,3 @@
{/if} - - diff --git a/plugins/tracker-resources/src/components/projects/ProjectBrowser.svelte b/plugins/tracker-resources/src/components/projects/ProjectBrowser.svelte index 3b5b9edb77..0ec7ea2224 100644 --- a/plugins/tracker-resources/src/components/projects/ProjectBrowser.svelte +++ b/plugins/tracker-resources/src/components/projects/ProjectBrowser.svelte @@ -199,7 +199,7 @@ } } - .filterButton { - color: var(--caption-color); - } + // .filterButton { + // color: var(--caption-color); + // } diff --git a/plugins/tracker-resources/src/components/sprints/EditSprint.svelte b/plugins/tracker-resources/src/components/sprints/EditSprint.svelte index bb5dfc49f3..8550e9c6c3 100644 --- a/plugins/tracker-resources/src/components/sprints/EditSprint.svelte +++ b/plugins/tracker-resources/src/components/sprints/EditSprint.svelte @@ -92,9 +92,3 @@
- - diff --git a/plugins/tracker-resources/src/components/sprints/SprintBrowser.svelte b/plugins/tracker-resources/src/components/sprints/SprintBrowser.svelte index 55e82bfc7f..99f7dcc298 100644 --- a/plugins/tracker-resources/src/components/sprints/SprintBrowser.svelte +++ b/plugins/tracker-resources/src/components/sprints/SprintBrowser.svelte @@ -212,7 +212,7 @@ } } - .filterButton { - color: var(--caption-color); - } + // .filterButton { + // color: var(--caption-color); + // } diff --git a/plugins/view-resources/src/components/NumberEditor.svelte b/plugins/view-resources/src/components/NumberEditor.svelte index 66e41ae9b6..4ecdf6a1c0 100644 --- a/plugins/view-resources/src/components/NumberEditor.svelte +++ b/plugins/view-resources/src/components/NumberEditor.svelte @@ -22,7 +22,7 @@ export let placeholder: IntlString export let value: number | undefined export let focus: boolean - export let maxWidth: string = '10rem' + // export let maxWidth: string = '10rem' export let onChange: (value: number | undefined) => void export let kind: 'no-border' | 'link' = 'no-border' export let readonly = false diff --git a/plugins/view-resources/src/components/filter/FilterSection.svelte b/plugins/view-resources/src/components/filter/FilterSection.svelte index 839b5309e5..d6a4cb1197 100644 --- a/plugins/view-resources/src/components/filter/FilterSection.svelte +++ b/plugins/view-resources/src/components/filter/FilterSection.svelte @@ -23,7 +23,7 @@ import { createEventDispatcher, onDestroy } from 'svelte' import view from '../../plugin' - export let _class: Ref> + // export let _class: Ref> export let filter: Filter $: currentFilter = filter.nested ? filter.nested : filter