Repository: ambari Updated Branches: refs/heads/trunk 9dc4a3dfd -> ece203b29
AMBARI-20444 Services actions menu is not fully displayed under some circumstances. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ece203b2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ece203b2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ece203b2 Branch: refs/heads/trunk Commit: ece203b295bbacd7d069e74201381a5f07280d1e Parents: 9dc4a3d Author: ababiichuk <ababiic...@hortonworks.com> Authored: Tue Mar 14 16:39:45 2017 +0200 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Tue Mar 14 17:22:15 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/styles/theme/bootstrap-ambari.css | 12 ++++++++++-- ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 12 +----------- 2 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ece203b2/ambari-web/app/styles/theme/bootstrap-ambari.css ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css b/ambari-web/app/styles/theme/bootstrap-ambari.css index a0b24e5..98606e9 100644 --- a/ambari-web/app/styles/theme/bootstrap-ambari.css +++ b/ambari-web/app/styles/theme/bootstrap-ambari.css @@ -1148,14 +1148,22 @@ input.radio:checked + label:after { top: 0; } .navigation-bar-fit-height .side-nav-menu { - position: fixed; + position: absolute; top: 55px; bottom: 50px; } .navigation-bar-fit-height .side-nav-footer { - position: fixed; + position: absolute; bottom: 0; } +.navigation-bar-fit-height .more-actions .dropdown-menu { + position: fixed; + top: auto; + left: auto; +} +.navigation-bar-fit-height .navigation-bar-container { + height: 100%; +} .navigation-bar-fit-height .navigation-bar-container:not(.collapsed) .side-nav-menu { overflow-y: auto; } http://git-wip-us.apache.org/repos/asf/ambari/blob/ece203b2/ambari-web/vendor/scripts/theme/bootstrap-ambari.js ---------------------------------------------------------------------- diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js index e75bd6b..1f61104 100644 --- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js +++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js @@ -49,7 +49,7 @@ $navigationContainer.find('li a').each(function (index, link) { var $link = $(link); var href = $link.attr('data-href') || $link.attr('href'); - if (path.indexOf(href) !== -1 && !['', '#'].contains(href)) { + if (path.indexOf(href) !== -1 && ['', '#'].indexOf(href) === -1) { $link.parent().addClass('active'); } else { $link.parent().removeClass('active'); @@ -124,16 +124,6 @@ $moreActions.hover(function () { $(this).css('display', 'inline-block'); }); - $moreActions.on('click', function () { - if (settings.fitHeight) { - // set actions submenu position - var $moreIcon = $(this); - var $header = $('.side-nav-header'); - $moreIcon.children('.dropdown-menu').css('position', 'fixed'); - $moreIcon.children('.dropdown-menu').css('top', $moreIcon.offset().top - $header.offset().top + 20 + 'px'); - $moreIcon.children('.dropdown-menu').css('left', $moreIcon.offset().left); - } - }); $moreActions.children('.dropdown-menu').on('click', function () { // some action was triggered, should hide this icon var moreIcon = $(this).parent();
