This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1543 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4f17cfbd3c9572e87c3546a29b17ca635d944757 Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Thu Feb 13 16:54:05 2020 +0200 [DLAB-1543]: Fixed issues on billing page --- .../src/app/reporting/reporting-grid/reporting-grid.component.html | 2 +- .../src/app/reporting/reporting-grid/reporting-grid.component.scss | 4 ++++ .../src/app/resources/resources-grid/resources-grid.component.scss | 4 ++++ .../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html index 6e3de79..0de22de 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html @@ -214,7 +214,7 @@ <tr [hidden]="!collapseFilterRow || !PROVIDER" mat-header-row *matHeaderRowDef="displayedFilterColumns; sticky: true" class="filter-row"></tr> - <tr mat-row *matRowDef="let row; columns: displayedColumns;" class="DATA"></tr> + <tr mat-row *matRowDef="let row; columns: displayedColumns;" class="content-row"></tr> <tr [hidden]="!reportData?.length" mat-footer-row *matFooterRowDef="displayedColumns; sticky: true" class="header-row"></tr> diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss index 9e6a541..3b19ae7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss @@ -36,6 +36,9 @@ th { padding-right: 5px; z-index: 2 !important; + &.th_charges{ + z-index: 3 !important; + } } td { @@ -144,6 +147,7 @@ } .header-row { + position: unset; .label { display: inline-block; padding-top: 15px; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss index 335c4d5..86ec9bf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss @@ -378,3 +378,7 @@ tr.detail-row { padding: 40px; text-align: center; } + +.content-row{ + background-clip: padding-box; +} diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts index 67ac627..be25a2c 100644 --- a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts +++ b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts @@ -43,7 +43,7 @@ export const NAMING_CONVENTION_AZURE = { 'service_filter_key': 'category', 'type': '', 'resourceType': 'resource_type', - 'instance_size': 'size', + 'instance_size': 'shape', 'dlabId': 'dlabId' }, 'service': 'Category', --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
