Repository: ambari Updated Branches: refs/heads/trunk 287e2416c -> 03600998f
AMBARI-16163 Config dependencies panel overlap with service config version. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03600998 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03600998 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03600998 Branch: refs/heads/trunk Commit: 03600998f060daf7c3a4cbd336fea1c6737b2e45 Parents: 287e241 Author: Andrii Tkach <[email protected]> Authored: Thu Apr 28 18:31:23 2016 +0300 Committer: Andrii Tkach <[email protected]> Committed: Fri Apr 29 11:03:02 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 14 -------------- ambari-web/app/styles/config_history_flow.less | 5 ----- .../app/templates/common/configs/service_config.hbs | 4 ++-- .../common/configs/service_config_wizard.hbs | 2 +- 4 files changed, 3 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/03600998/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index b6514b3..cb1b4e4 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -1410,17 +1410,6 @@ h1 { } } } - - .config-tabs { - margin-bottom: @space-m * 2; - } - - .serviceConfigs { - .config-tabs { - margin-top: -55px; - } - } - } .running-host-components-table{ @@ -4488,9 +4477,6 @@ ul.inline li { #config_history_flow { margin-bottom: 20px; - &.with-enhanced-config { - margin-bottom: 60px; - } } http://git-wip-us.apache.org/repos/asf/ambari/blob/03600998/ambari-web/app/styles/config_history_flow.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/config_history_flow.less b/ambari-web/app/styles/config_history_flow.less index e1732a6..fff3151 100644 --- a/ambari-web/app/styles/config_history_flow.less +++ b/ambari-web/app/styles/config_history_flow.less @@ -39,11 +39,6 @@ } } -.dependencies-info { - margin-top: -55px; - margin-bottom: 65px; -} - .dependencies-info-bar-wrapper { z-index: 2; margin: 0; http://git-wip-us.apache.org/repos/asf/ambari/blob/03600998/ambari-web/app/templates/common/configs/service_config.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs index 0b383d1..b78fecf 100644 --- a/ambari-web/app/templates/common/configs/service_config.hbs +++ b/ambari-web/app/templates/common/configs/service_config.hbs @@ -96,7 +96,7 @@ {{#if versionLoaded}} {{#unless hideDependenciesInfoBar}} - <div {{bindAttr class="hasChangedDependencies:show:hide :dependencies-info"}}> + <div {{bindAttr class="hasChangedDependencies:show:hide"}}> <div class="dependencies-info-bar-wrapper"> <div class="alert alert-warning"> <span>{{dependenciesMessage}}</span> <a @@ -111,7 +111,7 @@ </div> {{/unless}} {{#if view.supportsConfigLayout}} - <ul class="nav nav-tabs mbm config-tabs background-text"> + <ul class="nav nav-tabs mbm background-text"> {{#each tab in view.tabs}} <li rel='tooltip' {{bindAttr class="tab.isActive:active tab.isHiddenByFilter:disabled" data-original-title="tab.tooltipMsg"}}> <a href="#" {{action "setActiveTab" tab target="view"}} {{bindAttr data-target="tab.headingClass"}} data-toggle="tab"> http://git-wip-us.apache.org/repos/asf/ambari/blob/03600998/ambari-web/app/templates/common/configs/service_config_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config_wizard.hbs b/ambari-web/app/templates/common/configs/service_config_wizard.hbs index b297d1d..e785055 100644 --- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs +++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs @@ -50,7 +50,7 @@ {{/if}} {{#if view.supportsConfigLayout}} - <ul class="nav nav-tabs mbm config-tabs"> + <ul class="nav nav-tabs mbm"> {{#each tab in view.tabs}} <li rel='tooltip' {{bindAttr class="tab.isActive:active tab.isHiddenByFilter:disabled" data-original-title="tab.tooltipMsg"}}> <a href="#" {{action "setActiveTab" tab target="view"}} {{bindAttr data-target="tab.headingClass"}} data-toggle="tab">
