diff --git a/projects/components/src/multi-select/multi-select.component.scss b/projects/components/src/multi-select/multi-select.component.scss index 4617dca48..694d3af32 100644 --- a/projects/components/src/multi-select/multi-select.component.scss +++ b/projects/components/src/multi-select/multi-select.component.scss @@ -28,6 +28,19 @@ padding: 0 8px; cursor: pointer; height: 34px; + border-radius: 6px; + + &.extra-small { + height: 30px; + } + + &.small { + height: 32px; + } + + &.large { + height: 44px; + } &.open { background-color: $gray-2; diff --git a/projects/components/src/multi-select/multi-select.component.ts b/projects/components/src/multi-select/multi-select.component.ts index 465f0e707..ef8074b94 100644 --- a/projects/components/src/multi-select/multi-select.component.ts +++ b/projects/components/src/multi-select/multi-select.component.ts @@ -53,7 +53,7 @@ import { MultiSelectJustify } from './multi-select-justify';
@@ -63,7 +63,7 @@ import { MultiSelectJustify } from './multi-select-justify'; +{{ triggerValues.selectedItemsCount - 1 }} - +
diff --git a/projects/components/src/select/select-size.ts b/projects/components/src/select/select-size.ts index 0ed4b4634..8529b276b 100644 --- a/projects/components/src/select/select-size.ts +++ b/projects/components/src/select/select-size.ts @@ -1,4 +1,5 @@ export const enum SelectSize { + ExtraSmall = 'extra-small', Small = 'small', Medium = 'medium', Large = 'large' diff --git a/projects/components/src/time-picker/time-picker.component.scss b/projects/components/src/time-picker/time-picker.component.scss index 349b9ffe2..bd94cacd1 100644 --- a/projects/components/src/time-picker/time-picker.component.scss +++ b/projects/components/src/time-picker/time-picker.component.scss @@ -1,14 +1,23 @@ @import 'mixins'; .time-picker { + @include disableable; display: flex; .time-selector { @include body-1-medium($gray-7); height: 32px; - border: 1px solid $gray-1; - background: $gray-1; border-radius: 4px; + + &.with-background { + border: 1px solid $gray-1; + background: $gray-1; + } + + &.with-border { + border: 1px solid $color-border; + border-radius: 6px; + } } } diff --git a/projects/components/src/time-picker/time-picker.component.ts b/projects/components/src/time-picker/time-picker.component.ts index b46d419ec..9f6ec018e 100644 --- a/projects/components/src/time-picker/time-picker.component.ts +++ b/projects/components/src/time-picker/time-picker.component.ts @@ -9,8 +9,8 @@ import { PredefinedTimeService } from '../time-range/predefined-time.service'; styleUrls: ['./time-picker.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, template: ` -
- +
+
- +
@@ -45,9 +51,18 @@ export class TimePickerComponent { @Input() public time?: Time; + @Input() + public iconSize?: TimePickerIconSize = TimePickerIconSize.Regular; + @Input() public showTimeTriggerIcon?: boolean = false; + @Input() + public displayMode?: TimePickerDisplayMode = TimePickerDisplayMode.MenuWithBackground; + + @Input() + public disabled: boolean = false; + @Output() public readonly timeChange: EventEmitter