Repository: ambari Updated Branches: refs/heads/trunk cce9489c2 -> 9c5f097a1
AMBARI-20160.Side Nav: multiple fixes after integrated to trunk.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c5f097a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c5f097a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c5f097a Branch: refs/heads/trunk Commit: 9c5f097a10c19e38fa4920067afb351449c1d5e4 Parents: cce9489 Author: Xi Wang <[email protected]> Authored: Thu Feb 23 16:25:45 2017 -0800 Committer: Xi Wang <[email protected]> Committed: Thu Feb 23 17:29:31 2017 -0800 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 4 ++++ ambari-web/app/styles/theme/bootstrap-ambari.css | 5 +++-- ambari-web/app/styles/top-nav.less | 2 +- ambari-web/app/templates/main/admin.hbs | 17 ++--------------- .../vendor/scripts/theme/bootstrap-ambari.js | 6 +++--- 5 files changed, 13 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index cb94a54..8cb9388 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -350,6 +350,10 @@ footer { background: rgba(233,233,233,0.3); } +.side-nav-menu::-webkit-scrollbar { + display: none; +} + #content { padding: 15px 0; } http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/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 d88a1ed..3adcbe9 100644 --- a/ambari-web/app/styles/theme/bootstrap-ambari.css +++ b/ambari-web/app/styles/theme/bootstrap-ambari.css @@ -1273,8 +1273,8 @@ input.radio:checked + label:after { } #notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .name { font-weight: bold; - font-size: 12px; - color: #666; + font-size: 14px; + color: #333; margin-bottom: 5px; } #notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .description { @@ -1284,6 +1284,7 @@ input.radio:checked + label:after { display: block; display: -webkit-box; -webkit-line-clamp: 3; + max-height: 47px; /* For firefox */ -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/ambari-web/app/styles/top-nav.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/top-nav.less b/ambari-web/app/styles/top-nav.less index 8c373ce..4ad6c21 100644 --- a/ambari-web/app/styles/top-nav.less +++ b/ambari-web/app/styles/top-nav.less @@ -64,7 +64,7 @@ .numberCircle { border-radius: 50%; - width: 20px; + min-width: 20px; height: 20px; padding: 0px 0px; color: @top-nav-ops-count-color; http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/ambari-web/app/templates/main/admin.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin.hbs b/ambari-web/app/templates/main/admin.hbs index d1dfe74..da23c78 100644 --- a/ambari-web/app/templates/main/admin.hbs +++ b/ambari-web/app/templates/main/admin.hbs @@ -17,20 +17,7 @@ }} <div class="row"> - <div id="main-admin-menu" class="well col-md-2 side-menu-well"> - <ul class="nav nav-list"> - {{#each category in view.categories}} - {{#view view.NavItemView itemBinding="category.name" elementIdBinding="category.name"}} - <a href="#" {{action "goToAdmin" category}} >{{category.label}}</a> - {{/view}} - {{/each}} - </ul> - </div> - <div class="col-md-10"> - <div class="row"> - <div class="col-md-12"> - {{outlet}} - </div> - </div> + <div class="col-md-12"> + {{outlet}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/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 1c81aeb..c193f7f 100644 --- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js +++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js @@ -128,10 +128,10 @@ if (settings.fitHeight) { // set actions submenu position var $moreIcon = $(this); + var $header = $('.side-nav-header'); $moreIcon.children('.dropdown-menu').css('position', 'fixed'); - var offset = $moreIcon.offset(); - $moreIcon.children('.dropdown-menu').css('top', offset.top + 20 + 'px'); - $moreIcon.children('.dropdown-menu').css('left', offset.left); + $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 () {
