Skip to content

Commit aa4aa5d

Browse files
authored
Merge pull request #490 from sawankshrma/cursor-pointer-for-filter-options-and-reset-button
Continued #447-- UI: Fix incorrect cursor style on Filter options and RESET button
2 parents 03db749 + 1271ce4 commit aa4aa5d

File tree

8 files changed

+58
-23
lines changed

8 files changed

+58
-23
lines changed

src/app/app.component.html

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
<div class="dummy"></div>
1818
</div>
1919
<span class="spacer"></span>
20-
<a
21-
target="_blank"
22-
class="github-fork-ribbon"
23-
href="https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel"
24-
data-ribbon="Fork me on GitHub"
25-
title="Fork me on GitHub">
26-
Fork me on GitHub
27-
</a>
2820
</mat-toolbar>
2921
<mat-sidenav-container class="sidenav-container">
3022
<mat-sidenav mode="side" opened class="sidenav" [style.width]="sidenavWidth">

src/app/app.component.spec.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,4 @@ describe('AppComponent', () => {
5252
it('should create the app', () => {
5353
expect(app).toBeTruthy();
5454
});
55-
56-
it('check for fork me on github ribbon generation', () => {
57-
const compiled = fixture.nativeElement as HTMLElement;
58-
const githubLink = compiled.querySelector('.github-fork-ribbon');
59-
expect(githubLink).not.toBeNull();
60-
expect(githubLink?.textContent?.trim()).toBe('Fork me on GitHub');
61-
});
6255
});

src/app/app.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { ProgressSliderComponent } from './component/progress-slider/progress-sl
3131
import { KpiComponent } from './component/kpi/kpi.component';
3232
import { MatDialogModule, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
3333
import { TeamsGroupsEditorModule } from './component/teams-groups-editor/teams-groups-editor.module';
34+
import { MatTooltipModule } from '@angular/material/tooltip';
3435

3536
@NgModule({
3637
declarations: [
@@ -67,6 +68,7 @@ import { TeamsGroupsEditorModule } from './component/teams-groups-editor/teams-g
6768
FormsModule,
6869
HttpClientModule,
6970
TeamsGroupsEditorModule,
71+
MatTooltipModule,
7072
],
7173
providers: [
7274
LoaderService,

src/app/component/activity-description/activity-description.component.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
list-style: none;
5656
}
5757

58+
::ng-deep #description img {
59+
max-width: 100%;
60+
}
61+
5862
/* Ensure panel titles don't wrap */
5963
mat-panel-title b {
6064
white-space: nowrap;

src/app/pages/circular-heatmap/circular-heatmap.component.css

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,27 @@
88
shape-rendering: crispEdges;
99
}
1010

11-
.title-button {
12-
background-color: transparent;
13-
border: none;
14-
text-align: left;
15-
cursor: pointer;
16-
font-weight: 700;
11+
.title-text {
12+
font-weight: 500;
13+
margin-right: 5px;
14+
}
15+
16+
.info-button {
17+
width: 24px;
18+
height: 24px;
19+
line-height: 24px;
20+
opacity: 0.6;
21+
}
22+
.compact-tooltip {
23+
transform: translateY(-20px) !important;
24+
}
25+
26+
.info-icon {
27+
font-size: 18px;
28+
}
29+
30+
.info-button:hover {
31+
opacity: 1;
1732
}
1833

1934
.right-panel {
@@ -142,6 +157,10 @@ app-progress-slider {
142157
font-style: italic;
143158
}
144159

160+
mat-chip {
161+
cursor: pointer;
162+
}
163+
145164
button.filter-toggle {
146165
position: absolute;
147166
top: 2px;

src/app/pages/circular-heatmap/circular-heatmap.component.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,16 @@ <h2>Nothing to show</h2>
7373
(closed)="onPanelClosed(activity)">
7474
<mat-expansion-panel-header>
7575
<mat-panel-title>
76-
<button class="title-button" (click)="openActivityDetails(activity['uuid'])">
76+
<span class="title-text">
7777
{{ activity['name'] }}
78+
</span>
79+
<button
80+
mat-icon-button
81+
class="info-button"
82+
matTooltip="Open activity description"
83+
matTooltipClass="compact-tooltip"
84+
(click)="openActivityDetails(activity['uuid']); $event.stopPropagation()">
85+
<mat-icon class="info-icon">info</mat-icon>
7886
</button>
7987
</mat-panel-title>
8088
</mat-expansion-panel-header>

src/app/pages/matrix/matrix.component.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,19 @@
9494
padding: 7px 12px;
9595
border-radius: 16px;
9696
font: 500 14px / 20px Roboto, 'Helvetica Neue', sans-serif;
97+
cursor: pointer;
98+
}
99+
100+
.reset-button:hover {
101+
transform: scale(1.02);
102+
}
103+
104+
.reset-button:active {
105+
transform: scale(0.98);
106+
}
107+
108+
.mat-chip {
109+
cursor: pointer;
97110
}
98111

99112
.mat-mdc-row .mat-mdc-cell {

src/styles.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,8 @@ h1, h2, h3 {
5858

5959
.usage-dimensions img {
6060
max-width: 40rem;
61-
}
61+
}
62+
63+
.compact-tooltip {
64+
transform: translateY(-10px) !important;
65+
}

0 commit comments

Comments
 (0)