Updated Branches: refs/heads/master a3b3753da -> 727c5bae9
VPC UI, chart: Tweak for better alignment Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/727c5bae Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/727c5bae Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/727c5bae Branch: refs/heads/master Commit: 727c5bae9ae861160b9deb238e2309d02c9022bf Parents: a3b3753 Author: Brian Federle <[email protected]> Authored: Tue Jun 4 10:45:52 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Jun 4 10:45:52 2013 -0700 ---------------------------------------------------------------------- ui/modules/vpc/vpc.css | 2 +- ui/modules/vpc/vpc.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/727c5bae/ui/modules/vpc/vpc.css ---------------------------------------------------------------------- diff --git a/ui/modules/vpc/vpc.css b/ui/modules/vpc/vpc.css index bdab35f..401c2ba 100644 --- a/ui/modules/vpc/vpc.css +++ b/ui/modules/vpc/vpc.css @@ -30,7 +30,7 @@ color: #6E6B6B; padding: 9px 1px 10px 20px; background: #FFFFFF; - border: 1px dotted #808080; + border: 2px solid #CFCFCF; position: absolute; top: 42px; left: 10px; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/727c5bae/ui/modules/vpc/vpc.js ---------------------------------------------------------------------- diff --git a/ui/modules/vpc/vpc.js b/ui/modules/vpc/vpc.js index 6081c97..5e87dbb 100644 --- a/ui/modules/vpc/vpc.js +++ b/ui/modules/vpc/vpc.js @@ -134,15 +134,16 @@ top: $router.position().top + ($router.outerHeight() / 2 + ($tier.index() * posStartOffsetTop)), left: $router.position().left + $router.outerWidth() }; - var posStartWidth = 60 - (($tier.index() + 1) * posStartOffsetLeft); + var posStartWidth = 60 - ($tier.index() > 2 ? (($tier.index() + 1) * posStartOffsetLeft) : 0); var posEndOffset = 15; + var posEndWidthOffset = 3; var posEnd = { top: $tier.position().top + ($tier.outerHeight() / 2), left: posStart.left + posStartWidth + posEndOffset }; var posEndWidth = Math.abs($tier.position().left - - (posStart.left + posStartWidth)) - posEndOffset; + (posStart.left + posStartWidth)) + posEndWidthOffset; // Start line (next to router) $connectorStart.css({
