diff --git a/.github/workflows/pr-ng14.yml b/.github/workflows/pr-ng14.yml index dfcdf12b25..dc464320b1 100644 --- a/.github/workflows/pr-ng14.yml +++ b/.github/workflows/pr-ng14.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '18.x' registry-url: 'https://registry.npmjs.org' - name: Derive appropriate SHAs for base and head for `nx affected` commands diff --git a/.github/workflows/pr-ng15.yml b/.github/workflows/pr-ng15.yml index 05ff27ab0d..d52ab2c6cb 100644 --- a/.github/workflows/pr-ng15.yml +++ b/.github/workflows/pr-ng15.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '18.x' registry-url: 'https://registry.npmjs.org' - name: Derive appropriate SHAs for base and head for `nx affected` commands diff --git a/.github/workflows/pr-ng16.yml b/.github/workflows/pr-ng16.yml index 6d119c38d4..e1b0000e3a 100644 --- a/.github/workflows/pr-ng16.yml +++ b/.github/workflows/pr-ng16.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16.x' + node-version: '18.x' registry-url: 'https://registry.npmjs.org' - name: Derive appropriate SHAs for base and head for `nx affected` commands diff --git a/apps/doc/src/app/components/table/examples/table-editable-col-example/table-editable-col-example.component.html b/apps/doc/src/app/components/table/examples/table-editable-col-example/table-editable-col-example.component.html index 60065b9201..e0e2f2697d 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-col-example/table-editable-col-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-editable-col-example/table-editable-col-example.component.html @@ -24,7 +24,7 @@ prizmTr > {{ item.code | spaceNumber : '0.0-0' }} - + + + -
- + + + + {{ column.name }} + + + -
+
@@ -22,20 +40,3 @@
- - - - {{ column.name }} - - diff --git a/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.less b/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.less index 096f7cfd05..95266b49ec 100644 --- a/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.less +++ b/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.less @@ -3,38 +3,26 @@ max-height: 287px; } -.column-box { - background-color: var(--prizm-bg-body); - display: flex; - align-items: center; - height: 40px; - padding: 0px 16px; - button { - margin-left: auto; - } - cursor: pointer; - &:hover { - background-color: var(--prizm-v2-table-background-default-hover); - } -} - .cdk-drag-preview { - color: var(--prizm-text-contrast); - box-shadow: 0px 8px 32px 0px var(--prizm-shadow); + color: var(--prizm-v3-text-icon-primary); + box-shadow: var(--prizm-v3-shadow-big-bottom); border-radius: 2px; - border: 1px solid var(--prizm-border-widget); - cursor: grabbing; + cursor: grabbing !important; z-index: 9999; + + ::ng-deep .item-container { + border: 1px solid var(--prizm-v3-background-stroke); + } } .dropzone { display: flex; align-items: center; justify-content: space-around; - border-top: 1px dashed var(--prizm-border-forms); - border-bottom: 1px dashed var(--prizm-border-forms); + border-top: 1px dashed var(--prizm-v3-form-stroke-default); + border-bottom: 1px dashed var(--prizm-v3-form-stroke-default); border-radius: 2px; - background-color: var(--prizm-g2-g11); + background-color: var(--prizm-v3-form-fill-default); height: 40px; margin-bottom: 16px; } diff --git a/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.ts b/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.ts index a2c7bd326c..a6f2ee82d5 100644 --- a/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.ts +++ b/libs/components/src/lib/components/column-settings/components/column-drop-list/column-drop-list.component.ts @@ -13,6 +13,7 @@ import { PrizmToggleComponent } from '../../../toggle/toggle.component'; import { PrizmIconComponent } from '../../../icon/icon.component'; import { PrizmScrollbarComponent } from '../../../scrollbar/scrollbar.component'; import { PrizmHintDirective } from '../../../../directives/hint/hint.directive'; +import { PrizmListingItemComponent } from '../../../listing-item'; const DragConfig: DragDropConfig = { zIndex: 9999, @@ -38,6 +39,7 @@ const DragConfig: DragDropConfig = { FormsModule, PrizmThemeModule, PrizmColumnIconPipe, + PrizmListingItemComponent, ], }) export class PrizmColumnDropListComponent extends PrizmAbstractTestId { diff --git a/libs/components/src/lib/components/data-list/data-list.component.less b/libs/components/src/lib/components/data-list/data-list.component.less index 300aa818f2..8ee32821b5 100644 --- a/libs/components/src/lib/components/data-list/data-list.component.less +++ b/libs/components/src/lib/components/data-list/data-list.component.less @@ -10,19 +10,19 @@ font-style: normal; font-size: 14px; line-height: 20px; - border: var(--prizm-data-list-border, 1px solid var(--prizm-border-widget)); + border: var(--prizm-data-list-border, 1px solid var(--prizm-v3-background-stroke)); border-left: var(--prizm-data-list-border-left); border-top: var(--prizm-data-list-border-top); border-right: var(--prizm-data-list-border-right); border-bottom: var(--prizm-data-list-border-bottom); border-radius: var(--prizm-data-list-border-radius, 2px); display: block; - background: var(--prizm-data-list-background, var(--prizm-bg-body)); + background: var(--prizm-data-list-background, var(--prizm-v3-background-fill-overlay)); .header { - color: var(--prizm-data-list-header-text, var(--prizm-text-subscript)); + color: var(--prizm-data-list-header-text, var(--prizm-v3-text-icon-secondary)); font-size: var(--prizm-data-list-header-text-size, 14px); - border-bottom: 1px solid var(--prizm-data-list-border, var(--prizm-border-widget)); + border-bottom: 1px solid var(--prizm-data-list-border, var(--prizm-v3-background-stroke)); font-weight: 600; padding: var(--prizm-data-list-padding, 16px); } @@ -34,7 +34,7 @@ } .footer { - border-top: 1px solid var(--prizm-data-list-border, var(--prizm-border-widget)); + border-top: 1px solid var(--prizm-data-list-border, var(--prizm-v3-background-stroke)); padding: var(--prizm-data-list-padding, 16px); } } diff --git a/libs/components/src/lib/components/dropdowns/dropdown-host/dropdown-host.component.less b/libs/components/src/lib/components/dropdowns/dropdown-host/dropdown-host.component.less index 1199a916af..a044fff6fc 100644 --- a/libs/components/src/lib/components/dropdowns/dropdown-host/dropdown-host.component.less +++ b/libs/components/src/lib/components/dropdowns/dropdown-host/dropdown-host.component.less @@ -14,7 +14,7 @@ .prizm-dropdown-host-modal { width: 100%; border-radius: var(--prizm-dropdrown-host-border-radius, 2px); - border: var(--prizm-dropdrown-host-border, 1px solid var(--prizm-border-widget)); - background: var(--prizm-dropdrown-host-background, var(--prizm-bg-body)); - box-shadow: var(--prizm-dropdrown-host-box-shadow, -8px 0px 32px var(--prizm-shadow)); + border: var(--prizm-dropdrown-host-border, 1px solid var(--prizm-v3-background-stroke)); + background: var(--prizm-dropdrown-host-background, var(--prizm-v3-background-fill-overlay)); + box-shadow: var(--prizm-dropdrown-host-box-shadow, var(--prizm-v3-shadow-big-bottom)); } diff --git a/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.less b/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.less index 06de3f4334..6bc6899636 100644 --- a/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.less +++ b/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.less @@ -9,12 +9,13 @@ display: flex; align-items: center; padding: var(--prizm-select-item-padding, 8px 16px); - background: var(--prizm-select-item-background, var(--prizm-bg-body)); + min-height: 40px; + background: var(--prizm-select-item-background, var(--prizm-v3-background-fill-overlay)); cursor: pointer; font-weight: var(--prizm-select-item-font-weight, 400); font-size: var(--prizm-select-item-font-size, 14px); gap: var(--prizm-select-item-gap, 8px); - color: var(--prizm-select-item-text, var(--prizm-text-contrast, #20222b)); + color: var(--prizm-select-item-text, var(--prizm-v3-text-icon-secondary)); .text { max-width: calc(100% - 16px); @@ -26,21 +27,21 @@ &.selected, &.most-relevant { - background: var(--prizm-select-item-selected-background, var(--prizm-lite-b130-20)); + background: var(--prizm-select-item-selected-background, var(--prizm-v3-table-fill-row-active)); .text { - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-secondary); } } &:not(.selected):not(.most-relevant):hover { - background: var(--prizm-select-item-hover-background, var(--prizm-g2-g11)); - color: var(--prizm-text-contrast); + background: var(--prizm-select-item-hover-background, var(--prizm-v3-table-fill-row-hover)); + color: var(--prizm-v3-text-icon-secondary); } } .block { - background: var(--prizm-select-background, var(--prizm-bg-body)); + background: var(--prizm-select-background, var(--prizm-v3-background-fill-overlay)); border-radius: 2px; border: none; padding: var(--prizm-select-padding, 8px 0); @@ -52,14 +53,14 @@ .empty-template { padding: var(--prizm-select-item-padding, 8px 16px); - background: var(--prizm-select-item-background, var(--prizm-bg-body)); + background: var(--prizm-select-item-background, var(--prizm-v3-background-fill-overlay)); font-weight: var(--prizm-select-item-font-weight, 400); font-size: var(--prizm-select-item-font-size, 14px); - color: var(--prizm-select-empty-text, var(--prizm-text-subscript, #20222b)); + color: var(--prizm-select-empty-text, var(--prizm-v3-text-icon-secondary)); } .icon-dropdown { - color: #777b92; + color: var(--prizm-v3-button-secondary-solid-default); cursor: pointer; transition-property: transform; transition-property: all; @@ -68,7 +69,7 @@ transition-timing-function: ease-in-out; &.active { - color: #337eff; + color: var(--prizm-v3-button-primary-solid-active); } &.opened { diff --git a/libs/components/src/lib/components/dropdowns/select/input-select-item.component.less b/libs/components/src/lib/components/dropdowns/select/input-select-item.component.less index 13c847a1ef..2485ed4aa3 100644 --- a/libs/components/src/lib/components/dropdowns/select/input-select-item.component.less +++ b/libs/components/src/lib/components/dropdowns/select/input-select-item.component.less @@ -16,11 +16,12 @@ display: flex; align-items: center; padding: var(--prizm-select-item-padding, 8px 16px); - background: var(--prizm-select-item-background, var(--prizm-bg-body)); + min-height: 40px; + background: var(--prizm-select-item-background, var(--prizm-v3-background-fill-overlay)); cursor: pointer; font-weight: var(--prizm-select-item-font-weight, 400); font-size: var(--prizm-select-item-font-size, 14px); - color: var(--prizm-select-item-text, var(--prizm-text-contrast, #20222b)); + color: var(--prizm-select-item-text, var(--prizm-v3-text-icon-secondary)); &:empty { display: none; @@ -35,18 +36,18 @@ &.selected, &.most-relevant { - background: var(--prizm-select-item-selected-background, var(--prizm-lite-b130-20)); - color: var(--prizm-text-contrast); + background: var(--prizm-select-item-selected-background, var(--prizm-v3-table-fill-row-active)); + color: var(--prizm-v3-text-icon-secondary); } &:not(.selected):not(.most-relevant):hover { - background: var(--prizm-select-item-hover-background, var(--prizm-g2-g11)); - color: var(--prizm-text-contrast); + background: var(--prizm-select-item-hover-background, var(--prizm-v3-table-fill-row-hover)); + color: var(--prizm-v3-text-icon-secondary); } } .block { - background: var(--prizm-select-background, var(--prizm-bg-body)); + background: var(--prizm-select-background, var(--prizm-v3-background-fill-overlay)); border-radius: 2px; border: none; padding: var(--prizm-select-padding, 8px 0); @@ -58,14 +59,14 @@ .empty-template { padding: var(--prizm-select-item-padding, 8px 16px); - background: var(--prizm-select-item-background, var(--prizm-bg-body)); + background: var(--prizm-select-item-background, var(--prizm-v3-background-fill-overlay)); font-weight: var(--prizm-select-item-font-weight, 400); font-size: var(--prizm-select-item-font-size, 14px); - color: var(--prizm-select-empty-text, var(--prizm-text-subscript, #20222b)); + color: var(--prizm-select-empty-text, var(--prizm-v3-text-icon-secondary)); } .icon-dropdown { - color: #777b92; + color: var(--prizm-v3-button-secondary-solid-default); cursor: pointer; transition-property: transform; transition-property: all; @@ -78,7 +79,7 @@ } &.active { - color: #337eff; + color: var(--prizm-v3-button-primary-solid-active); } } diff --git a/libs/components/src/lib/components/input/carousel/input-carousel.component.less b/libs/components/src/lib/components/input/carousel/input-carousel.component.less index 60aa96c05f..67e9c1ba09 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel.component.less +++ b/libs/components/src/lib/components/input/carousel/input-carousel.component.less @@ -6,12 +6,8 @@ height: 100%; line-height: 16px; font-size: 14px; - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-secondary); display: block; - - &:focus { - outline: var(--prizm-index-plan) 1px solid; - } } // In inner context diff --git a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less index 028c115d35..043ee789b4 100644 --- a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less +++ b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less @@ -7,13 +7,14 @@ padding: 0; background: transparent; - width: var(--prizm-input-icon-button-width, 32px); + width: var(--prizm-input-icon-button-width, 24px); + height: var(--prizm-input-icon-button-height, 24px); font-size: inherit; - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-secondary); &.disabled { - color: var(--prizm-grey-g9-g5); + color: var(--prizm-v3-text-icon-disable); pointer-events: none; cursor: not-allowed; } @@ -22,16 +23,19 @@ :host-context(.interactive) { &:not(.disabled) { &:hover { - color: var(--prizm-index-plan); + color: var(--prizm-v3-button-primary-solid-hover); } &:focus { - color: var(--prizm-index-plan); - text-shadow: 0 0 1px var(--prizm-index-plan); + color: var(--prizm-v3-button-primary-solid-hover); } cursor: pointer; } - color: var(--prizm-border-icon); + color: var(--prizm-v3-button-secondary-solid-default); +} + +:host-context(.disabled) { + display: none; } diff --git a/libs/components/src/lib/components/input/common/input-invalid-subtext/input-status-subtext.component.less b/libs/components/src/lib/components/input/common/input-invalid-subtext/input-status-subtext.component.less index b6bef9edc9..53e7beb0af 100644 --- a/libs/components/src/lib/components/input/common/input-invalid-subtext/input-status-subtext.component.less +++ b/libs/components/src/lib/components/input/common/input-invalid-subtext/input-status-subtext.component.less @@ -1,6 +1,6 @@ :host { display: block; - color: var(--prizm-index-danger); + color: var(--prizm-v3-status-alarm-primary-default); // by default for invalid text min-height: 22px; } diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout-textarea.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout-textarea.component.less index 1c6c4d0e17..980da716ca 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout-textarea.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout-textarea.component.less @@ -30,7 +30,7 @@ .prizm-input-label { &-textarea { &.@{label}-inner { - background-color: var(--prizm-bg-dashboard-forms); + background-color: var(--prizm-v3-form-fill-default); width: 100%; &[data-size='l'] { top: 0; diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index 7b3ec6ec27..d81a7a84cb 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -36,8 +36,7 @@ .prizm-input-label { font-weight: 600; font-size: 12px; - color: var(--prizm-text-subscript); - padding-left: 16px; + color: var(--prizm-v3-text-icon-tertiary); line-height: 16px; transition: top 200ms ease 0s; pointer-events: none; @@ -46,12 +45,11 @@ gap: 4px; &-required { - color: var(--prizm-index-danger); + color: var(--prizm-v3-status-alarm-primary-default); } &-inner { position: absolute; - padding-left: 8px; display: flex; gap: 4px; max-width: 100%; @@ -90,8 +88,8 @@ } .prizm-input-form { - background-color: var(--prizm-bg-dashboard-forms); - border: 1px solid var(--prizm-border-forms); + background-color: var(--prizm-v3-form-fill-default); + border: 1px solid var(--prizm-v3-form-stroke-default); border-radius: 2px; display: flex; flex-direction: column; @@ -113,7 +111,7 @@ } &:hover { - border-color: var(--prizm-index-plan); + border-color: var(--prizm-v3-form-stroke-hover); } &__first { @@ -129,57 +127,58 @@ &-status { &-success { - border-color: var(--prizm-index-good); + border-color: var(--prizm-v3-status-success-primary-default); &:hover { - border-color: var(--prizm-index-good); + border-color: var(--prizm-v3-status-success-primary-hover); } .prizm-input-form-status-button { - color: var(--prizm-index-good); + color: var(--prizm-v3-status-success-primary-default); } } &-warning { - border-color: var(--prizm-index-warning); + border-color: var(--prizm-v3-status-warning-primary-default); &:hover { - border-color: var(--prizm-index-warning); + border-color: var(--prizm-v3-status-warning-primary-hover); } .prizm-input-form-status-button { - color: var(--prizm-index-warning); + color: var(--prizm-v3-status-warning-primary-default); } } &-danger { - border-color: var(--prizm-index-danger); + border-color: var(--prizm-v3-status-alarm-primary-default); &:hover { - border-color: var(--prizm-index-danger); + border-color: var(--prizm-v3-status-alarm-primary-hover); } .prizm-input-form-status-button { - color: var(--prizm-index-danger); + color: var(--prizm-v3-status-alarm-primary-default); } } } &-invalid { &.prizm-input-form-touched { - border-color: var(--prizm-index-danger); + border-color: var(--prizm-v3-status-alarm-primary-default); } .prizm-input-form-status-button { - color: var(--prizm-index-danger); + color: var(--prizm-v3-status-alarm-primary-default); } } // rewrite all if focused - &-focused:host-context(.enabled), - &:focus-within:host-context(.enabled) { - border-color: var(--prizm-index-plan); - box-shadow: 0 0 0 2px var(--prizm-lite-b130-20); + &-focused, + &:focus-within { + border-color: var(--prizm-v3-form-active); + box-shadow: 0 0 0 2px var(--prizm-v3-background-stroke-focus); + position: relative; &:hover { - border-color: var(--prizm-index-plan); + border-color: var(--prizm-v3-form-active-hover); } .prizm-input-button-default { @@ -230,7 +229,7 @@ .prizm-input-button-default { position: absolute; z-index: 100; - background-color: var(--prizm-bg-dashboard-forms); + background-color: var(--prizm-v3-form-fill-default); } .prizm-input-button-default { @@ -257,15 +256,15 @@ line-height: 22px; &-success { - color: var(--prizm-index-good); + color: var(--prizm-v3-status-success-primary-default); } &-warning { - color: var(--prizm-index-warning); + color: var(--prizm-v3-status-warning-primary-default); } &-danger { - color: var(--prizm-index-danger); + color: var(--prizm-v3-status-alarm-primary-default); } } diff --git a/libs/components/src/lib/components/input/common/styles/input.component.less b/libs/components/src/lib/components/input/common/styles/input.component.less index 433ce50ac3..bdf29a6bdf 100644 --- a/libs/components/src/lib/components/input/common/styles/input.component.less +++ b/libs/components/src/lib/components/input/common/styles/input.component.less @@ -6,14 +6,18 @@ height: 100%; line-height: 16px; font-size: 14px; - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-secondary); display: block; text-overflow: ellipsis; + + &::placeholder { + color: var(--prizm-v3-text-icon-disable); + } } // In inner context :host-context(.prizm-input-form-inner) { - padding: 22px 8px 4px 8px; + padding: 22px 8px 4px 0px; &:host-context(.prizm-input-empty-label) { padding-top: 4px; @@ -38,14 +42,14 @@ } :host-context(.prizm-input-form-inner[data-size='l']) { - padding: 22px 8px 4px 8px; + padding: 22px 8px 4px 0px; &:host-context(.prizm-input-empty-label) { padding-top: 4px; } } :host-context(.prizm-input-form-inner[data-size='m']) { - padding: 16px 8px 2px 8px; + padding: 16px 8px 2px 0px; &:host-context(.prizm-input-empty-label) { padding-top: 2px; @@ -54,21 +58,21 @@ // In outer context :host-context(.prizm-input-form-outer) { - padding: 7px 8px; + padding: 7px 0px; } // need for optimization output selector in less :host-context(.prizm-input-form-outer[data-size='l']) { - padding: 11px 8px; + padding: 11px 0px; } :host-context(.prizm-input-form-outer[data-size='m']) { - padding: 7px 8px; + padding: 7px 0px; } :host-context(.prizm-input-form-outer[data-size='s']) { font-size: 12px; - padding: 4px 8px; + padding: 4px 0px; } :host-context([type='number']) { diff --git a/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.html b/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.html index b50a626872..8734ec36f5 100644 --- a/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.html +++ b/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.html @@ -15,16 +15,13 @@ -
- - {{ item.name }} - -
+ {{ item.name }} +
diff --git a/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.less b/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.less index b46f7cdfa2..8e47065db6 100644 --- a/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.less +++ b/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.less @@ -20,41 +20,6 @@ pointer-events: auto; } -.z-button { - display: flex; - height: 2.75rem; - justify-content: center; - box-shadow: inset 0 1px var(--prizm-base-03); - - button { - flex: 1; - text-align: center; - } -} - -.item { - display: flex; - align-items: center; - padding: var(--prizm-select-item-padding, 8px 16px); - background: var(--prizm-select-item-background, var(--prizm-bg-body)); - cursor: pointer; - font-weight: var(--prizm-select-item-font-weight, 400); - font-size: var(--prizm-select-item-font-size, 14px); - color: var(--prizm-select-item-text, var(--prizm-text-contrast, #20222b)); - - .text { - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - - &.selected { - background: var(--prizm-select-item-selected-background, var(--prizm-lite-b130-20)); - } - - &:not(.selected):hover { - background: var(--prizm-select-item-hover-background, var(--prizm-g2-g11)); - color: var(--prizm-text-contrast); - } +.block { + padding: 8px 0; } diff --git a/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.ts b/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.ts index 49469fbe1c..b1b21fc052 100644 --- a/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.ts +++ b/libs/components/src/lib/components/input/input-date-multi/input-date-multi.component.ts @@ -26,6 +26,7 @@ import { PolymorphOutletDirective, PrizmLifecycleModule } from '../../../directi import { ReactiveFormsModule } from '@angular/forms'; import { PrizmDataListComponent } from '../../data-list'; import { PrizmDropdownHostComponent } from '../../dropdowns/dropdown-host'; +import { PrizmListingItemComponent } from '../../listing-item'; export type PrizmDateItemTemplate = { name: string; @@ -46,6 +47,7 @@ export type PrizmDateItemTemplate = { PrizmDataListComponent, PolymorphOutletDirective, PrizmDropdownHostComponent, + PrizmListingItemComponent, ], }) export class PrizmInputDateMultiComponent extends PrizmAbstractTestId implements OnInit { diff --git a/libs/components/src/lib/components/input/input-date-range/input-date-range.component.ts b/libs/components/src/lib/components/input/input-date-range/input-date-range.component.ts index 12167247e9..0151cb6fd4 100644 --- a/libs/components/src/lib/components/input/input-date-range/input-date-range.component.ts +++ b/libs/components/src/lib/components/input/input-date-range/input-date-range.component.ts @@ -3,7 +3,6 @@ import { Component, ContentChild, ElementRef, - HostBinding, HostListener, Inject, Injector, diff --git a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.html b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.html index 82e01666b5..244134fb47 100644 --- a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.html +++ b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.html @@ -22,29 +22,27 @@ - + + + + + + {{ item.label }} + + diff --git a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.less b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.less index 2c8aeb0f20..32894c4ad8 100644 --- a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.less +++ b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.less @@ -8,40 +8,15 @@ display: block; } -.relative-menu-item { - height: 44px; - padding: 0 24px; - display: flex; - align-items: center; - cursor: pointer; - - &-icon { - font-size: 18px; - display: inherit; - } - - &-label { - padding-left: 8px; - } - - &-divider { - margin: 2px 0; - border-bottom: 1px solid var(--prizm-border-widget); - } - - &:hover { - background: var(--prizm-bg-dashboard-forms); - } - - &-active { - background: var(--prizm-select-item-selected-background, var(--prizm-lite-b130-20)); +.block { + padding: 8px 0; +} - &:hover { - background: var(--prizm-select-item-selected-background, var(--prizm-lite-b130-20)); - } - } +.relative-menu-item-divider { + margin: 2px 0; + border-bottom: 1px solid var(--prizm-v3-background-stroke); } -.prizm-datepicker-relative-menu { - color: var(--prizm-text-contrast); +.relative-menu-icon { + color: var(--prizm-v3-text-icon-secondary); } diff --git a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts index b85333d985..c57fac95bb 100644 --- a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts +++ b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts @@ -37,6 +37,8 @@ import { PrizmInputTextModule } from '../input-text'; import { PrizmIconComponent } from '../../icon'; import { PrizmDropdownHostComponent } from '../../dropdowns/dropdown-host'; import { PrizmInputLayoutDateRelativeDirective } from './input-layout-date-relative.directive'; +import { PrizmDataListComponent } from '../../data-list'; +import { PrizmListingItemComponent } from '../../listing-item'; const MenuItems: RelativeDateMenuItems = getDefaultRelativeDateMenuItems(); @@ -67,6 +69,8 @@ const MenuItems: RelativeDateMenuItems = getDefaultRelativeDateMenuItems(); ReactiveFormsModule, PrizmInputLayoutDateRelativeDirective, PrizmDropdownHostComponent, + PrizmDataListComponent, + PrizmListingItemComponent, ], }) export class PrizmInputLayoutDateRelativeComponent diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html index 0c2084a535..7f96c0ed47 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html @@ -104,16 +104,13 @@ prizmLifecycle > -
- - {{ item }} - -
+ {{ item }} +
diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.less b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.less index f885040306..79ae29c248 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.less +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.less @@ -18,39 +18,8 @@ pointer-events: auto; } -.z-button { - display: flex; - height: 2.75rem; - justify-content: center; - box-shadow: inset 0 1px var(--prizm-base-03); -} - -.time-item { - display: flex; - align-items: center; - padding: var(--prizm-select-item-padding, 8px 16px); - background: var(--prizm-select-item-background, var(--prizm-bg-body)); - cursor: pointer; - font-weight: var(--prizm-select-item-font-weight, 400); - font-size: var(--prizm-select-item-font-size, 14px); - color: var(--prizm-select-item-text, var(--prizm-text-contrast, #20222b)); - - .text { - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - - &.selected { - background: var(--prizm-select-item-selected-background, var(--prizm-lite-b130-20)); - color: var(--prizm-text-contrast); - } - - &:not(.selected):hover { - background: var(--prizm-select-item-hover-background, var(--prizm-g2-g11)); - color: var(--prizm-text-contrast); - } +.block { + padding: 8px 0; } input { diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts index 107b500842..839a06bbb4 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts @@ -57,6 +57,7 @@ import { PrizmPreventDefaultModule } from '../../../directives/prevent-default/p import { PrizmCalendarComponent } from '../../calendar'; import { PrizmLinkComponent } from '../../link'; import { PrizmValueAccessorModule } from '../../../directives/value-accessor/value-accessor.module'; +import { PrizmListingItemComponent } from '../../listing-item'; @Component({ selector: `prizm-input-layout-date-time`, @@ -101,6 +102,7 @@ import { PrizmValueAccessorModule } from '../../../directives/value-accessor/val PrizmDropdownHostComponent, PrizmValueAccessorModule, PrizmInputNativeValueModule, + PrizmListingItemComponent, ], }) export class PrizmInputLayoutDateTimeComponent diff --git a/libs/components/src/lib/components/input/input-date/input-layout-date-shared.component.less b/libs/components/src/lib/components/input/input-date/input-layout-date-shared.component.less index 0108c3349a..990cf0cb71 100644 --- a/libs/components/src/lib/components/input/input-date/input-layout-date-shared.component.less +++ b/libs/components/src/lib/components/input/input-date/input-layout-date-shared.component.less @@ -2,13 +2,17 @@ :host { display: block; + + &::placeholder { + color: var(--prizm-v3-text-icon-disable); + } } .multiple-input-box { display: flex; gap: 2px; // TODO: this padding copied from input-text (need remove copied style and use only one file) - padding: 22px 8px 4px 8px; + padding: 22px 8px 4px 0px; input { width: calc(var(--prizm-input-in-zone-max-size) * 0.9ch); @@ -29,21 +33,21 @@ // TODO: this stype copied from input-text (need remove copied style and use only one file) // In outer context :host-context(.prizm-input-form-outer) .multiple-input-box { - padding: 7px 8px; + padding: 7px 0px; } // need for optimization output selector in less :host-context(.prizm-input-form-outer[data-size='l']) .multiple-input-box { - padding: 11px 8px; + padding: 11px 0px; } :host-context(.prizm-input-form-outer[data-size='m']) .multiple-input-box { - padding: 7px 8px; + padding: 7px 0px; } :host-context(.prizm-input-form-outer[data-size='s']) .multiple-input-box { font-size: 12px; - padding: 4px 8px; + padding: 4px 0px; } // In inner context @@ -57,7 +61,7 @@ } .multiple-input-box { - padding: 22px 8px 4px 8px; + padding: 22px 8px 4px 0px; :host::placeholder { opacity: 0; @@ -82,12 +86,12 @@ } .multiple-input-box { - padding: 22px 8px 4px 8px; + padding: 22px 8px 4px 0px; } } :host-context(.prizm-input-form-inner[data-size='m']) { .multiple-input-box { - padding: 16px 8px 2px 8px; + padding: 16px 8px 2px 0px; } :host-context(.prizm-input-empty-label) { diff --git a/libs/components/src/lib/components/input/input-date/input-layout-date.component.less b/libs/components/src/lib/components/input/input-date/input-layout-date.component.less index 6cb015b2db..519860f8ff 100644 --- a/libs/components/src/lib/components/input/input-date/input-layout-date.component.less +++ b/libs/components/src/lib/components/input/input-date/input-layout-date.component.less @@ -22,7 +22,7 @@ display: flex; height: 2.75rem; justify-content: center; - box-shadow: inset 0 1px var(--prizm-base-03); + box-shadow: inset 0 1px var(--prizm-v3-background-stroke); button { flex: 1; diff --git a/libs/components/src/lib/components/input/input-month-range/input-month-range.module.ts b/libs/components/src/lib/components/input/input-month-range/input-month-range.module.ts index 52a0cbc1cb..30ba739e8a 100644 --- a/libs/components/src/lib/components/input/input-month-range/input-month-range.module.ts +++ b/libs/components/src/lib/components/input/input-month-range/input-month-range.module.ts @@ -1,19 +1,19 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { PrizmCalendarMonthModule } from '../../calendar-month'; +import { PrizmCalendarMonthComponent } from '../../calendar-month'; import { PrizmMapperPipeModule } from '../../table/pipes/mapper/mapper.module'; import { PrizmInputMonthRangeComponent } from './input-month-range.component'; import { PrizmInputMonthRangeDirective } from './input-month-range.directive'; import { FormsModule } from '@angular/forms'; -import { PrizmDropdownHostModule } from '../../dropdowns/dropdown-host'; +import { PrizmDropdownHostComponent } from '../../dropdowns/dropdown-host'; import { PrizmPreventDefaultModule } from '../../../directives/prevent-default'; import { PrizmInputTextModule } from '../input-text/input-text.module'; @NgModule({ imports: [ CommonModule, - PrizmCalendarMonthModule, - PrizmDropdownHostModule, + PrizmCalendarMonthComponent, + PrizmDropdownHostComponent, PrizmPreventDefaultModule, PrizmMapperPipeModule, PrizmInputTextModule, diff --git a/libs/components/src/lib/components/input/input-password/input-password-auxiliary-control.component.ts b/libs/components/src/lib/components/input/input-password/input-password-auxiliary-control.component.ts index a1fe1581b8..cae191b003 100644 --- a/libs/components/src/lib/components/input/input-password/input-password-auxiliary-control.component.ts +++ b/libs/components/src/lib/components/input/input-password/input-password-auxiliary-control.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; import { PrizmDestroyService } from '@prizm-ui/helpers'; - import { PrizmInputLayoutComponent } from '../common/input-layout/input-layout.component'; import { PrizmInputPasswordDirective } from './input-password.directive'; diff --git a/libs/components/src/lib/components/input/input-password/input-password.directive.ts b/libs/components/src/lib/components/input/input-password/input-password.directive.ts index 3bd16ac6a3..9161543b56 100644 --- a/libs/components/src/lib/components/input/input-password/input-password.directive.ts +++ b/libs/components/src/lib/components/input/input-password/input-password.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, Host, HostBinding } from '@angular/core'; +import { Directive, ElementRef, Host } from '@angular/core'; import { PrizmInputTextComponent } from '../input-text/input-text.component'; import { PrizmAbstractTestId } from '../../../abstract/interactive'; diff --git a/libs/components/src/lib/components/input/input-text/input-textarea.component.less b/libs/components/src/lib/components/input/input-text/input-textarea.component.less index 3ee1eeab08..83470c10dc 100644 --- a/libs/components/src/lib/components/input/input-text/input-textarea.component.less +++ b/libs/components/src/lib/components/input/input-text/input-textarea.component.less @@ -20,7 +20,7 @@ &:hover { &::-webkit-scrollbar-thumb { border-radius: var(--prizm-scrollbar-thumb-border-radius, 8px); - background-color: var(--prizm-scrollbar-thumb-color, var(--grey-g10-g4, #bfc6d7)); + background-color: var(--prizm-scrollbar-thumb-color, var(--prizm-v3-form-stroke-default)); opacity: var(--prizm-scrollbar-thumb-opacity, 0.4); width: 6px; height: 20%; diff --git a/libs/components/src/lib/components/input/input-time/input-layout-time.component.html b/libs/components/src/lib/components/input/input-time/input-layout-time.component.html index e1c212aac8..00e465ec26 100644 --- a/libs/components/src/lib/components/input/input-time/input-layout-time.component.html +++ b/libs/components/src/lib/components/input/input-time/input-layout-time.component.html @@ -29,16 +29,12 @@ -
- - {{ item }} - -
+ >{{ item }} +
diff --git a/libs/components/src/lib/components/input/input-time/input-layout-time.component.less b/libs/components/src/lib/components/input/input-time/input-layout-time.component.less index 24044e6b75..79620bd4ef 100644 --- a/libs/components/src/lib/components/input/input-time/input-layout-time.component.less +++ b/libs/components/src/lib/components/input/input-time/input-layout-time.component.less @@ -4,30 +4,6 @@ display: block; } -.item { - display: flex; - align-items: center; - padding: var(--prizm-select-item-padding, 8px 16px); - background: var(--prizm-select-item-background, var(--prizm-bg-body)); - cursor: pointer; - font-weight: var(--prizm-select-item-font-weight, 400); - font-size: var(--prizm-select-item-font-size, 14px); - color: var(--prizm-select-item-text, var(--prizm-text-contrast, #20222b)); - - .text { - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - - &.selected { - background: var(--prizm-select-item-selected-background, var(--prizm-lite-b130-20)); - color: var(--prizm-text-contrast); - } - - &:not(.selected):hover { - background: var(--prizm-select-item-hover-background, var(--prizm-g2-g11)); - color: var(--prizm-text-contrast); - } +.block { + padding: 8px 0; } diff --git a/libs/components/src/lib/components/input/input-time/input-layout-time.component.ts b/libs/components/src/lib/components/input/input-time/input-layout-time.component.ts index 63735a7bcd..cb0816f402 100644 --- a/libs/components/src/lib/components/input/input-time/input-layout-time.component.ts +++ b/libs/components/src/lib/components/input/input-time/input-layout-time.component.ts @@ -36,10 +36,11 @@ import { PrizmValueAccessorModule, } from '../../../directives'; import { PrizmMaskModule } from '../../../modules'; -import { PrizmDataListModule } from '../../data-list'; -import { PrizmDropdownHostModule } from '../../dropdowns/dropdown-host'; +import { PrizmDataListComponent } from '../../data-list'; +import { PrizmDropdownHostComponent } from '../../dropdowns/dropdown-host'; import { PrizmInputTextModule } from '../input-text'; -import { PrizmButtonModule } from '../../button'; +import { PrizmButtonComponent } from '../../button'; +import { PrizmListingItemComponent } from '../../listing-item'; @Component({ selector: `prizm-input-layout-time`, @@ -62,13 +63,14 @@ import { PrizmButtonModule } from '../../button'; CommonModule, PrizmLifecycleModule, PrizmMaskModule, - PrizmDataListModule, + PrizmDataListComponent, PrizmDropdownControllerModule, - PrizmDropdownHostModule, + PrizmDropdownHostComponent, PrizmInputTextModule, - PrizmButtonModule, + PrizmButtonComponent, FormsModule, PrizmValueAccessorModule, + PrizmListingItemComponent, ], }) export class PrizmInputLayoutTimeComponent extends PrizmInputNgControl { diff --git a/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html b/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html index 802c52f3ff..d8dac6196b 100644 --- a/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html +++ b/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html @@ -16,7 +16,6 @@
@@ -19,7 +20,6 @@
{{ item.day }} diff --git a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less index c049edfa7b..39c6ea688e 100644 --- a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less +++ b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less @@ -9,10 +9,10 @@ } .z-item { - color: var(--prizm-text-main); + color: var(--prizm-v3-text-icon-secondary); &.z-item_unavailable { - color: var(--prizm-grey-g10-g4); + color: var(--prizm-v3-text-icon-disable); } } @@ -25,23 +25,22 @@ &_weekday { font: var(--prizm-font-text-s); - color: var(--prizm-text-subscript); + color: var(--prizm-v3-text-icon-tertiary); pointer-events: none; text-transform: capitalize; + .z-cell_weekend { + color: var(--prizm-v3-status-alarm-primary-default); + } } } .z-item { display: flex; flex-direction: column; -} - -.z-cell_weekend { - color: var(--prizm-negative); -} -.z-item_unavailable { - opacity: var(--prizm-disabled-opacity); + &_weekend { + color: var(--prizm-calendar-day-weekend-color, var(--prizm-v3-text-icon-secondary)); + } } .z-dots { @@ -69,18 +68,24 @@ background-color: var(--prizm-status-day-color); &[data-prizm-status='index'] { - background-color: var(--prizm-calendar-day-status-default, var(--prizm-index-plan)); + background-color: var(--prizm-calendar-day-status-default, var(--prizm-v3-status-info-primary-default)); } &[data-prizm-status='warning'] { - background-color: var(--prizm-calendar-day-status-warning, var(--prizm-index-warning)); + background-color: var( + --prizm-calendar-day-status-warning, + var(--prizm-v3-status-warning-primary-default) + ); } &[data-prizm-status='danger'] { - background-color: var(--prizm-calendar-day-status-danger, var(--prizm-index-danger)); + background-color: var(--prizm-calendar-day-status-danger, var(--prizm-v3-status-alarm-primary-default)); } &[data-prizm-status='success'] { - background-color: var(--prizm-calendar-day-status-success, var(--prizm-index-good)); + background-color: var( + --prizm-calendar-day-status-success, + var(--prizm-v3-status-success-primary-default) + ); } } diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less index 7feb9024fa..161c50d2aa 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less @@ -24,7 +24,4 @@ .z-cell { flex-grow: 1; width: 100%; - &[data-state='pressed'] .z-item { - background-color: var(--prizm-index-plan); - } } diff --git a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.less b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.less index 0b16423f0b..72ec3fc53b 100644 --- a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.less +++ b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.less @@ -15,17 +15,15 @@ } .z-arrow { - margin: 0 @space; - &_hidden { visibility: hidden; } } -.z-content { +.z-content:not(:empty) { padding: 0 2 * @space; :host._focus-visible & { - box-shadow: 0 0 0 1px var(--prizm-focus); + box-shadow: 0 0 0 1px var(--prizm-v3-background-stroke-focus); } } diff --git a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.ts b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.ts index fb84f5c66f..38f56833ea 100644 --- a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.ts +++ b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.component.ts @@ -3,7 +3,6 @@ import { Component, ElementRef, EventEmitter, - HostBinding, Inject, Input, Output, diff --git a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html index bba54674a7..eb4e7e54e8 100644 --- a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html +++ b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html @@ -13,7 +13,7 @@ class="z-arrow" prizmIconButton type="button" - size="xs" + size="l" [appearanceType]="mode" automation-id="prizm-primitive-spin-button__left" icon="arrows-chevron-left" @@ -30,7 +30,7 @@ class="z-arrow" prizmIconButton type="button" - size="xs" + size="l" appearance="secondary" automation-id="prizm-primitive-spin-button__right" icon="arrows-chevron-right" diff --git a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html index baec304d6b..5c84a18cb7 100644 --- a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html +++ b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html @@ -10,7 +10,7 @@
- - -
- - -
diff --git a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.less b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.less index e77789ca54..e91147e914 100644 --- a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.less +++ b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.less @@ -1,40 +1,25 @@ +@import '../../../../styles/ui-local.less'; + :host { display: block; -} -.box { - display: flex; - justify-content: space-between; -} - -.year-month { - color: var(--prizm-text-contrast); - display: flex; - gap: 8px; -} - -.year-box, -.month-box { - display: flex; - justify-content: space-between; - color: var(--prizm-text-contrast); - gap: 4px; - cursor: pointer; - - prizm-icon { - color: var(--prizm-border-icon); + .box { + display: flex; + align-items: center; + justify-content: space-between; } - &:hover, - &:hover prizm-icon { - color: var(--prizm-index-plan); + .year-month { + display: flex; + align-items: center; + color: var(--prizm-v3-text-icon-secondary); } -} -[prizmLink] { - --prizm-link: var(--prizm-text-contrast); + .pagination-btn { + .pagination-btn(); + } - &.active { - --prizm-link: var(--prizm-index-plan); + .hidden { + visibility: hidden; } } diff --git a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.module.ts b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.module.ts index e6c9eaf694..ef339d7aba 100644 --- a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.module.ts +++ b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.module.ts @@ -1,11 +1,5 @@ -import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { PrizmMonthPipeModule } from '../../../pipes/month'; import { PrizmPrimitiveYearMonthPaginationComponent } from './primitive-year-month-pagination.component'; -import { PrizmPrimitiveSpinButtonModule } from '../primitive-spin-button'; -import { PrizmLinkModule } from '../../link/link.module'; -import { PrizmFocusableModule } from '../../../directives/focusable/focusable.module'; -import { PrizmIconModule } from '../../icon/icon.module'; /** * @deprecated diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less index 88495fdbc4..ffcd8262c3 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less @@ -19,9 +19,3 @@ margin-bottom: 0; } } - -.z-cell { - &[data-state='pressed'] .z-item { - background-color: var(--prizm-index-plan); - } -} diff --git a/libs/components/src/lib/components/listing-item/listing-item.component.less b/libs/components/src/lib/components/listing-item/listing-item.component.less index 16ce49582b..2af7514d1b 100644 --- a/libs/components/src/lib/components/listing-item/listing-item.component.less +++ b/libs/components/src/lib/components/listing-item/listing-item.component.less @@ -17,11 +17,16 @@ font-size: 14px; font-weight: 400; line-height: 16px; - color: var(--prizm-v3-text-icon-primary); + color: var(--prizm-v3-text-icon-secondary); } &:not(.item-container__selected):not(.item-container__disabled):hover { background-color: var(--prizm-listing-item-row-hover, var(--prizm-v3-table-fill-row-hover)); + color: var(--prizm-v3-text-icon-primary); + + .title { + color: var(--prizm-v3-text-icon-primary); + } } &.item-container__selected:not(.item-container__disabled):has(.container-left:not(:empty)):hover { diff --git a/libs/components/src/lib/components/table/components/searchable-content/searchable-content.component.ts b/libs/components/src/lib/components/table/components/searchable-content/searchable-content.component.ts index 6398aad743..b1a88930bf 100644 --- a/libs/components/src/lib/components/table/components/searchable-content/searchable-content.component.ts +++ b/libs/components/src/lib/components/table/components/searchable-content/searchable-content.component.ts @@ -1,5 +1,9 @@ import { Component, ChangeDetectionStrategy, Input, HostBinding } from '@angular/core'; +/** + * @deprecated since 3.8.0 + */ + @Component({ selector: 'prizm-searchable-content', templateUrl: './searchable-content.component.html', diff --git a/libs/components/src/lib/components/table/tbody/tbody.component.less b/libs/components/src/lib/components/table/tbody/tbody.component.less index 085a7c1d64..eb79e31bf5 100644 --- a/libs/components/src/lib/components/table/tbody/tbody.component.less +++ b/libs/components/src/lib/components/table/tbody/tbody.component.less @@ -6,13 +6,13 @@ :host { font-size: 14px; line-height: 16px; - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-secondary); font-weight: 400; .heading { padding: 0; - border: 1px solid var(--prizm-border-widget); + border: 1px solid var(--prizm-v3-table-stroke-cell-default); border-top: none; &__container { @@ -34,7 +34,7 @@ align-items: center; justify-content: center; - color: var(--prizm-border-icon); + color: var(--prizm-v3-button-secondary-solid-default); cursor: pointer; @@ -58,7 +58,7 @@ .empty-row { td { - border: 1px solid var(--prizm-border-widget); + border: 1px solid var(--prizm-v3-table-stroke-cell-default); border-top: transparent; } } diff --git a/libs/components/src/lib/components/table/td/td.component.less b/libs/components/src/lib/components/table/td/td.component.less index 327213caaa..b72da0c19e 100644 --- a/libs/components/src/lib/components/table/td/td.component.less +++ b/libs/components/src/lib/components/table/td/td.component.less @@ -6,7 +6,7 @@ :host { padding: 0 8px; background: inherit; - border: 1px solid var(--prizm-border-widget); + border: 1px solid var(--prizm-v3-table-stroke-cell-default); border-top: none; z-index: 10; @@ -31,32 +31,59 @@ background: inherit; color: inherit; + &:has([prizmInput]) { + padding: 0; + } + + &:has([prizmInput]:focus) { + background-color: var(--prizm-v3-background-fill-primary); + box-shadow: 0 0 0 1px var(--prizm-v3-table-stroke-cell-active) inset; + } + &[status='success'] { - background: var(--prizm-v2-table-background-success); - color: var(--prizm-v2-table-text-success); + background: var(--prizm-v3-status-success-secondary-default); + + &:has([prizmInput]):hover, + &:has([prizmInput]:focus) { + box-shadow: 0 0 0 1px var(--prizm-v3-status-success-primary-default) inset; + } } + &[status='default'] { background: inherit; - color: var(--prizm-v2-table-text-default); + + &:has([prizmInput]:not(:focus)):hover { + box-shadow: 0 0 0 1px var(--prizm-v3-table-stroke-cell-hover) inset; + } } &[status='warning'] { - background: var(--prizm-v2-table-background-warning); - color: var(--prizm-v2-table-text-warning); + background: var(--prizm-v3-status-warning-secondary-default); + + &:has([prizmInput]):hover, + &:has([prizmInput]:focus) { + box-shadow: 0 0 0 1px var(--prizm-v3-status-warning-primary-default) inset; + } } &[status='danger'] { - background: var(--prizm-v2-table-background-danger); - color: var(--prizm-v2-table-text-danger); + background: var(--prizm-v3-status-alarm-secondary-default); + + &:has([prizmInput]):hover, + &:has([prizmInput]:focus) { + box-shadow: 0 0 0 1px var(--prizm-v3-status-alarm-primary-default) inset; + } } } :host-context([active='true']) { &:first-child:before { - background: var(--prizm-index-plan); + background: var(--prizm-table-active-row-marker-color, var(--prizm-v3-status-info-primary-default)); + } + + &[status='default'] { + background: var(--prizm-v3-table-fill-row-active); } - color: var(--prizm-v2-table-text-selected); - background: var(--prizm-v2-table-background-selected); } :host-context([border-style='vertical']) { @@ -64,8 +91,13 @@ } :host-context([border-style='horizontal']) { - border-right: none; - border-left: none; + &:not(:first-child) { + border-left: none; + } + + &:not(:last-child) { + border-right: none; + } } :host-context([data-size='s']) { diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 401105bdcf..c031a9544f 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -5,13 +5,13 @@ :host { padding: 0 8px; - border: 1px solid var(--prizm-border-widget); - background: var(--prizm-grey-g12-g2); + border: 1px solid var(--prizm-v3-table-stroke-cell-default); + background: var(--prizm-v3-table-fill-header-default); font-size: 12px; line-height: 16px; font-weight: 600; - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-tertiary); text-align: left; position: sticky; @@ -26,6 +26,15 @@ border-left: none; } + &:has([prizmInput]:hover) { + box-shadow: 0 0 0 1px var(--prizm-v3-table-stroke-cell-hover) inset; + } + + &:has([prizmInput]:focus) { + background-color: var(--prizm-v3-background-fill-primary); + box-shadow: 0 0 0 1px var(--prizm-v3-table-stroke-cell-active) inset; + } + .resize-bar { height: 100%; width: 4px; @@ -55,7 +64,7 @@ font-size: 12px; line-height: 16px; font-weight: 600; - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-tertiary); border: none; outline: none; @@ -65,13 +74,13 @@ margin-left: 4px; display: flex; gap: 2px; - color: var(--prizm-border-icon); + color: var(--prizm-v3-button-secondary-solid-default); cursor: pointer; align-items: center; justify-content: center; &_active { - color: var(--prizm-index-plan); + color: var(--prizm-v3-button-primary-solid-active); } } } @@ -106,12 +115,3 @@ :host-context(table[data-size='l'] thead tr:nth-child(2)) { top: @height-l; } - -:host-context([border-style='vertical']) { - border-bottom: none; -} - -:host-context([border-style='horizontal']) { - border-right: none; - border-left: none; -} diff --git a/libs/components/src/lib/components/table/tr/tr.component.less b/libs/components/src/lib/components/table/tr/tr.component.less index 37a5c0f52a..0b3ac03ef7 100644 --- a/libs/components/src/lib/components/table/tr/tr.component.less +++ b/libs/components/src/lib/components/table/tr/tr.component.less @@ -1,42 +1,39 @@ [prizmTbody] tr[prizmTr] { cursor: var(--prizm-table-row-cursor, pointer); - color: var(--prizm-v2-table-text-default); + color: var(--prizm-v3-text-icon-secondary); - background: var(--prizm-table-row-background, var(--prizm-v2-table-background-default)); + background: var(--prizm-table-row-background, var(--prizm-v3-background-fill-primary)); - &:nth-child(odd) { - background: var(--prizm-table-row-odd-background, var(--prizm-v2-table-zebra)); + &:nth-child(even) { + background: var(--prizm-table-row-odd-background, var(--prizm-v3-table-fill-row-zebra_default)); } &:hover { - background: var(--prizm-table-row-hover-background, var(--prizm-v2-table-background-default-hover)); + background: var(--prizm-table-row-hover-background, var(--prizm-v3-table-fill-row-hover)); } &[status='success'] { - background: var(--prizm-v2-table-background-success); - color: var(--prizm-v2-table-text-success); + background: var(--prizm-v3-status-success-secondary-default); &:hover { - background: var(--prizm-v2-table-background-success-hover); + background: var(--prizm-v3-status-success-secondary-hover); } } &[status='warning'] { - background: var(--prizm-v2-table-background-warning); - color: var(--prizm-v2-table-text-warning); + background: var(--prizm-v3-status-warning-secondary-default); &:hover { - background: var(--prizm-v2-table-background-warning-hover); + background: var(--prizm-v3-status-warning-secondary-hover); } } &[status='danger'] { - background: var(--prizm-v2-table-background-danger); - color: var(--prizm-v2-table-text-danger); + background: var(--prizm-v3-status-alarm-secondary-default); &:hover { - background: var(--prizm-v2-table-background-danger-hover); + background: var(--prizm-v3-status-alarm-secondary-hover); } } } diff --git a/libs/components/src/styles/mixins/mixins.less b/libs/components/src/styles/mixins/mixins.less index 9991911a5a..94ec307954 100644 --- a/libs/components/src/styles/mixins/mixins.less +++ b/libs/components/src/styles/mixins/mixins.less @@ -121,3 +121,30 @@ left: 50%; transform: translate(-50%, -50%); } + +.pagination-btn() { + border: none; + background: none; + outline: none; + display: flex; + gap: 4px; + padding: 8px; + text-align: left; + cursor: pointer; + + font-family: Inter; + font-size: 14px; + font-weight: 400; + + color: var(--prizm-v3-text-icon-secondary); + + &:hover:not(.active):not(:active) { + background-color: var(--prizm-v3-button-ghost-hover); + border-radius: 2px; + } + + &:active, + &.active { + color: var(--prizm-v3-button-primary-solid-active); + } +} diff --git a/libs/components/src/styles/mixins/picker.less b/libs/components/src/styles/mixins/picker.less index b9754122b7..bc4a6e220a 100644 --- a/libs/components/src/styles/mixins/picker.less +++ b/libs/components/src/styles/mixins/picker.less @@ -16,7 +16,8 @@ flex: 1; line-height: 2rem; border-radius: 2px; - color: var(--prizm-text-contrast); + color: var(--prizm-v3-text-icon-secondary); + font-weight: 600; &:before, &:after { @@ -47,9 +48,21 @@ &_today { border-radius: 2px; + &[data-state='hovered'] { + & > .z-item { + border-color: var(--prizm-v3-button-primary-solid-hover); + color: var(--prizm-v3-button-primary-solid-hover); + background-color: var(--prizm-v3-button-ghost-hover); + } + } + .z-item { - border: 1px solid var(--prizm-index-plan); - color: var(--prizm-exeptions-g1-b1); + border: 1px solid var(--prizm-v3-button-primary-solid-default); + color: var(--prizm-v3-button-primary-solid-default); + + &_unavailable { + color: var(--prizm-v3-text-icon-disable); + } } } @@ -66,10 +79,10 @@ &_interval { &:before { - background: var(--prizm-lite-b130-20); + background: var(--prizm-v3-button-primary-ghost-active); :host._single & { - background-color: var(--prizm-lite-b130-20); + background-color: var(--prizm-v3-button-primary-ghost-active); } } @@ -93,39 +106,34 @@ & > .z-item { border-radius: 0; - color: var(--prizm-index-plan); + color: var(--prizm-v3-button-primary-solid-default); } } &[data-range] { - &:after { - background-color: var(--prizm-primary-text); - } - &:not([data-state='hovered']) > .z-item { - color: var(--prizm-grey-g13-g1); + color: var(--prizm-v3-text-icon-exception); &:before, &:after { - background-color: var(--prizm-index-plan); + background-color: var(--prizm-v3-button-primary-solid-default); } } &[data-state='hovered'] > .z-item { - background-color: var(--prizm-g2-g11); - color: var(--prizm-index-plan); + background-color: var(--prizm-v3-button-ghost-hover); + color: var(--prizm-v3-button-primary-solid-hover); } &[data-state='hovered'] > .z-item:before, &[data-state='hovered'] > .z-item:after { - background-color: var(--prizm-grey-g12-g2); - color: var(--prizm-index-plan); + background-color: var(--prizm-v3-button-ghost-hover); + color: var(--prizm-v3-button-primary-solid-hover); } &[data-state='pressed'] > .z-item:before, &[data-state='pressed'] > .z-item:after { - //background-color: var(--prizm-primary-active); - background-color: var(--prizm-index-plan); + background-color: var(--prizm-v3-button-primary-solid-default); } } @@ -160,19 +168,20 @@ cursor: not-allowed; & > .z-item { - opacity: 0.36; + text-decoration: line-through; + opacity: 0.3; } } - &[data-state='hovered']:not([data-range]) > .z-item { - background-color: var(--prizm-g2-g11); - color: var(--prizm-exeptions-g1-b1); + &[data-state='hovered']:not([data-range]):not(.z-cell_today) > .z-item { + background-color: var(--prizm-v3-button-ghost-hover); + color: var(--prizm-v3-button-primary-solid-hover); } &[data-state='pressed']:hover:not([data-range]) > .z-item { - background-color: var(--prizm-index-plan); + background-color: var(--prizm-v3-button-primary-solid-default); border-radius: 2px; - color: var(--prizm-grey-g13-g1); + color: var(--prizm-v3-text-icon-exception); } } } diff --git a/libs/theme/src/styles/theme/v3/dark.less b/libs/theme/src/styles/theme/v3/dark.less index 408bc5dceb..9966514e96 100644 --- a/libs/theme/src/styles/theme/v3/dark.less +++ b/libs/theme/src/styles/theme/v3/dark.less @@ -98,4 +98,14 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-chart-axis-area-hover: #8a91a233; --prizm-v3-chart-axis-area-active: #436cee33; --prizm-v3-chart-fill-blanket: #8a91a233; + + --prizm-v3-shadow-color: rgba(0, 0, 0, 0.5); + --prizm-v3-shadow-big-top: 0px -8px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-big-right: 8px 0px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-big-left: -8px 0px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-big-bottom: 0px 8px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-top: 0px -2px 4px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-right: 2px 0px 4px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-left: -2px 0px 4px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-bottom: 0px 2px 4px 0px var(--prizm-v3-shadow-color); } diff --git a/libs/theme/src/styles/theme/v3/default.less b/libs/theme/src/styles/theme/v3/default.less index 6eab5a1aaf..ff2a92a6ee 100644 --- a/libs/theme/src/styles/theme/v3/default.less +++ b/libs/theme/src/styles/theme/v3/default.less @@ -11,6 +11,7 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-text-icon-link-visited: var(--prizm-v3-palette-blue-400); --prizm-v3-text-icon-revers: var(--prizm-v3-palette-0); --prizm-v3-text-icon-exception: var(--prizm-v3-palette-0); + --prizm-v3-background-fill-primary: var(--prizm-v3-palette-0); --prizm-v3-background-fill-secondary: var(--prizm-v3-palette-gray-100); --prizm-v3-background-fill-panel: var(--prizm-v3-palette-0); @@ -19,6 +20,7 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-background-fill-revers: var(--prizm-v3-palette-gray-1100); --prizm-v3-background-stroke: var(--prizm-v3-palette-gray-200); --prizm-v3-background-stroke-focus: var(--prizm-v3-palette-blue-400); + --prizm-v3-table-fill-header-default: var(--prizm-v3-palette-gray-100); --prizm-v3-table-fill-header-hover: var(--prizm-v3-palette-gray-h150); --prizm-v3-table-fill-row-zebra_default: var(--prizm-v3-palette-gray-100); @@ -28,6 +30,7 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-table-stroke-cell-default: var(--prizm-v3-palette-gray-200); --prizm-v3-table-stroke-cell-hover: var(--prizm-v3-palette-gray-h450); --prizm-v3-table-stroke-cell-active: var(--prizm-v3-palette-blue-600); + --prizm-v3-status-info-primary-default: var(--prizm-v3-palette-blue-600); --prizm-v3-status-info-primary-hover: var(--prizm-v3-palette-blue-h650); --prizm-v3-status-info-secondary-default: var(--prizm-v3-palette-blue-200); @@ -52,9 +55,11 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-status-alarm-primary-hover: var(--prizm-v3-palette-red-h650); --prizm-v3-status-alarm-secondary-default: var(--prizm-v3-palette-red-200); --prizm-v3-status-alarm-secondary-hover: var(--prizm-v3-palette-red-h250); + --prizm-v3-index-plan: #0033ff; --prizm-v3-index-fact: #20222b; --prizm-v3-index-prognosis: var(--prizm-v3-palette-gray-600); + --prizm-v3-button-primary-solid-default: var(--prizm-v3-palette-blue-600); --prizm-v3-button-primary-solid-hover: var(--prizm-v3-palette-blue-h650); --prizm-v3-button-primary-solid-active: var(--prizm-v3-palette-blue-700); @@ -77,6 +82,7 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-button-alarm-ghost-active: var(--prizm-v3-palette-red-200); --prizm-v3-button-ghost-hover: var(--prizm-v3-palette-gray-h150); --prizm-v3-button-disable: var(--prizm-v3-palette-gray-100); + --prizm-v3-form-fill-default: var(--prizm-v3-palette-gray-100); --prizm-v3-form-fill-disable: var(--prizm-v3-palette-gray-100); --prizm-v3-form-stroke-default: var(--prizm-v3-palette-gray-300); @@ -85,6 +91,7 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-form-active: var(--prizm-v3-palette-blue-600); --prizm-v3-form-active-hover: var(--prizm-v3-palette-blue-h650); --prizm-v3-form-active-disable: var(--prizm-v3-palette-blue-400); + --prizm-v3-chart-axis-default: var(--prizm-v3-palette-gray-300); --prizm-v3-chart-axis-line-hover: var(--prizm-v3-palette-1200); --prizm-v3-chart-axis-line-active: var(--prizm-v3-palette-blue-600); @@ -92,4 +99,14 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-chart-axis-area-active: #436cee33; --prizm-v3-token: #ffffff; --prizm-v3-chart-fill-blanket: #8a91a233; + + --prizm-v3-shadow-color: rgba(191, 198, 215, 0.5); + --prizm-v3-shadow-big-top: 0px -8px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-big-right: 8px 0px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-big-left: -8px 0px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-big-bottom: 0px 8px 32px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-top: 0px -2px 4px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-right: 2px 0px 4px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-left: -2px 0px 4px 0px var(--prizm-v3-shadow-color); + --prizm-v3-shadow-mini-bottom: 0px 2px 4px 0px var(--prizm-v3-shadow-color); }