Skip to content

Commit f594499

Browse files
committed
prevent some tooltips from being selected
adjust height of table box
1 parent 8008375 commit f594499

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"lint:fix": "ng lint --fix",
1212
"pretty-quick": "pretty-quick --pattern \"src/**/*.{scss,html}\"",
1313
"e2e": "ng e2e",
14-
"playground": "angular-playground"
14+
"playground": "angular-playground",
15+
"cypress": "npx cypress open"
1516
},
1617
"private": true,
1718
"dependencies": {

src/app/modules/feasibility-query/components/search/search.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
}
8383

8484
.content-height-100 {
85-
max-height: 500px;
85+
height: 80%;
8686
overflow: scroll;
8787
/*min-height: 500px;*/
8888
overflow-x: hidden;

src/app/shared/components/table/table.component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*ngIf="row.hasCheckbox && row.checkboxColumnIndex === j"
2525
color="primary"
2626
matTooltip="{{ 'SHARED_COMPONENTS.TABLE.SELECT_CHECKBOX' | translate }}"
27+
matTooltipClass="prevent-selection"
2728
disableRipple="true"
2829
[disabled]="!row.isDisabled"
2930
[checked]="row.isCheckboxSelected"
@@ -32,9 +33,11 @@
3233
></mat-checkbox>
3334
<fa-icon
3435
matTooltip="{{ 'SHARED_COMPONENTS.TABLE.ICON' | translate }}"
36+
matTooltipClass="prevent-selection"
3537
*ngIf="row.treeIcon !== '' && row.treeIconColumnIndex === j"
3638
size="1x"
3739
icon="{{ row.treeIcon }}"
40+
class="cursor-click"
3841
></fa-icon>
3942
<div
4043
matTooltip="{{ cell | displayTranslation }}"

src/app/shared/components/table/table.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ table {
6363
}
6464
.cursor-click {
6565
cursor: pointer;
66-
padding-left: 10px;
66+
padding-left: 5px;
6767
}

src/styles/styles.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,6 @@ body {
5656
.height-100 {
5757
height: 100%;
5858
}
59+
.prevent-selection {
60+
pointer-events: none;
61+
}

0 commit comments

Comments
 (0)