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.8 to master

Browse Source 
* 4.8:
  CLOUDSTACK-9272: No option in UI to add GSLB with service type "HTTP"
  CLOUDSTACK-9270: UI alignment gone bad in multiple places - VM Instance, Network, Egress rules
This commit is contained in:
Koushik Das 2016-04-21 12:55:04 +05:30
commit 30cfeb49d2
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/css/cloudstack3.css
View File

@ -530,6 +530,7 @@ div.list-view table tbody td span {
display: block; display: block;
float: left; float: left;
max-width: 89%; max-width: 89%;
word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
text-indent: 0; text-indent: 0;
margin-left: 12px; margin-left: 12px;
@ -8293,6 +8294,16 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal
font-weight: bold; font-weight: bold;
} }
.multi-edit-add-list div.form-container {
width: auto !important;
height: auto;
text-align: center;
}
.multi-edit-add-list div.form-container div.name label {
display: inline;
}
.multi-edit .data .data-body { .multi-edit .data .data-body {
margin: auto auto auto 11px; margin: auto auto auto 11px;
overflow: hidden; overflow: hidden;

3
ui/scripts/regions.js
View File

@ -334,6 +334,9 @@
}, { }, {
id: 'udp', id: 'udp',
description: 'udp' description: 'udp'
}, {
id: 'http',
description: 'http'
}]; }];
args.response.success({ args.response.success({
data: array1 data: array1