This is an automated email from the ASF dual-hosted git repository. atkach pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 4a344db AMBARI-23543 Comparing config versions style tweaks 4a344db is described below commit 4a344dba2c4ae7ae6ded5f3b28c37a43081df1c7 Author: Andrii Tkach <atk...@apache.org> AuthorDate: Wed Apr 11 17:01:07 2018 +0300 AMBARI-23543 Comparing config versions style tweaks --- ambari-web/app/messages.js | 2 +- ambari-web/app/styles/config_versions_control.less | 10 +++------- .../app/templates/common/configs/config_versions_control.hbs | 8 ++++---- .../app/templates/common/configs/config_versions_dropdown.hbs | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 70cc8d7..7927674 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -2327,7 +2327,7 @@ Em.I18n.translations = { 'services.service.config.configHistory.leftArrow.tooltip': 'Show later versions', 'services.service.config.configHistory.dismissIcon.tooltip': 'Dismiss', 'services.service.config.configHistory.makeCurrent.message': 'Created from service config version {0}', - 'services.service.config.configHistory.comparing': 'Comparing Changes', + 'services.service.config.configHistory.comparing': 'Comparing Changes in', 'services.service.config.setRecommendedValue': 'Set Recommended', 'services.service.config.database.msg.jdbcSetup.detailed': 'To use {0} with Hive, you must <a href="{3}" target="_blank">' + 'download the {4} from {0}</a>. Once downloaded to the Ambari Server host, run: <br/>' + diff --git a/ambari-web/app/styles/config_versions_control.less b/ambari-web/app/styles/config_versions_control.less index 86584ad..9ed84c8 100644 --- a/ambari-web/app/styles/config_versions_control.less +++ b/ambari-web/app/styles/config_versions_control.less @@ -22,7 +22,7 @@ #config-versions-control { .dropdown-menu { min-width: 600px; - padding-bottom: 20px; + padding-bottom: 8px; li { padding: 3px 20px; } @@ -89,15 +89,11 @@ height: 30px; cursor: pointer; } - .make-current { - color: @health-status-green; - border-color: @health-status-green; - } .compare-bar { background-color: @border-color; padding: 10px 15px; - .close { - line-height: 30px; + .compare-label { + vertical-align: middle; } } } diff --git a/ambari-web/app/templates/common/configs/config_versions_control.hbs b/ambari-web/app/templates/common/configs/config_versions_control.hbs index 251276b..e5dbcef 100644 --- a/ambari-web/app/templates/common/configs/config_versions_control.hbs +++ b/ambari-web/app/templates/common/configs/config_versions_control.hbs @@ -19,8 +19,8 @@ <div id="config-versions-control"> {{#if view.isCompareMode}} <div class="compare-bar"> - <i class="glyphicon glyphicon-duplicate" aria-hidden="true"></i> - <span>{{t services.service.config.configHistory.comparing}}:</span> + <i class="icon-exchange" aria-hidden="true"></i> + <span class="compare-label">{{t services.service.config.configHistory.comparing}}:</span> {{view App.ConfigVersionsDropdownView serviceVersionsBinding="view.primaryServiceVersionsInCompare" isCompareMode="true"}} @@ -29,12 +29,12 @@ serviceVersionsBinding="view.secondaryServiceVersionsInCompare" isSecondary="true" isCompareMode="true"}} - <a {{action removeCompareVersionBar target="view"}} class="pull-right close">×</a> + <a {{action removeCompareVersionBar target="view"}} class="pull-right close form-text">×</a> </div> {{else}} {{view App.ConfigVersionsDropdownView serviceVersionsBinding="view.serviceVersions"}} {{#unless view.displayedServiceVersion.isCurrent}} - <button class="btn btn-default make-current" {{action makeCurrent view.displayedServiceVersion target="view"}}> + <button class="btn btn-secondary make-current" {{action makeCurrent view.displayedServiceVersion target="view"}}> {{t dashboard.configHistory.info-bar.revert.button}} </button> {{/unless}} diff --git a/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs b/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs index 1442145..b693700 100644 --- a/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs +++ b/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs @@ -21,7 +21,7 @@ {{t common.version}}: <span><strong>{{view.displayedServiceVersion.version}}</strong><span class="caret"></span></span> </button> -<div class="dropdown-menu"> +<div class="dropdown-menu bottom-shadow"> <li class="input-group search-input"> {{view Em.TextField valueBinding="view.filterValue" class="form-control" placeholderBinding="view.searchLabel"}} <span class="input-group-btn"> @@ -60,7 +60,7 @@ {{#unless view.isCompareMode}} <button {{bindAttr class="item.isDisplayed:hide :compare-button :btn :btn-default"}} {{action compare item target="view.parentView"}}> - <i class="glyphicon glyphicon-duplicate" aria-hidden="true"></i> + <i class="icon-exchange" aria-hidden="true"></i> </button> {{/unless}} </li> -- To stop receiving notification emails like this one, please contact atk...@apache.org.