You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/10/20 15:38:19 UTC
ambari git commit: /AMBARI-22277. Ambari 3.0 : Outstanding UI issues
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk edd5ce9b7 -> 6df6cbe93
/AMBARI-22277. Ambari 3.0 : Outstanding UI issues (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6df6cbe9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6df6cbe9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6df6cbe9
Branch: refs/heads/trunk
Commit: 6df6cbe93aadac9f5c3a8b6aef695a6dab46a151
Parents: edd5ce9
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Fri Oct 20 18:38:07 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Fri Oct 20 18:38:07 2017 +0300
----------------------------------------------------------------------
.../app/styles/theme/bootstrap-ambari.css | 2 +-
.../vendor/scripts/theme/bootstrap-ambari.js | 30 +++++---------------
2 files changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6df6cbe9/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 cff73ad..7d1ad61 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1028,7 +1028,7 @@ input.radio:checked + label:after {
}
.navigation-bar-container ul.nav.side-nav-menu .more-actions,
.navigation-bar-container ul.nav.side-nav-footer .more-actions {
- display: none;
+ display: block;
position: absolute;
top: 14px;
right: 33px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/6df6cbe9/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 c097992..5fd713a 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -51,11 +51,11 @@ $(document).ready(function () {
// make scrolling effect on side nav ONLY, i.e. not effected on ambari main contents
$(this).find('.side-nav-menu').on('DOMMouseScroll mousewheel', function (ev) {
var $this = $(this),
- scrollTop = this.scrollTop,
- scrollHeight = this.scrollHeight,
- height = $this.innerHeight(),
- delta = ev.originalEvent.wheelDelta,
- up = delta > 0;
+ scrollTop = this.scrollTop,
+ scrollHeight = this.scrollHeight,
+ height = $this.innerHeight(),
+ delta = ev.originalEvent.wheelDelta,
+ up = delta > 0;
var prevent = function prevent() {
ev.stopPropagation();
ev.preventDefault();
@@ -147,23 +147,6 @@ $(document).ready(function () {
return false;
});
- /**
- * Hovering effects for "more actions icon": "..."
- */
- $(this).find('.mainmenu-li>a').hover(function () {
- var $moreIcon = $(this).siblings('.more-actions');
- if ($moreIcon.length && !$navigationContainer.hasClass('collapsed')) {
- $moreIcon.css('display', 'inline-block');
- }
- }, function () {
- var $moreIcon = $(this).siblings('.more-actions');
- if ($moreIcon.length && !$navigationContainer.hasClass('collapsed')) {
- $moreIcon.hide();
- }
- });
- $moreActions.hover(function () {
- $(this).css('display', 'inline-block');
- });
if (settings.fitHeight) {
$moreActions.on('click', function () {
// set actions submenu position
@@ -222,6 +205,7 @@ $(document).ready(function () {
});
$subMenuItems.unbind('mouseenter mouseleave');
$navigationContainer.find('.toggle-icon').removeClass(settings.menuLeftClass).addClass(settings.menuDownClass);
+ $moreActions.show();
// set sub-menu position
if (settings.fitHeight) {
$(_this).find(subMenuSelector).css({
@@ -264,4 +248,4 @@ $(document).ready(function () {
navBarToggleDataAttr: 'collapse-side-nav',
subMenuNavToggleDataAttr: 'collapse-sub-menu'
};
-})(jQuery);
+})(jQuery);
\ No newline at end of file