Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TSK-1410,-1408,-1392,-1389,-1386,-1377: Minor fixes. Update IssueNotification layout. #3117

Merged
merged 4 commits into from
May 1, 2023
+151 −278
Merged

TSK-1410,-1408,-1392,-1389,-1386,-1377: Minor fixes. Update IssueNotification layout. #3117

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20b3311
TSK-1410,-1408,-1392,-1389,-1386,-1377: Minor fixes. Update IssueNoti…
SasLord Apr 30, 2023
24f166a
Fix uitest
SasLord May 1, 2023
089fe11
TSK-1383: fixed colors in HR - Structure
SasLord May 1, 2023
336c659
Fixes FixedColumn
SasLord May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/text-editor/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const FORMAT_MODES = [
/**
* @public
*/
export type FormatMode = typeof FORMAT_MODES[number]
export type FormatMode = (typeof FORMAT_MODES)[number]

/**
* @public
Expand Down
12 changes: 12 additions & 0 deletions packages/theme/styles/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@
--theme-popup-divider: rgba(255, 255, 255, .1);
--theme-popup-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1); // Light
--theme-panel-color: #1A1A28;
--theme-calendar-today-color: #fff;
--theme-calendar-holiday-color: #eb5757;
--theme-calendar-weekend-color: rgba(242, 153, 74, 1);
--theme-calendar-today-bgcolor: rgba(32, 93, 194, .1);
--theme-calendar-holiday-bgcolor: rgba(235, 87, 87, .1);
--theme-calendar-weekend-bgcolor: rgba(242, 153, 74, .05);

--body-color: #1f2023;
--body-accent: #222326;
Expand Down Expand Up @@ -269,6 +275,12 @@
--theme-popup-divider: rgba(0, 0, 0, .1);
--theme-popup-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1);
--theme-panel-color: #FFFFFF;
--theme-calendar-today-color: #000;
--theme-calendar-holiday-color: #eb5757;
--theme-calendar-weekend-color: rgba(242, 153, 74, 1);
--theme-calendar-today-bgcolor: rgba(43, 81, 144, .1);
--theme-calendar-holiday-bgcolor: rgba(235, 87, 87, .1);
--theme-calendar-weekend-bgcolor: rgba(242, 153, 74, .1);

--body-color: #fff;
--body-accent: #fafafa; // HZ
Expand Down
1 change: 1 addition & 0 deletions packages/theme/styles/_layouts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ input.search {
display: flex;
justify-content: space-between;
align-items: center;
min-width: 0;
}
.flex-stretch {
display: flex;
Expand Down
1 change: 1 addition & 0 deletions packages/theme/styles/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@
align-items: center;
flex-shrink: 1;
min-width: 0;
border-radius: 0 1.49rem 1.49rem 0;

.label-wrapper {
display: flex;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/components/Scroller.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@
class:buttons={buttons === 'normal'}
class:union={buttons === 'union'}
class:shrink
style:user-select={isScrolling ? 'none' : 'inherit'}
style:--scroller-header-height={`${fade.multipler?.top ?? 0.125}rem`}
style:--scroller-footer-height={`${fade.multipler?.bottom ?? 0.125}rem`}
>
Expand Down
44 changes: 21 additions & 23 deletions packages/ui/src/components/calendar/DatePresenter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
margin-right: 0;
}
&.normal {
color: var(--content-color);
color: var(--theme-content-color);
}
&.warning {
color: var(--warning-color);
Expand All @@ -178,15 +178,15 @@
}
}
.not-selected {
color: var(--content-color);
color: var(--theme-dark-color);
}

&:hover {
color: var(--caption-color);
color: var(--theme-caption-color);
transition-duration: 0;

.not-selected {
color: var(--accent-color);
color: var(--theme-caption-color);
}
}
&.editable {
Expand Down Expand Up @@ -224,9 +224,9 @@
cursor: default;

&:hover {
color: var(--content-color);
color: var(--theme-dark-color);
.btn-icon {
color: var(--content-color);
color: var(--theme-dark-color);
}
}
}
Expand All @@ -240,40 +240,38 @@
margin-right: 0.5rem;
}
&:hover {
color: var(--caption-color);
background-color: var(--body-color);
border-color: var(--divider-color);
color: var(--theme-caption-color);
background-color: var(--theme-button-hovered);
border-color: var(--theme-divider-color);
.btn-icon {
color: var(--content-color);
color: var(--theme-caption-color);
}
}
}
&.list {
padding: 0 0.625em 0 0.5rem;
min-height: 1.75rem;
color: var(--content-color);
background-color: var(--body-color);
border: 1px solid var(--divider-color);
background-color: var(--theme-list-button-color);
border: 1px solid var(--theme-divider-color);
border-radius: 3rem;
transition-property: border, color, background-color;
transition-duration: 0.15s;

&:hover {
color: var(--caption-color);
background-color: var(--board-card-bg-color);
border-color: var(--button-border-color);
color: var(--theme-caption-color);
background-color: var(--theme-list-button-color);
border-color: var(--theme-divider-color);
}
}
&.link-bordered {
padding: 0 0.375rem;
color: var(--accent-color);
border-color: var(--divider-color);
color: var(--theme-content-color);
border-color: var(--theme-button-border);
&:hover {
color: var(--accent-color);
background-color: var(--button-bg-hover);
border-color: var(--button-border-hover);
color: var(--theme-caption-color);
background-color: var(--theme-button-hovered);
.btn-icon {
color: var(--accent-color);
color: var(--theme-caption-color);
}
}
}
Expand Down Expand Up @@ -305,7 +303,7 @@
width: 1px;
min-width: 1px;
height: 0.75rem;
background-color: var(--button-border-color);
background-color: var(--theme-divider-color);
}
.separator {
margin: 0 0.1rem;
Expand Down
4 changes: 2 additions & 2 deletions plugins/attachment-resources/src/components/FileBrowser.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
import core, { Class, getCurrentAccount, Ref, Space } from '@hcengineering/core'
import { getClient } from '@hcengineering/presentation'
import { ActionIcon, IconMoreH, Label, Loading, location, navigate, TabList, SearchEdit } from '@hcengineering/ui'
import { Label, Loading, location, navigate, TabList, SearchEdit } from '@hcengineering/ui'
import view from '@hcengineering/view'
import { get } from 'svelte/store'
import { dateFileBrowserFilters, FileBrowserSortMode, fileTypeFileBrowserFilters, sortModeToOptionObject } from '..'
Expand Down Expand Up @@ -122,7 +122,7 @@
<div class="ac-header full divide search-start">
<div class="ac-header-full small-gap">
<SearchEdit bind:value={search} on:change={() => {}} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
<div class="buttons-divider" />
</div>
<FileBrowserFilters
Expand Down
6 changes: 2 additions & 4 deletions plugins/calendar-resources/src/components/Events.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@
AnyComponent,
Button,
Component,
ActionIcon,
Label,
Loading,
SearchEdit,
showPopup,
TabList,
IconMoreH,
IconAdd
} from '@hcengineering/ui'
import view, { Viewlet, ViewletPreference } from '@hcengineering/view'
Expand Down Expand Up @@ -135,13 +133,13 @@
<div class="ac-header full divide search-start">
<div class="ac-header-full small-gap">
<SearchEdit bind:value={search} on:change={() => updateResultQuery(search)} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
<div class="buttons-divider" />
<FilterButton {_class} />
</div>
<div class="ac-header-full medium-gap">
<ViewletSettingButton bind:viewOptions viewlet={selectedViewlet} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
</div>
</div>
{#if selectedViewlet?.$lookup?.descriptor?.component}
Expand Down
6 changes: 3 additions & 3 deletions plugins/contact-resources/src/components/Contacts.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script lang="ts">
import { Doc, DocumentQuery } from '@hcengineering/core'
import { createQuery, getClient } from '@hcengineering/presentation'
import { Button, Label, Loading, SearchEdit, showPopup, IconMoreH, ActionIcon } from '@hcengineering/ui'
import { Button, Label, Loading, SearchEdit, showPopup } from '@hcengineering/ui'
import view, { Viewlet, ViewletPreference } from '@hcengineering/view'
import {
ActionContext,
Expand Down Expand Up @@ -101,13 +101,13 @@
<div class="ac-header full divide search-start">
<div class="ac-header-full small-gap">
<SearchEdit bind:value={search} on:change={() => updateResultQuery(search)} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
<div class="buttons-divider" />
<FilterButton _class={contact.class.Contact} />
</div>
<div class="ac-header-full medium-gap">
<ViewletSettingButton bind:viewOptions {viewlet} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion plugins/contact-resources/src/components/UserBox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<div class="flex-presenter not-selected">
{#if icon}
<div class="icon" class:small-gap={size === 'inline' || size === 'small'}>
<Icon {icon} size={kind === 'link' ? 'small' : size} />
<Icon {icon} size={'small'} />
</div>
{/if}
<div class="label no-underline">
Expand Down
6 changes: 3 additions & 3 deletions plugins/document-resources/src/components/Documents.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { Doc, DocumentQuery } from '@hcengineering/core'
import { Document } from '@hcengineering/document'
import { createQuery, getClient } from '@hcengineering/presentation'
import { ActionIcon, IconMoreH, Label, Loading, SearchEdit } from '@hcengineering/ui'
import { Label, Loading, SearchEdit } from '@hcengineering/ui'
import view, { Viewlet, ViewletPreference } from '@hcengineering/view'
import {
ActionContext,
Expand Down Expand Up @@ -90,13 +90,13 @@
<div class="ac-header full divide search-start">
<div class="ac-header-full small-gap">
<SearchEdit bind:value={search} on:change={() => updateResultQuery(search, query)} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
<div class="buttons-divider" />
<FilterButton _class={document.class.Document} />
</div>
<div class="ac-header-full medium-gap">
<ViewletSettingButton bind:viewOptions {viewlet} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
</div>
</div>

Expand Down
4 changes: 1 addition & 3 deletions plugins/hr-resources/src/components/Schedule.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import { createQuery, getClient, SpaceSelector } from '@hcengineering/presentation'
import {
Button,
ActionIcon,
IconMoreH,
IconBack,
IconForward,
Label,
Expand Down Expand Up @@ -134,7 +132,7 @@
<div class="ac-header full divide search-start">
<div class="ac-header-full small-gap">
<SearchEdit bind:value={search} on:change={() => updateResultQuery(search)} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
</div>
<div class="ac-header-full medium-gap">
<!-- <ViewletSettingButton bind:viewOptions {viewlet} /> -->
Expand Down
4 changes: 1 addition & 3 deletions plugins/hr-resources/src/components/Structure.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
Button,
deviceOptionsStore as deviceInfo,
eventToHTMLElement,
ActionIcon,
IconMoreH,
Label,
Scroller,
SearchEdit,
Expand Down Expand Up @@ -90,7 +88,7 @@
<div class="ac-header full divide search-start">
<div class="ac-header-full small-gap">
<SearchEdit bind:value={search} on:change={() => updateResultQuery(search)} />
<ActionIcon icon={IconMoreH} size={'small'} />
<!-- <ActionIcon icon={IconMoreH} size={'small'} /> -->
</div>
</div>

Expand Down
26 changes: 13 additions & 13 deletions plugins/hr-resources/src/components/schedule/MonthView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@
font-weight: 500;
font-size: 0.75rem;
line-height: 105%;
color: var(--dark-color);
box-shadow: inset 0 -1px 0 0 var(--divider-color);
color: var(--theme-halfcontent-color);
box-shadow: inset 0 -1px 0 0 var(--theme-divider-color);
user-select: none;
cursor: pointer;

Expand All @@ -341,48 +341,48 @@
font-size: 1rem;
}
&.today {
color: var(--caption-color);
color: var(--theme-calendar-today-color);
}
&.holiday:not(.today) {
color: var(--error-color);
color: var(--theme-calendar-holiday-color);
}
&.weekend:not(.today) {
color: var(--warning-color);
color: var(--theme-calendar-weekend-color);
}
&.hoveredCell {
background-color: var(--highlight-select);
background-color: var(--theme-button-pressed);
}
}
td {
height: 3.5rem;
border: none;
color: var(--caption-color);
&.today {
background-color: var(--primary-button-disabled);
background-color: var(--theme-calendar-today-bgcolor);
}
&.summary {
font-weight: 600;
}
&.weekend:not(.today) {
background-color: var(--accent-bg-color);
background-color: var(--theme-calendar-weekend-bgcolor);
}
&.holiday:not(.today) {
background-color: var(--system-error-60-color);
background-color: var(--theme-calendar-holiday-bgcolor);
}
}
td:not(:last-child) {
border-right: 1px solid var(--divider-color);
border-right: 1px solid var(--theme-divider-color);
}

tbody,
tfoot {
tr {
border-bottom: 1px solid var(--divider-color);
border-bottom: 1px solid var(--theme-divider-color);
}
}

tr.scroller-thead__tr:not(:last-child) {
border-right: 1px solid var(--divider-color);
border-right: 1px solid var(--theme-divider-color);
}

.hovered {
Expand All @@ -395,7 +395,7 @@
left: 0;
width: 100%;
height: 100%;
background-color: var(--caption-color);
background-color: var(--theme-caption-color);
opacity: 0.15;
}
}
Expand Down
Loading