[31/35] ambari git commit: AMBARI-21111 Ambari 3.0: Outstanding navigation issues. (atkach)
AMBARI-2 Ambari 3.0: Outstanding navigation issues. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd68c616 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd68c616 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd68c616 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: cd68c616177248911d7cba085cc584e76e7e Parents: 91d10fd Author: Andrii TkachAuthored: Wed May 24 14:23:48 2017 +0300 Committer: Andrii Tkach Committed: Thu May 25 13:04:18 2017 +0300 -- .../main/resources/ui/admin-web/app/styles/main.css | 7 +-- ambari-web/app/styles/alerts.less | 14 ++ ambari-web/app/styles/application.less| 13 +++-- ambari-web/app/styles/common.less | 1 + ambari-web/app/styles/config_history_flow.less| 7 +-- ambari-web/app/styles/theme/bootstrap-ambari.css | 2 +- ambari-web/app/templates/main/service/menu_item.hbs | 11 +-- ambari-web/app/views/main/menu.js | 1 + ambari-web/app/views/main/service/menu.js | 4 ambari-web/test/views/main/service/menu_test.js | 12 10 files changed, 35 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css -- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css index 882a4b4..946007d 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css @@ -455,12 +455,7 @@ a.gotoinstance{ border: none; } #top-nav .navbar.navbar-static-top .navbar-inner { - background-image: -moz-linear-gradient(top, #55, #33); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#55), to(#33)); - background-image: -webkit-linear-gradient(top, #55, #33); - background-image: -o-linear-gradient(top, #55, #33); - background-image: linear-gradient(to bottom, #55, #33); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#55, endColorstr=#33); + background-color: #313d54; -webkit-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-web/app/styles/alerts.less -- diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less index e4b21a7..4866b40 100644 --- a/ambari-web/app/styles/alerts.less +++ b/ambari-web/app/styles/alerts.less @@ -41,6 +41,20 @@ background-color: #999; } +.nav-pills .service-alerts-critical { + font-size: 10px; + line-height: .8em; + margin-left: -12px; + color: @health-status-red; +} + +.nav-pills .service-alerts-warning { + font-size: 10px; + line-height: .8em; + margin-left: -12px; + color: @health-status-orange; +} + .alert-state-single-host { display: inline-block; width: 115px; http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-web/app/styles/application.less -- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 95990b8..0b3fcc2 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -500,7 +500,7 @@ h1 { } .glyphicon-refresh { - color: #fdb82f; + color: #999; } .glyphicon-warning-sign { @@ -1332,6 +1332,10 @@ a:focus { } } +.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a.services-menu-blocks { + padding-left: 40px; +} + a.services-menu-blocks{ overflow:auto; .icon-health-block{ @@ -1347,7 +1351,12 @@ a.services-menu-blocks{ margin-left: 4px; margin-right: 4px; } - + .menu-item-name.INSTALLED { +color: @health-status-red; + } + .menu-item-name.UNKNOWN { +color: @health-status-orange; + } } .quick-links-wrapper { http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-web/app/styles/common.less -- diff --git a/ambari-web/app/styles/common.less b/ambari-web/app/styles/common.less index c5ab5b9..ddd4f3a 100644 --- a/ambari-web/app/styles/common.less +++ b/ambari-web/app/styles/common.less @@ -50,6 +50,7 @@ @green:
ambari git commit: AMBARI-21111 Ambari 3.0: Outstanding navigation issues. (atkach)
Repository: ambari Updated Branches: refs/heads/trunk 91d10fdc8 -> cd68c6161 AMBARI-2 Ambari 3.0: Outstanding navigation issues. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd68c616 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd68c616 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd68c616 Branch: refs/heads/trunk Commit: cd68c616177248911d7cba085cc584e76e7e Parents: 91d10fd Author: Andrii TkachAuthored: Wed May 24 14:23:48 2017 +0300 Committer: Andrii Tkach Committed: Thu May 25 13:04:18 2017 +0300 -- .../main/resources/ui/admin-web/app/styles/main.css | 7 +-- ambari-web/app/styles/alerts.less | 14 ++ ambari-web/app/styles/application.less| 13 +++-- ambari-web/app/styles/common.less | 1 + ambari-web/app/styles/config_history_flow.less| 7 +-- ambari-web/app/styles/theme/bootstrap-ambari.css | 2 +- ambari-web/app/templates/main/service/menu_item.hbs | 11 +-- ambari-web/app/views/main/menu.js | 1 + ambari-web/app/views/main/service/menu.js | 4 ambari-web/test/views/main/service/menu_test.js | 12 10 files changed, 35 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css -- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css index 882a4b4..946007d 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css @@ -455,12 +455,7 @@ a.gotoinstance{ border: none; } #top-nav .navbar.navbar-static-top .navbar-inner { - background-image: -moz-linear-gradient(top, #55, #33); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#55), to(#33)); - background-image: -webkit-linear-gradient(top, #55, #33); - background-image: -o-linear-gradient(top, #55, #33); - background-image: linear-gradient(to bottom, #55, #33); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#55, endColorstr=#33); + background-color: #313d54; -webkit-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-web/app/styles/alerts.less -- diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less index e4b21a7..4866b40 100644 --- a/ambari-web/app/styles/alerts.less +++ b/ambari-web/app/styles/alerts.less @@ -41,6 +41,20 @@ background-color: #999; } +.nav-pills .service-alerts-critical { + font-size: 10px; + line-height: .8em; + margin-left: -12px; + color: @health-status-red; +} + +.nav-pills .service-alerts-warning { + font-size: 10px; + line-height: .8em; + margin-left: -12px; + color: @health-status-orange; +} + .alert-state-single-host { display: inline-block; width: 115px; http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-web/app/styles/application.less -- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 95990b8..0b3fcc2 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -500,7 +500,7 @@ h1 { } .glyphicon-refresh { - color: #fdb82f; + color: #999; } .glyphicon-warning-sign { @@ -1332,6 +1332,10 @@ a:focus { } } +.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a.services-menu-blocks { + padding-left: 40px; +} + a.services-menu-blocks{ overflow:auto; .icon-health-block{ @@ -1347,7 +1351,12 @@ a.services-menu-blocks{ margin-left: 4px; margin-right: 4px; } - + .menu-item-name.INSTALLED { +color: @health-status-red; + } + .menu-item-name.UNKNOWN { +color: @health-status-orange; + } } .quick-links-wrapper { http://git-wip-us.apache.org/repos/asf/ambari/blob/cd68c616/ambari-web/app/styles/common.less -- diff --git a/ambari-web/app/styles/common.less b/ambari-web/app/styles/common.less index c5ab5b9..ddd4f3a 100644 --- a/ambari-web/app/styles/common.less +++