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.

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

Fix row highlight (see app github tab commit table) #4257

Merged
merged 3 commits into from
May 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="table-row-wrapper"
[ngClass]="{'table-row-wrapper__blocked': isBlocked$ | async, 'table-row-wrapper__warning': inWarningState$ | async,'table-row-wrapper__errored': inErrorState$ | async,'table-row-wrapper__highlighted': isHighlighted$ | async }">
[ngClass]="{'table-row-wrapper__blocked': isBlocked$ | async, 'table-row-wrapper__warning': inWarningState$ | async,'table-row-wrapper__errored': inErrorState$ | async }">
<div *ngIf="isDeleting$ | async" class="table-row__deletion-bar-wrapper">
<div class="table-row__deletion-bar-inner">
<div class="table-row__deletion-bar-text">Deleting</div>
Expand All @@ -11,7 +11,7 @@
<div class="mat-row table-row__inner">
<mat-expansion-panel class="table-row__inner__expansion" [togglePosition]="'before'" [disabled]="!expandComponent"
(opened)="panelOpened()" (closed)="expandedService.collapse(rowId)" [expanded]="expandedService.expanded[rowId]"
[hideToggle]="true">
[hideToggle]="true" [ngClass]="{'table-row-wrapper__highlighted': isHighlighted$ | async}">
<mat-expansion-panel-header class="table-row__inner__expansion--header"
[ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent}"
[collapsedHeight]="'auto'" [expandedHeight]="'auto'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
display: flex;
}
}
&__highlighted {
&__highlighted.mat-expansion-panel {
border-left-style: solid;
border-left-width: 4px;
.table-row__inner {
border-radius: 0;
mat-expansion-panel-header {
margin-left: -4px; // Cancel out highlighted padding (border left in theme)
}
}
Expand Down