You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/25 11:31:34 UTC
[incubator-dlab] 12/12: [DLAB-583]: added meta data fixes
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch v2.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fbeb3338b548b040dfce11fb4f4aa8eda02de8e1
Author: Andriana Kovalyshyn <an...@epam.com>
AuthorDate: Fri Apr 26 15:15:32 2019 +0300
[DLAB-583]: added meta data fixes
---
.../src/app/shared/navbar/navbar.component.html | 23 ++++++++++++++++++----
.../src/app/shared/navbar/navbar.component.scss | 13 +++++++++---
2 files changed, 29 insertions(+), 7 deletions(-)
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 d13c23e..914edbc 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
@@ -42,13 +42,28 @@
<a *ngIf="healthStatus.status" [routerLink]="['/environment_management']" class="statusbar">
<span class="material-icons" ngClass="{{healthStatus.status || ''}}">radio_button_checked</span>
</a>
- <a *ngIf="metadata" class="statusbar" #info (click)="actions.toggle($event, info)">
- <span class="material-icons meta">share</span>
+ <!-- *ngIf="metadata" -->
+ <a class="statusbar" #info (click)="actions.toggle($event, info)">
+ <span class="material-icons meta">info</span>
</a>
<bubble-up #actions class="list-menu" position="bottom-right">
<div class="app-info">
- <p><strong>Version: </strong> {{ metadata?.version }}</p>
- <p><strong>Branch: </strong> {{ metadata?.branch }}</p>
+ <p>
+ <strong>Version: </strong>
+ <span class="ellipsis">{{ metadata?.version }}</span>
+ </p>
+ <p>
+ <strong>Branch: </strong>
+ <span class="ellipsis">{{ metadata?.branch }}</span>
+ </p>
+ <p>
+ <strong>Revision: </strong>
+ <span class="ellipsis">{{ metadata?.commmit }}</span>
+ </p>
+ <p>
+ <strong>Release notes: </strong>
+ <span class="ellipsis">{{ metadata?.release_notes }}</span>
+ </p>
</div>
</bubble-up>
<button class="btn btn-logout" (click)="logout_btnClick()">Log out <span class="user-name">{{currentUserName}}</span></button>
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 e79d196..cc52dc6 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
@@ -45,7 +45,7 @@
.statusbar {
display: flex;
- width: 60px;
+ width: 50px;
height: 46px;
text-decoration: none;
justify-content: center;
@@ -70,9 +70,9 @@
}
}
.meta {
- color: #fff;
+ color: #c7d4d6;
&:hover {
- color: #c7d4d6;
+ color: #fff;
}
}
}
@@ -100,6 +100,13 @@
color: #455c74;
font-size: 16px;
font-weight: 600;
+ width: 120px;
+ display: inline-block;
+ }
+ span {
+ width: 180px;
+ display: inline-block;
+ vertical-align: bottom;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org