This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1943 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit bf32acc9247254973924d8272a13b2b7992fb3c5 Author: Dmytro_Gnatyshyn <[email protected]> AuthorDate: Tue Jul 28 17:48:53 2020 +0300 [DLAB-1943]: Added scroll bar on billing and audit --- .../management/management-grid/management-grid.component.scss | 3 +++ .../src/app/reports/audit/audit-grid/audit-grid.component.html | 2 +- .../src/app/reports/audit/audit-grid/audit-grid.component.scss | 2 ++ .../reporting/reporting-grid/reporting-grid.component.html | 3 +++ .../reporting/reporting-grid/reporting-grid.component.scss | 9 ++++++--- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss index 84d5081..9d9f4b5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss @@ -82,6 +82,8 @@ .label-header{ padding-left: 15px; + height: 56px; + .ar{ left: 21px; top: 2px; @@ -94,6 +96,7 @@ padding-left: 10px; .ar{ position: absolute; + top: 10px; } } &.user{ diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html index 28b7607..dc53ead 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html @@ -17,7 +17,7 @@ ~ under the License. --> -<section class="audit-table-wrapper"> +<section class="audit-table-wrapper" id="scrolling"> <table mat-table [dataSource]="auditData" class="data-grid audit mat-elevation-z6"> <ng-container matColumnDef="date"> diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss index 0ec3d4c..b731936 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss @@ -19,6 +19,8 @@ .audit-table-wrapper { width: 100%; + height: calc(100vh - 130px); + overflow: auto; .audit { width: 100%; diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html index 98b46d8..7685604 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html @@ -16,6 +16,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> + +<div class="wrapper"> <section class="table-wrapper" id="scrolling"> <!-- <div class="navigation-btn">--> @@ -277,3 +279,4 @@ <tr [hidden]="reportData?.length" mat-footer-row *matFooterRowDef="['placeholder']"></tr> </table> </section> +</div> diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss index c2d23d1..44029ce 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss @@ -38,10 +38,13 @@ .table-wrapper { width: 100%; - //position: relative; + //position: sticky; //z-index: 101; + //overflow-y: auto; + //transform:rotateX(180deg); + display: block; + height: calc(100vh - 130px); overflow: auto; - transform:rotateX(180deg); } .reporting { @@ -50,7 +53,7 @@ min-width: 1100px; overflow: auto; border-collapse: inherit; - transform:rotateX(180deg); + //transform:rotateX(180deg); .mat-cell { vertical-align: middle; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
