Skip to content

Commit

Permalink
Material upgrade (#380)
Browse files Browse the repository at this point in the history
* material bump 13

* bumped to material 14

* fixed registry

* Avoid button occlusion by tooltip
  • Loading branch information
therealryan authored May 19, 2023
1 parent fb4eb75 commit c48678b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ public IndexSequence descriptionFilter( String text ) {
public IndexSequence clickTag( String tag ) {
trace( "clickTag", tag );

driver.findElements( By.tagName( "app-tag" ) ).stream()
driver.findElement( By.tagName( "app-flow-nav-list" ) )
.findElements( By.tagName( "app-tag" ) ).stream()
.filter( te -> tag.equals( te.getText() ) )
.findFirst()
.orElseThrow( () -> new AssertionError( "Couldn't find tag " + tag ) )
Expand Down
6 changes: 3 additions & 3 deletions report/report-ng/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"private": true,
"dependencies": {
"@angular/animations": "^14.1.2",
"@angular/cdk": "^12.2.2",
"@angular/cdk": "^14.2.7",
"@angular/common": "^14.1.2",
"@angular/compiler": "^14.1.2",
"@angular/core": "^14.1.2",
"@angular/forms": "^14.1.2",
"@angular/material": "12.2.2",
"@angular/material": "14.2.7",
"@angular/platform-browser": "^14.1.2",
"@angular/platform-browser-dynamic": "^14.1.2",
"@angular/router": "^14.1.2",
Expand Down Expand Up @@ -46,4 +46,4 @@
"karma-jasmine-html-reporter": "~2.0.0",
"typescript": "~4.8.4"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
}

.tag:hover:not(.disabled) {
font-weight: bolder;
text-shadow: 0px 0px 1px black
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section>
<mat-button-toggle-group name="display" [vertical]="true" [(ngModel)]="options.display" ngDefaultControl>
<mat-button-toggle *ngFor="let v of displayEnum | enumIterate" id="{{v}}" value="{{v}}"
matTooltip="{{displayTip(v)}}">
matTooltip="{{displayTip(v)}}" matTooltipPosition="right">
<mat-icon>{{displayIcon(v)}}</mat-icon>
</mat-button-toggle>
</mat-button-toggle-group>
Expand All @@ -10,7 +10,7 @@
<hr />
<mat-button-toggle-group name="data_display" [vertical]="true" [(ngModel)]="options.dataDisplay" ngDefaultControl>
<mat-button-toggle *ngFor="let v of dataDisplayEnum | enumIterate" id="{{v}}" value="{{v}}"
matTooltip=" {{dataTip(v)}}">
matTooltip=" {{dataTip(v)}}" matTooltipPosition="right">
<mat-icon svgIcon="{{dataSvgIcon(v)}}">{{dataIcon(v)}}</mat-icon>
</mat-button-toggle>
</mat-button-toggle-group>
Expand All @@ -19,17 +19,19 @@
<hr />
<mat-button-toggle-group name="diff_type" [vertical]="true" [(ngModel)]="options.diffType" ngDefaultControl>
<mat-button-toggle *ngFor="let v of diffTypeEnum | enumIterate" id="{{v}}" value="{{v}}"
matTooltip=" {{diffTip(v)}}">
matTooltip=" {{diffTip(v)}}" matTooltipPosition="right">
<mat-icon>{{diffIcon(v)}}</mat-icon>
</mat-button-toggle>
</mat-button-toggle-group>
</section>
<section *ngIf="options.display === 'Diff' || options.display === 'Basis'">
<mat-button-toggle-group name="diff_options" [vertical]="true" [(ngModel)]="options.diffFormat" ngDefaultControl>
<mat-button-toggle id="SideBySide" value="SideBySide" matTooltip="Side-by-side comparison">
<mat-button-toggle id="SideBySide" value="SideBySide" matTooltip="Side-by-side comparison"
matTooltipPosition="right">
<mat-icon>vertical_split</mat-icon>
</mat-button-toggle>
<mat-button-toggle id="LineByLine" value="LineByLine" matTooltip="Line-by-line comparison">
<mat-button-toggle id="LineByLine" value="LineByLine" matTooltip="Line-by-line comparison"
matTooltipPosition="right">
<mat-icon>horizontal_split</mat-icon>
</mat-button-toggle>
</mat-button-toggle-group>
Expand Down
22 changes: 11 additions & 11 deletions report/report-ng/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@
dependencies:
tslib "^2.3.0"

"@angular/cdk@^12.2.2":
version "12.2.13"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.2.13.tgz#1fdbe814adfd6b4ff906c6d9c4c6df07b83f09d8"
integrity sha512-zSKRhECyFqhingIeyRInIyTvYErt4gWo+x5DQr0b7YLUbU8DZSwWnG4w76Ke2s4U8T7ry1jpJBHoX/e8YBpGMg==
"@angular/cdk@^14.2.7":
version "14.2.7"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-14.2.7.tgz#65eb6fbbeed6120fad4e3913aa66f8b74c853ac3"
integrity sha512-/tEsYaUbDSnfEmKVvAMramIptmhI67O+9STjOV0i+74XR2NospeK0fkbywIANu1n3w6AHGMotvRWJrjmbCElFg==
dependencies:
tslib "^2.2.0"
tslib "^2.3.0"
optionalDependencies:
parse5 "^5.0.0"

Expand Down Expand Up @@ -209,12 +209,12 @@
dependencies:
tslib "^2.3.0"

"@angular/material@12.2.2":
version "12.2.2"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-12.2.2.tgz#1f560af8b001fceb6e2115de8d287b287feb4c82"
integrity sha512-leBvANI2RzK2QaWkW1ZX1M5lePAEYRYoRwtKLxYiNfUreArHpz44qpOhXwsYD2aJ+ZrdCRZxEPHe2r+2LpN8Uw==
"@angular/material@14.2.7":
version "14.2.7"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-14.2.7.tgz#678c657197268eba6814c757152f8d178ff08866"
integrity sha512-WXHh8pEStpgkXZJmYOg2cI8BSHkV82ET4XTJCNPdveumaCn1UYnaNzsXD13kw5z+zmy8CufhFEzdXTrv/yt7KQ==
dependencies:
tslib "^2.2.0"
tslib "^2.3.0"

"@angular/platform-browser-dynamic@^14.1.2":
version "14.2.7"
Expand Down Expand Up @@ -6992,7 +6992,7 @@ tslib@^1.9.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.5.0:
tslib@^2.1.0, tslib@^2.3.0, tslib@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
Expand Down

0 comments on commit c48678b

Please sign in to comment.