| commit | 845f88843a7ead3f311855903c8ffe42e3065749 | [log] [tgz] |
|---|---|---|
| author | Peter Buschmann <peter.buschmann@pta.de> | Fri Sep 04 11:31:56 2020 +0200 |
| committer | Peter Buschmann <peter.buschmann@pta.de> | Fri Sep 04 11:31:56 2020 +0200 |
| tree | fc8d05c70f7a33add54bc38c91320c19f0fe8199 | |
| parent | 77d9adbc3d86ee7302b9b8674bff350f921fac14 [diff] | |
| parent | 6d781ac1fcdd9d34c5e203ade2e03d8bd6a95126 [diff] |
Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into SI-1869-increase-condensation
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html index e4ff8ab..0284de8 100644 --- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html +++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
@@ -13,9 +13,11 @@ <app-card-layout *ngIf="gridFailureDetailsSandbox.gridFailureDetailsFormState$ | async as formState"> <div header> <div class="header-container"> - <span>{{ 'GridFailure.Title' | translate }}</span> <div class="diverse-btn-container"> <div> + <span>{{ 'GridFailure.Title' | translate }}</span> + </div> + <div> <button *ngIf="!gridFailureDetailsSandbox.currentFormState.isPristine" type="button"
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.scss b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.scss index 5177233..99e3fa0 100644 --- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.scss +++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.scss
@@ -21,13 +21,14 @@ .grid-failure-information-overview { position: relative; - height: 90%; + height: 94%; } .grid-failure-information-condensation { position: relative; height: 30%; margin-bottom: 65px; + min-height: 200px; } .diverse-condensation-btns {
diff --git a/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss b/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss index 2551517..56840ec 100644 --- a/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss +++ b/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss
@@ -11,7 +11,7 @@ * SPDX-License-Identifier: EPL-2.0 ********************************************************************************/ .card { - height: calc(100vh - 180px); + height: calc(100vh - 140px); overflow: auto; border: none; }