Skip to content

Commit a6a4ef6

Browse files
author
Dmitriy Potychkin
committed
Merge branch 'fix-pagination-ui' of github.com:DmitiryPotychkin/hypertrace-ui into fix-pagination-ui
2 parents 0741e28 + 72e51b1 commit a6a4ef6

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

projects/assets-library/assets/styles/_interaction.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
box-shadow: 0 1px 4px rgba($gray-7, 0.16), 0 3px 4px rgba($gray-7, 0.08), 0 2px 5px rgba($gray-7, 0.16);
2424
}
2525

26-
@mixin dropdown($radius: 4px, $left: 1px, $margin: 1px 0) {
26+
@mixin dropdown($radius: 4px) {
2727
@include dropdown-box-shadow();
2828
width: inherit;
2929
border-radius: $radius;
3030
background: white;
3131
overflow-y: auto;
3232
overflow-x: hidden;
3333
position: relative;
34-
left: $left; // To visually center while accounting for margin
35-
margin: $margin; // Keeps the dropdown from covering the trigger border
34+
left: 1px; // To visually center while accounting for margin
35+
margin: 1px 0; // Keeps the dropdown from covering the trigger border
3636
}
3737

3838
@mixin popover-menu-content {

projects/components/src/select/select.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
}
118118

119119
.select-content {
120-
@include dropdown(4px, 0, 1px 0 4px 0);
120+
@include dropdown();
121121
max-height: 204px;
122122

123123
.select-option {

projects/components/src/select/select.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ import { SelectSize } from './select-size';
7171
</ht-popover-trigger>
7272
<ht-popover-content>
7373
<div class="select-content" [ngStyle]="{ 'minWidth.px': triggerContainer.offsetWidth }">
74-
<div *ngFor="let item of items" (click)="this.onSelectionChange(item)" class="select-option">
74+
<div
75+
*ngFor="let item of items"
76+
(click)="this.onSelectionChange(item)"
77+
class="select-option"
78+
[ngClass]="this.size"
79+
>
7580
<span class="label">{{ item.label }}</span>
7681
<ht-icon
7782
class="status-icon"

0 commit comments

Comments
 (0)