Skip to content

Commit

Permalink
Merge pull request #471 from IPVS-AS/Improvement-logo
Browse files Browse the repository at this point in the history
Logo in Home Page
  • Loading branch information
ana-silva authored Sep 24, 2020
2 parents 293c4fc + b84dc3e commit c492a22
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 9 deletions.
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,14 @@ target/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/bin/
.classpath
.project
.settings/.jsdtscope
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.m2e.core.prefs
.settings/org.eclipse.wst.jsdt.ui.superType.container
.settings/org.eclipse.wst.validation.prefs
.settings/org.eclipse.wst.common.component
.settings/org.eclipse.wst.common.project.facet.core.xml
.settings/org.eclipse.wst.jsdt.ui.superType.name
28 changes: 22 additions & 6 deletions src/main/resources/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7556,16 +7556,31 @@ fieldset[disabled] .form-control {
cursor: default;
display: block;
position: relative;
top: 25px; }
top: 10px;}
.sidebar .user-info .info-container .name {
white-space: nowrap;
-ms-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
overflow: hidden;
font-size: 14px;
max-width: 200px;
color: #fff; }
max-width: 100px;
color: #fff;
position: absolute;
right: 10px;
top: 50px;}
.sidebar .user-info .info-container .username {
white-space: nowrap;
-ms-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
overflow: hidden;
font-size: 14px;
max-width: 100px;
color: #fff;
position: absolute;
right: 10px;
top: 70px;}
.sidebar .user-info .info-container .email {
white-space: nowrap;
-ms-text-overflow: ellipsis;
Expand All @@ -7577,14 +7592,15 @@ fieldset[disabled] .form-control {
color: #fff; }
.sidebar .user-info .info-container .user-helper-dropdown {
position: absolute;
right: -3px;
bottom: -12px;
right: 5px;
top: 82px;
-webkit-box-shadow: none;
-moz-box-shadow: none;
-ms-box-shadow: none;
box-shadow: none;
cursor: pointer;
color: #fff; }
color: #fff;
}
.sidebar .menu {
position: relative;
overflow-y: auto;
Expand Down
Binary file modified src/main/resources/static/images/user-img-background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/views/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@
<aside id="leftsidebar" class="sidebar" ng-show="loggedIn">
<!-- User Info -->
<div class="user-info">
<div class="image">
<div class="image" style="float: right">
<img src="images/user.png" width="48" height="48" alt="User"/>
</div>
<div class="info-container">
<div class="info-container" >
<div class="name" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{username}}
</div>
<div class="name" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="font-size: 10px">
<div class="username" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="font-size: 10px">
{{userData.firstName + " " + userData.lastName}}
</div>
<div class="btn-group user-helper-dropdown" uib-dropdown="uib-dropdown"
Expand Down

0 comments on commit c492a22

Please sign in to comment.