From b8bdec0e19cbf05e3307d84478f60b399058a6de Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <ramesh.p@matriotsolutions.com>
Date: Thu, 16 Sep 2021 21:19:25 +0530
Subject: [PATCH] TMSS-945: Updated user icon position and title. TMSS-1005:
Removed left menu bottom margin.
---
.../frontend/tmss_webapp/src/layout/components/AppTopbar.js | 4 ++--
SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js
index 70f7cca971e..632bb496224 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js
@@ -36,14 +36,14 @@ export class AppTopbar extends Component {
{this.props.isLoggedIn &&
<div className="top-right-bar">
- <span><i className="fa fa-user"></i>{this.state.username}</span>
<a className="p-link layout-menu-button" style= {{marginLeft: '8px', marginRight: '8px'}} title="Documentation"
href="https://support.astron.nl/confluence/display/public/TMSS+User+Documentation">
<i className="pi pi-file-o"></i></a>
<a className="p-link layout-menu-button" title="Helpdesk" href="https://support.astron.nl/sdchelpdesk">
<span><i className="pi pi-question-circle"></i></span></a>
- <button className="p-link layout-menu-button" onClick={this.props.onLogout}>
+ <button className="p-link layout-menu-button" onClick={this.props.onLogout} title="Logout">
<i className="pi pi-power-off"></i></button>
+ <span style= {{marginLeft: '8px'}}><i className="fa fa-user" title={`Logged in as ${this.state.username}`}></i></span>
</div>
}
<FindObject setSearchField={this.props.setSearchField} />
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss
index df584fde615..d9f413ed449 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_menu.scss
@@ -13,6 +13,7 @@
position: relative;
text-decoration: none;
display: block;
+ margin-bottom: 0px;
@include transition(color $transitionDuration);
i {
@@ -105,6 +106,7 @@
> li {
> a {
border-top: 1px solid $menuitemBorderColor;
+ margin-bottom: 0px;
}
&:last-child {
@@ -148,6 +150,7 @@
> li {
> a {
border-top: 1px solid $menuitemDarkBorderColor;
+ margin-bottom: 0px;
}
&:last-child {
--
GitLab