Updated Branches: refs/heads/ui-vpc-redesign 7aaff0cfe -> 93e046a24
Fix CSS styling for multi-line VPC dashboard items Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93e046a2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93e046a2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93e046a2 Branch: refs/heads/ui-vpc-redesign Commit: 93e046a24ca22baf059ec141619dee6d2d6cb1a9 Parents: 7aaff0c Author: Brian Federle <[email protected]> Authored: Fri May 17 10:12:49 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri May 17 10:12:49 2013 -0700 ---------------------------------------------------------------------- ui/modules/vpc/vpc.css | 6 +++++- ui/modules/vpc/vpc.js | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93e046a2/ui/modules/vpc/vpc.css ---------------------------------------------------------------------- diff --git a/ui/modules/vpc/vpc.css b/ui/modules/vpc/vpc.css index 92ee80b..51c3f7e 100644 --- a/ui/modules/vpc/vpc.css +++ b/ui/modules/vpc/vpc.css @@ -140,7 +140,7 @@ } .vpc-network-chart .tier-item .content .dashboard-item .total { - font-size: 17px; + font-size: 30px; /*+placement:shift 7px 5px;*/ position: relative; left: 7px; @@ -154,6 +154,10 @@ text-shadow: 0px 1px 1px #FFFFFF; } +.vpc-network-chart .tier-item .content .dashboard-item .total.multiline { + font-size: 14px; +} + .vpc-network-chart .tier-item .content .dashboard-item .name { font-size: 11px; text-transform: uppercase; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93e046a2/ui/modules/vpc/vpc.js ---------------------------------------------------------------------- diff --git a/ui/modules/vpc/vpc.js b/ui/modules/vpc/vpc.js index a3a571e..f3cdaf0 100644 --- a/ui/modules/vpc/vpc.js +++ b/ui/modules/vpc/vpc.js @@ -162,7 +162,15 @@ var id = dashboardItem.id; $name.find('span').html(dashboardItem.name); - $total.find('span').html(dashboardItem.total); + + + if (dashboardItem.totalMultiLine) { + $total.find('span').html(dashboardItem.totalMultiLine); + $total.addClass('multiline'); + } else { + $total.find('span').html(dashboardItem.total); + } + $dashboardItem.append($total, $name); $dashboardItem.appendTo($dashboard); @@ -230,7 +238,7 @@ { id: 'tierLoadBalancers', name: 'Load balancers', - total: '5 Internal<br/>6 Public' + totalMultiLine: '5 Internal<br/>6 Public' }, { id: 'tierPortForwarders',
