apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.7 to master

Browse Source 
* 4.7:
  CLOUDSTACK-9254: Make longer names display pretty
This commit is contained in:
Remi Bergsma 2016-01-24 19:48:47 +01:00
commit ac51a78df5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/css/cloudstack3.css
View File

@ -2489,7 +2489,7 @@ div.detail-group.actions td {
padding: 1px 0 0;
/*+placement:shift -174px -57px;*/
position: relative;
left: -174px;
left: -239px;
top: -57px;
}
@ -2555,7 +2555,7 @@ div.detail-group.actions td {
margin: 0;
position: absolute;
top: -47px;
left: 1090px;
left: 1025px;
cursor: default !important;
display: inline-block;
float: left;
@ -2568,8 +2568,8 @@ div.detail-group.actions td {
padding: 9px 18px 7px 12px;
border-right: none;
/*[empty]border-top:;*/
min-width: 75px;
max-width: 120px;
min-width: 110px;
max-width: 220px;
text-align: center;
height: 12px;
overflow: hidden;
@ -4310,7 +4310,7 @@ textarea {
#user-options {
background: #FFFFFF;
z-index: 10000;
width: 104px;
width: 150px;
position: absolute;
padding: 15px;
top: 30px;

2
ui/scripts/ui/core.js
View File

@ -225,7 +225,7 @@
.append(
$('<div>').addClass('name').text(
args.context && args.context.users ?
cloudStack.concat(userLabel, 14) : 'Invalid User'
cloudStack.concat(userLabel, 21) : 'Invalid User'
)
)
.append(