Repository: ambari Updated Branches: refs/heads/trunk aba28e05e -> a52eb51d1
AMBARI-11484. Configs: when doing override, it's hard to find config override (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a52eb51d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a52eb51d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a52eb51d Branch: refs/heads/trunk Commit: a52eb51d1af0edc9273a947535a2a36886e625da Parents: aba28e0 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Thu May 28 18:02:28 2015 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Thu May 28 18:02:28 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/widgets.less | 20 ++++++++++++++++++++ .../configs/widgets/config_widget_view.js | 2 +- .../widgets/slider_config_widget_view.js | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a52eb51d/ambari-web/app/styles/widgets.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less index efaf7b7..897c6e5 100644 --- a/ambari-web/app/styles/widgets.less +++ b/ambari-web/app/styles/widgets.less @@ -20,6 +20,8 @@ @undo-btn-margin: 10px; @controls-min-width: 55px; @combo-widget-width: 100px; +@overriden-property-bg-color: rgba(211, 237, 247, 0.39); +@overriden-property-widget-padding: 8px; @green: #6ebd45; @slider-light-grey: #e6e6e6; @slider-dark-grey: #aaaaaa; @@ -113,6 +115,24 @@ margin-right: 0; padding-left: 20px; } + // background hack instead of increasing padding, + // because we have lack of space for widget container. + &.overridden-property { + background-color: @overriden-property-bg-color; + position: relative; + &:before { + height: 100%; + width: @overriden-property-widget-padding; + content: ''; + position: absolute; + top: 0; + display: block; + background-color: @overriden-property-bg-color; + } + &:before { + left: -@overriden-property-widget-padding; + } + } } .directory-textarea-wrapper { http://git-wip-us.apache.org/repos/asf/ambari/blob/a52eb51d/ambari-web/app/views/common/configs/widgets/config_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js index 92dc8c1..5d1dcab 100644 --- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js +++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js @@ -117,7 +117,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo */ isComparisonBinding: 'config.isComparison', - classNameBindings:['isComparison:compare-mode'], + classNameBindings:['isComparison:compare-mode', 'config.overrides.length:overridden-property'], issueMessage: '', http://git-wip-us.apache.org/repos/asf/ambari/blob/a52eb51d/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js index d8434b5..31d8aef 100644 --- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js +++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js @@ -27,6 +27,8 @@ var validator = require('utils/validator'); */ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({ + classNames: ['widget-config'], + templateName: require('templates/common/configs/widgets/slider_config_widget'), supportSwitchToCheckBox: true,
