You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/19 19:48:26 UTC
[incubator-dlab] branch DLAB-1056 updated (0e30fb4 -> f3aced2)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 0e30fb4 [DLAB-1116]: Alter url endpoint error message
add e469a02 DLAB-1088 fixed bug connected with computational scheduler
add 9052d5e [DLAB-1055] Removed tunnel links from UI
add e3fddc6 Merge pull request #311 from apache/DLAB-1055
add 22f2c6a Fixed spark-cluster creation for GCP.
add eb0f287 Merge pull request #312 from apache/fix_spark
new 032ad0d Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
new a2f4e02 added missed package
new db72322 added missed package
new f3aced2 routing animation added
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/lib/gcp/actions_lib.py | 2 +-
.../general/scripts/aws/deeplearning_configure.py | 14 +++----
.../src/general/scripts/aws/jupyter_configure.py | 10 ++---
.../src/general/scripts/aws/rstudio_configure.py | 10 ++---
.../scripts/aws/tensor-rstudio_configure.py | 14 +++----
.../src/general/scripts/aws/tensor_configure.py | 14 +++----
.../src/general/scripts/aws/zeppelin_configure.py | 14 +++----
.../scripts/azure/deeplearning_configure.py | 14 +++----
.../src/general/scripts/azure/jupyter_configure.py | 10 ++---
.../src/general/scripts/azure/rstudio_configure.py | 10 ++---
.../src/general/scripts/azure/tensor_configure.py | 14 +++----
.../general/scripts/azure/zeppelin_configure.py | 10 ++---
.../general/scripts/gcp/deeplearning_configure.py | 14 +++----
.../src/general/scripts/gcp/jupyter_configure.py | 10 ++---
.../src/general/scripts/gcp/rstudio_configure.py | 10 ++---
.../scripts/gcp/tensor-rstudio_configure.py | 14 +++----
.../src/general/scripts/gcp/tensor_configure.py | 14 +++----
.../src/general/scripts/gcp/zeppelin_configure.py | 10 ++---
.../src/main/resources/webapp/package-lock.json | 5 +++
.../src/main/resources/webapp/package.json | 3 +-
.../project/project-form/project-form.component.ts | 1 -
.../main/resources/webapp/src/app/app.module.ts | 2 +-
.../webapp/src/app/layout/layout.component.ts | 1 +
.../resources-grid/resources-grid.component.scss | 44 +++++++++++++-------
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../src/app/shared/navbar/navbar.component.html | 5 ++-
.../src/app/shared/navbar/navbar.component.scss | 47 ++++++++++++++++++++++
.../src/app/shared/navbar/navbar.component.ts | 42 +++++++++++++++++++
.../webapp/src/dictionary/aws.dictionary.ts | 1 -
.../src/main/resources/webapp/src/polyfills.ts | 31 +++++++-------
.../src/main/resources/webapp/src/styles.scss | 7 +++-
31 files changed, 258 insertions(+), 141 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/04: added missed package
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a2f4e022503a1f76b04b07bd141085cbf25d506e
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Sep 19 22:46:01 2019 +0300
added missed package
---
.../src/main/resources/webapp/package-lock.json | 5 ++++
.../src/main/resources/webapp/package.json | 3 ++-
.../webapp/src/dictionary/aws.dictionary.ts | 1 -
.../src/main/resources/webapp/src/polyfills.ts | 31 +++++++++++-----------
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json b/services/self-service/src/main/resources/webapp/package-lock.json
index 1ec3896..d8afa62 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -5800,6 +5800,11 @@
}
}
},
+ "hammerjs": {
+ "version": "2.0.8",
+ "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+ "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+ },
"handle-thing": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
diff --git a/services/self-service/src/main/resources/webapp/package.json b/services/self-service/src/main/resources/webapp/package.json
index fdf293c..ddab574 100644
--- a/services/self-service/src/main/resources/webapp/package.json
+++ b/services/self-service/src/main/resources/webapp/package.json
@@ -38,7 +38,8 @@
"rxjs-compat": "6.0.0",
"tslib": "^1.10.0",
"web-animations-js": "^2.3.2",
- "zone.js": "0.8.29"
+ "zone.js": "0.8.29",
+ "hammerjs": "^2.0.8"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.13.0",
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
index 0115109..cf27936 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
@@ -85,7 +85,6 @@ export const NAMING_CONVENTION = {
export class ReportingConfigModel {
static getDefault(): ReportingConfigModel {
- debugger;
return new ReportingConfigModel([], [], [], [], [], '', '', '', []);
}
diff --git a/services/self-service/src/main/resources/webapp/src/polyfills.ts b/services/self-service/src/main/resources/webapp/src/polyfills.ts
index 31e380c..5ead21f 100644
--- a/services/self-service/src/main/resources/webapp/src/polyfills.ts
+++ b/services/self-service/src/main/resources/webapp/src/polyfills.ts
@@ -17,21 +17,21 @@
* under the License.
*/
- /**
- * This file includes polyfills needed by Angular and is loaded before the app.
- * You can add your own extra polyfills to this file.
- *
- * This file is divided into 2 sections:
- * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
- * 2. Application imports. Files imported after ZoneJS that should be loaded before your main
- * file.
- *
- * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
- * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
- * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
- *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
- */
+/**
+* This file includes polyfills needed by Angular and is loaded before the app.
+* You can add your own extra polyfills to this file.
+*
+* This file is divided into 2 sections:
+* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
+* file.
+*
+* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+*
+* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+*/
/***************************************************************************************************
* BROWSER POLYFILLS
@@ -84,3 +84,4 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
* Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
*/
// import 'intl'; // Run `npm install --save intl`.
+import 'hammerjs';
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/04: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1056
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 032ad0dc8d17574407222cf126ba5fcf7d1455d2
Merge: 0e30fb4 eb0f287
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Sep 18 14:20:18 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
.../src/general/lib/gcp/actions_lib.py | 2 +-
.../src/general/scripts/aws/deeplearning_configure.py | 14 +++++++-------
.../src/general/scripts/aws/jupyter_configure.py | 10 +++++-----
.../src/general/scripts/aws/rstudio_configure.py | 10 +++++-----
.../src/general/scripts/aws/tensor-rstudio_configure.py | 14 +++++++-------
.../src/general/scripts/aws/tensor_configure.py | 14 +++++++-------
.../src/general/scripts/aws/zeppelin_configure.py | 14 +++++++-------
.../src/general/scripts/azure/deeplearning_configure.py | 14 +++++++-------
.../src/general/scripts/azure/jupyter_configure.py | 10 +++++-----
.../src/general/scripts/azure/rstudio_configure.py | 10 +++++-----
.../src/general/scripts/azure/tensor_configure.py | 14 +++++++-------
.../src/general/scripts/azure/zeppelin_configure.py | 10 +++++-----
.../src/general/scripts/gcp/deeplearning_configure.py | 14 +++++++-------
.../src/general/scripts/gcp/jupyter_configure.py | 10 +++++-----
.../src/general/scripts/gcp/rstudio_configure.py | 10 +++++-----
.../src/general/scripts/gcp/tensor-rstudio_configure.py | 14 +++++++-------
.../src/general/scripts/gcp/tensor_configure.py | 14 +++++++-------
.../src/general/scripts/gcp/zeppelin_configure.py | 10 +++++-----
.../src/app/resources/scheduler/scheduler.component.ts | 2 +-
19 files changed, 105 insertions(+), 105 deletions(-)
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
index 7f17f06,d3b4d06..8120842
--- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
@@@ -256,10 -256,10 +256,10 @@@ export class SchedulerComponent impleme
}
private setScheduleByInactivity() {
- const data = { check_inactivity_required: this.enableIdleTime, max_inactivity: this.schedulerForm.controls.inactivityTime.value };
+ const data = {sync_start_required : this.parentInherit, check_inactivity_required: this.enableIdleTime, max_inactivity: this.schedulerForm.controls.inactivityTime.value };
(this.destination.type === 'СOMPUTATIONAL')
? this.setInactivity(this.notebook.name, data, this.destination.computational_name)
- : this.setInactivity(this.notebook.name, {...data, consider_inactivity: this.considerInactivity});
+ : this.setInactivity(this.notebook.name, { ...data, consider_inactivity: this.considerInactivity });
}
// public close(): void {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/04: routing animation added
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f3aced2142137225001855152fc1c8dad6040d90
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Sep 19 22:47:49 2019 +0300
routing animation added
---
.../project/project-form/project-form.component.ts | 1 -
.../resources-grid/resources-grid.component.scss | 44 +++++++++++++-------
.../src/app/shared/navbar/navbar.component.html | 5 ++-
.../src/app/shared/navbar/navbar.component.scss | 47 ++++++++++++++++++++++
.../src/app/shared/navbar/navbar.component.ts | 42 +++++++++++++++++++
5 files changed, 122 insertions(+), 17 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index 4c213de..5657c8d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -71,7 +71,6 @@ export class ProjectFormComponent implements OnInit {
}));
if (this.item) {
- debugger;
this.editSpecificProject(this.item);
this.stepper.selectedIndex = 1;
}
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 1562e67..6ca968e 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
@@ -36,20 +36,38 @@ table {
.exploratory {
padding: 0;
- tbody {
- width: 100%;
- display: inline-table;
-
- tr:not(:last-child) {
- border-bottom: 1px solid #d9d9d9;
+ .element-row {
+ display: flex;
+ min-height: 48px;
+ height: initial;
+
+ td {
+ padding: 5px;
+
+ &.name-col {
+ padding-right: 5px;
+ padding-left: 24px;
+ }
}
}
+
+ tr:not(:last-child) {
+ border-bottom: 1px solid #d9d9d9;
+ }
+ }
+
+ .element-row {
+ td {
+ border-bottom-width: 0;
+ }
}
.filter-row {
height: 0 !important;
th {
+ padding: 5px;
+
&:last-child {
padding-right: 6px;
}
@@ -58,23 +76,23 @@ table {
.name-col {
width: 18%;
- padding-left: 24px;
padding-right: 5px;
+ padding-left: 24px;
}
.status-col {
width: 14%;
- padding: 5px;
+ // padding: 5px;
}
.shape-col {
width: 14%;
- padding: 5px;
+ // padding: 5px;
}
.tag-col {
width: 10%;
- padding: 5px;
+ // padding: 5px;
mat-chip {
min-height: 20px;
@@ -91,7 +109,7 @@ table {
.resources-col {
width: 28%;
- padding: 5px;
+ // padding: 5px;
}
.cost-col {
@@ -111,10 +129,6 @@ tr.detail-row {
height: 0;
}
-.element-row td {
- border-bottom-width: 0;
-}
-
.element-diagram {
min-width: 80px;
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index ceb18f0..fa054af 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -102,6 +102,9 @@
</mat-nav-list>
</mat-sidenav>
<mat-sidenav-content id="scrolling" [style.margin-left]="isExpanded ? '220px' : '60px'">
- <router-outlet></router-outlet>
+ <div [@fadeAnimation]="getRouterOutletState(routerOutlet)" class="fade-animation">
+
+ <router-outlet #routerOutlet="outlet"></router-outlet>
+ </div>
</mat-sidenav-content>
</mat-sidenav-container>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index 823bf8e..7643a26 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -16,6 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
+// :host {
+// display: block;
+// }
.nav-bar {
min-height: 48px;
@@ -27,19 +30,23 @@
justify-content: space-between;
margin-bottom: 0;
border-radius: 0;
+
.menu-area {
display: flex;
align-items: center;
+
.navbar-logo {
width: 65px;
align-self: center;
margin-left: 10px;
+
img {
display: block;
width: 100%;
}
}
}
+
.control-area {
@extend .menu-area;
@@ -51,35 +58,45 @@
justify-content: center;
color: #f9fafb;
cursor: pointer;
+
span {
align-self: center;
font-size: 18px;
}
+
.ok {
color: #81b44a;
+
&:hover {
color: #618738;
}
}
+
.warning {
color: #f7b500;
+
&:hover {
color: #bd8d0a;
}
}
+
.error {
color: #ef5c4b;
+
&:hover {
color: #bd4146;
}
}
+
.meta {
color: #c7d4d6;
+
&:hover {
color: #fff;
}
}
}
+
.btn-logout {
height: 46px;
padding: 0 28px;
@@ -88,17 +105,21 @@
border: 0;
border-radius: 0;
font-size: 14px;
+
.user-name {
color: #36afd5;
}
+
&:hover .user-name {
color: #3392b0;
}
}
}
}
+
.app-info {
padding: 15px;
+
p {
strong {
color: #455c74;
@@ -107,22 +128,27 @@
width: 120px;
display: inline-block;
}
+
.helper_instruction {
font-size: 14px;
+
i {
vertical-align: bottom;
}
}
+
span {
width: 180px;
display: inline-block;
vertical-align: bottom;
}
}
+
.commit {
cursor: pointer;
}
}
+
a.nav-item {
display: block;
position: relative;
@@ -136,15 +162,18 @@ a.nav-item {
overflow: hidden;
color: #577289 !important;
outline: none;
+
i {
vertical-align: middle;
padding-left: 8px;
}
+
&:not(.has-children):hover i,
&:not(.has-children):hover span {
background: none !important;
color: #36afd5 !important;
}
+
&:not(:last-child)::after {
content: ' ';
position: absolute;
@@ -155,23 +184,29 @@ a.nav-item {
display: block;
background: #edf1f5;
}
+
&.active {
color: #36afd5 !important;
}
+
&.has-children {
height: auto;
}
+
.sub-nav-item {
display: block;
transition: all .45s ease-in-out;
+
i {
vertical-align: middle;
padding-left: 8px;
}
+
&:hover {
background: none !important;
color: #36afd5 !important;
}
+
&.active {
color: #36afd5 !important;
}
@@ -196,6 +231,7 @@ a.nav-item {
cursor: pointer;
border-radius: 0;
transition: all .45s ease-in-out;
+
.line {
width: 22px;
height: 2px;
@@ -206,19 +242,23 @@ a.nav-item {
-webkit-transition: all .35s ease-in-out;
-o-transition: all .35s ease-in-out;
transition: all .35s ease-in-out;
+
&:nth-child(2) {
-webkit-transition-delay: 0.3s;
-o-transition-delay: 0.3s;
transition-delay: 0.3s;
}
}
+
&:hover {
background: #36afd5;
}
+
&:hover .line:nth-child(1),
&:hover .line:nth-child(3) {
width: 18px;
}
+
&:hover .line:nth-child(2) {
-webkit-transition: none;
-o-transition: none;
@@ -244,5 +284,12 @@ a.nav-item {
mat-sidenav-content {
&.mat-drawer-content {
transition: all 0.35s ease-out;
+
+ }
+
+ .fade-animation {
+ display: block;
+ height: 100%;
+ max-height: 100%;
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index af6958d..5321d56 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -21,17 +21,55 @@ import { Component, ViewEncapsulation, OnInit, OnDestroy, ViewChild } from '@ang
import { MatDialog, MatDialogRef } from '@angular/material';
import { Subscription, timer, interval } from 'rxjs';
import { ToastrService } from 'ngx-toastr';
+import { RouterOutlet } from '@angular/router';
import { ApplicationSecurityService, HealthStatusService, AppRoutingService, SchedulerService, StorageService } from '../../core/services';
import { GeneralEnvironmentStatus } from '../../administration/management/management.model';
import { DICTIONARY } from '../../../dictionary/global.dictionary';
import { FileUtils } from '../../core/util';
import { NotificationDialogComponent } from '../modal-dialog/notification-dialog';
+import {
+ trigger,
+ animate,
+ transition,
+ style,
+ query, group,
+ sequence,
+ animateChild,
+ state
+} from '@angular/animations';
@Component({
selector: 'dlab-navbar',
templateUrl: 'navbar.component.html',
styleUrls: ['./navbar.component.scss'],
+ animations: [trigger('fadeAnimation', [
+ transition('* <=> *', [
+ query(':enter,:leave', [
+ style({ overflow: 'hidden' })
+ ], { optional: true }),
+ group([
+ query(':leave', [
+ animate('.3s ease-in-out',
+ style({
+ opacity: 0,
+ })
+ )
+ ], { optional: true }),
+ query(':enter', [
+ style({
+ opacity: 0,
+ }),
+ animate('.3s .25s ease-in-out',
+ style({
+ opacity: 1
+ })
+ )
+ ], { optional: true }),
+ ])
+ ])
+
+ ])],
encapsulation: ViewEncapsulation.None
})
export class NavbarComponent implements OnInit, OnDestroy {
@@ -83,6 +121,10 @@ export class NavbarComponent implements OnInit, OnDestroy {
this.subscriptions.unsubscribe();
}
+ public getRouterOutletState(routerOutlet: RouterOutlet) {
+ return routerOutlet.isActivated ? routerOutlet.activatedRoute : '';
+ }
+
getUserName(): string {
return this.storage.getUserName() || '';
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/04: added missed package
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit db72322d968c177330a8382f06a076e2753d3042
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Sep 19 22:46:36 2019 +0300
added missed package
---
.../self-service/src/main/resources/webapp/src/app/app.module.ts | 2 +-
.../src/main/resources/webapp/src/app/layout/layout.component.ts | 1 +
services/self-service/src/main/resources/webapp/src/styles.scss | 7 ++++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
index 15b4e4d..680ae7c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
@@ -20,9 +20,9 @@
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
-import { BrowserModule } from '@angular/platform-browser';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
+import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ToastrModule } from 'ngx-toastr';
diff --git a/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts b/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts
index 9699698..f3667fa 100644
--- a/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/layout/layout.component.ts
@@ -22,6 +22,7 @@ import { Component, OnInit } from '@angular/core';
@Component({
selector: 'dlab-layout',
templateUrl: './layout.component.html',
+ styles: [`main { height: 100%;}`]
})
export class LayoutComponent implements OnInit {
constructor() { }
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss
index 923e384..a408a09 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -163,7 +163,12 @@ mat-chip.mat-chip strong {
}
.base-retreat {
- margin: 12px 15px;
+ height: 100%;
+ max-height: 100%;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 12px 15px;
+ display: inline-block;
}
.sub-nav {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org