Skip to content

refactor: adding borders to timeline card #338

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

Merged
merged 4 commits into from
Nov 6, 2020
Merged

refactor: adding borders to timeline card #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd26c88
refactor: adding borders to timeline card
anandtiwary Nov 6, 2020
1e6ec1f
refactor: fixing test
anandtiwary Nov 6, 2020
49661ae
refactor: fixing test
anandtiwary Nov 6, 2020
50b7c26
Merge branch 'main' into add-borders-timeline-card
anandtiwary Nov 6, 2020
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
4 changes: 4 additions & 0 deletions .../observability/src/shared/components/timeline-card-list/timeline-card-list.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,22 @@
width: 100%;
box-sizing: border-box;
border-radius: 6px;
border: 1px solid $gray-2;

&.selected-card {
background: $blue-1;
border: 1px solid $blue-2;

&:hover {
background: $blue-2;
border: 1px solid $blue-5;
cursor: pointer;
}
}

&:hover {
background: $gray-1;
border: 1px solid $gray-2;
cursor: pointer;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...servability/src/shared/components/timeline-card-list/timeline-card-list.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ describe('Timeline Card List component', () => {
// Only one card element should be visible. Other two should be gropued and hidden
expect(spectator.queryAll('.card').length).toEqual(1);
expect(spectator.query('.time')).toExist();
expect(spectator.query('.button')).toBe(spectator.query('.with-margin'));
expect(spectator.query('.button')).toHaveClass('button with-margin');

spectator.setHostInput({
showTime: false
});

expect(spectator.query('.time')).not.toExist();
expect(spectator.query('.button')).not.toBe(spectator.query('.with-margin'));
expect(spectator.query('.button')).toHaveClass('button with-margin');
});
});
3 changes: 1 addition & 2 deletions ...ts/observability/src/shared/components/timeline-card-list/timeline-card-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ import { TimelineCardContainerComponent } from './container/timeline-card-contai
role="${ButtonRole.Primary}"
display="${ButtonStyle.Outlined}"
(click)="item.showAll = true"
class="button"
[ngClass]="{ 'with-margin': this.showTime }"
class="button with-margin"
></ht-button>

<ng-template #showSimilarCards>
Expand Down