From caacfd417be35844fc8aeae5769710326bcbceb2 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Wed, 26 Apr 2023 21:56:24 +0300 Subject: [PATCH] TSK-1359, TSK-1357, TSK-1354, TSK-1355: Small fixes (#3084) Signed-off-by: Alexander Platov --- packages/theme/styles/_colors.scss | 8 ++- packages/theme/styles/_layouts.scss | 1 + packages/theme/styles/common.scss | 1 + packages/theme/styles/panel.scss | 4 +- plugins/tracker-assets/assets/icons.svg | 2 +- .../issues/edit/CreateSubIssue.svelte | 53 ++++++++++------- .../src/components/Logo.svelte | 58 +------------------ .../src/components/Workbench.svelte | 33 +++++++---- .../src/components/icons/TopMenu.svelte | 4 +- 9 files changed, 70 insertions(+), 94 deletions(-) diff --git a/packages/theme/styles/_colors.scss b/packages/theme/styles/_colors.scss index 1b3b330aee..7e01d2d8ae 100644 --- a/packages/theme/styles/_colors.scss +++ b/packages/theme/styles/_colors.scss @@ -74,7 +74,7 @@ --theme-bg-color: #1A1A28; --theme-back-color: #0f0f18; - --theme-overlay-color: #0000007f; + --theme-overlay-color: rgba(0, 0, 0, .3); --theme-statusbar-color: #2C2C35; --theme-navpanel-color: #14141F; --theme-navpanel-hovered: rgba(255, 255, 255, .04); @@ -117,6 +117,8 @@ --theme-progress-color: #FFFFFF; --theme-popup-color: #292938; --theme-popup-divider: rgba(255, 255, 255, .1); + --theme-popup-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1); // Light + --theme-panel-color: #1F1F2C; --body-color: #1f2023; --body-accent: #222326; @@ -222,7 +224,7 @@ --theme-bg-color: #F1F1F4; --theme-back-color: #D9D9DD; - --theme-overlay-color: #0000007f; + --theme-overlay-color: rgba(0, 0, 0, .2); --theme-statusbar-color: #bfbfc6; --theme-navpanel-color: #E8E8ED; --theme-navpanel-hovered: rgba(218, 218, 231, .5); @@ -265,6 +267,8 @@ --theme-progress-color: rgba(0, 0, 0, .5); --theme-popup-color: #F1F1F4; --theme-popup-divider: rgba(0, 0, 0, .1); + --theme-popup-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1); + --theme-panel-color: #FFFFFF; --body-color: #fff; --body-accent: #fafafa; // HZ diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 5f1c93fb86..2b799f4fa5 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -406,6 +406,7 @@ input.search { &:not(.reverse) > *:not(:first-child) { margin-left: .5rem; } &.reverse > *:not(:last-child) { margin-right: .5rem; } } +.gap-around-2 > * { margin: .25rem; } /* --------- */ .sm-tool-icon { diff --git a/packages/theme/styles/common.scss b/packages/theme/styles/common.scss index bf4cfe0d4e..7550aa48bc 100644 --- a/packages/theme/styles/common.scss +++ b/packages/theme/styles/common.scss @@ -37,6 +37,7 @@ width: 100%; border-top: 1px solid var(--theme-navpanel-divider); } + &.lastDivider { border-color: var(--theme-navpanel-border); } } .antiPanel-navigator, .antiPanel-component { diff --git a/packages/theme/styles/panel.scss b/packages/theme/styles/panel.scss index 596af402bd..1df2833ca0 100644 --- a/packages/theme/styles/panel.scss +++ b/packages/theme/styles/panel.scss @@ -116,7 +116,7 @@ min-height: 0; width: 100%; height: 100%; - background-color: var(--theme-bg-color); + background-color: var(--theme-panel-color); border: 1px solid var(--theme-divider-color); &:not(.embedded) { border-radius: 0 0 .5rem .5rem; @@ -226,7 +226,7 @@ min-width: 0; max-width: 320px; height: 100%; - background-color: var(--theme-list-row-color); + background-color: var(--theme-panel-color); border-left: 1px solid var(--theme-divider-color); border-bottom-right-radius: .45rem; box-shadow: 0 0 0 0 rgba(0, 0, 0, 0); diff --git a/plugins/tracker-assets/assets/icons.svg b/plugins/tracker-assets/assets/icons.svg index dbf601ee7b..58526c3fd4 100644 --- a/plugins/tracker-assets/assets/icons.svg +++ b/plugins/tracker-assets/assets/icons.svg @@ -88,7 +88,7 @@ - + diff --git a/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte index ef71fb12fa..ee79b644e4 100644 --- a/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte +++ b/plugins/tracker-resources/src/components/issues/edit/CreateSubIssue.svelte @@ -19,7 +19,7 @@ import presentation, { DraftController, getClient, KeyedAttribute } from '@hcengineering/presentation' import tags, { TagElement, TagReference } from '@hcengineering/tags' import { calcRank, Issue, IssueDraft, IssuePriority, Project } from '@hcengineering/tracker' - import { addNotification, Button, Component, EditBox } from '@hcengineering/ui' + import { addNotification, Button, Component, EditBox, deviceOptionsStore, ButtonSize } from '@hcengineering/ui' import { createEventDispatcher, onDestroy } from 'svelte' import tracker from '../../../plugin' import AssigneeEditor from '../AssigneeEditor.svelte' @@ -188,10 +188,12 @@ $: if (!object.status && currentProject?.defaultIssueStatus) { object.status = currentProject.defaultIssueStatus } + let buttonSize: ButtonSize + $: buttonSize = $deviceOptionsStore.twoRows ? 'small' : 'large' -
-
+
+
-
-
+
+
(object.priority = detail)} /> @@ -248,8 +250,8 @@ {#key object.assignee} (object.assignee = detail)} /> {/key} @@ -260,7 +262,9 @@ items: object.labels, key, targetClass: tracker.class.Issue, - countLabel: tracker.string.NumberLabels + countLabel: tracker.string.NumberLabels, + kind: 'secondary', + size: buttonSize }} on:open={(evt) => { addTagRef(evt.detail) @@ -269,16 +273,16 @@ object.labels = object.labels.filter((it) => it._id !== evt.detail) }} /> - +
-
-
@@ -286,15 +290,20 @@
diff --git a/plugins/workbench-resources/src/components/Logo.svelte b/plugins/workbench-resources/src/components/Logo.svelte index 0a6f51b9e1..3927139b43 100644 --- a/plugins/workbench-resources/src/components/Logo.svelte +++ b/plugins/workbench-resources/src/components/Logo.svelte @@ -12,24 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. --> - - - + diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte index 1d65fad855..36f1620443 100644 --- a/plugins/workbench-resources/src/components/Workbench.svelte +++ b/plugins/workbench-resources/src/components/Workbench.svelte @@ -65,6 +65,7 @@ import SpaceView from './SpaceView.svelte' import Settings from './icons/Settings.svelte' import Logo from './Logo.svelte' + import TopMenu from './icons/TopMenu.svelte' let contentPanel: HTMLElement let shownMenu: boolean = false @@ -551,17 +552,21 @@
-
+
- +
+
+
@@ -742,6 +747,9 @@ .logo-container { margin-right: 0.5rem; } + .topmenu-container { + margin-right: 0.5rem; + } .divider { margin-left: 0.5rem; width: 1px; @@ -753,7 +761,10 @@ margin-top: 1.25rem; .logo-container { - margin-bottom: 1.75rem; + margin-bottom: 0.75rem; + } + .topmenu-container { + margin-bottom: 1.5rem; } .divider { margin-top: 1.5rem; @@ -761,15 +772,17 @@ height: 1px; } } - // &.mini { - // position: fixed; - // top: 4px; - // left: 4px; - // } - .logo-container { + .logo-container, + .topmenu-container, + .divider { flex-shrink: 0; } + .topmenu-container.mini { + position: fixed; + top: 4px; + left: 4px; + } .divider { flex-shrink: 0; background-color: var(--theme-navpanel-icons-divider); diff --git a/plugins/workbench-resources/src/components/icons/TopMenu.svelte b/plugins/workbench-resources/src/components/icons/TopMenu.svelte index f99ee5bdff..1f03afb299 100644 --- a/plugins/workbench-resources/src/components/icons/TopMenu.svelte +++ b/plugins/workbench-resources/src/components/icons/TopMenu.svelte @@ -4,6 +4,6 @@ - - + +