ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject ambari git commit: AMBARI-20405. Side Nav: several issues tested on IE 11 .(XIWANG)
Date Sat, 11 Mar 2017 01:11:51 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b69ac43a6 -> 01ef69524


AMBARI-20405. Side Nav: several issues tested on IE 11 .(XIWANG)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01ef6952
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01ef6952
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01ef6952

Branch: refs/heads/trunk
Commit: 01ef69524317f87b4223f9b0c9b26058ae6a73bd
Parents: b69ac43
Author: Xi Wang <xiwang@apache.org>
Authored: Fri Mar 10 16:27:39 2017 -0800
Committer: Xi Wang <xiwang@apache.org>
Committed: Fri Mar 10 16:27:47 2017 -0800

----------------------------------------------------------------------
 ambari-web/app/styles/theme/bootstrap-ambari.css    | 1 +
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/01ef6952/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 3adcbe9..a0b24e5 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -750,6 +750,7 @@ input.radio:checked + label:after {
   width: 190px;
   background-color: #323544;
   padding: 0;
+  -ms-overflow-style: none;
 }
 .navigation-bar-container ul.nav.side-nav-header {
   width: 190px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/01ef6952/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 c193f7f..e75bd6b 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 && !['', '#'].includes(href)) {
+          if (path.indexOf(href) !== -1 && !['', '#'].contains(href)) {
             $link.parent().addClass('active');
           } else {
             $link.parent().removeClass('active');


Mime
View raw message