You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/04/11 01:50:07 UTC
ambari git commit: AMBARI-10428. Combo drop-down panel showing on the
right (Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 55aaed016 -> d3d73f762
AMBARI-10428. Combo drop-down panel showing on the right (Richard Zang via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3d73f76
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3d73f76
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3d73f76
Branch: refs/heads/trunk
Commit: d3d73f7624ee6a3ba412ebda52cc889e0e8532e9
Parents: 55aaed0
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Apr 10 16:49:46 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Apr 10 16:49:46 2015 -0700
----------------------------------------------------------------------
ambari-web/app/styles/widgets.less | 20 +++++++++-----------
.../configs/widgets/combo_config_widget.hbs | 2 +-
2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d73f76/ambari-web/app/styles/widgets.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less
index 9dcec28..e3cb9a0 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -183,21 +183,19 @@
.combo-widget {
.input-append {
-
- > input {
- border-radius: 3px 0 0 3px;
- width: @combo-widget-width;
-
- &[disabled] {
- background: #fff;
- cursor: default;
- }
- }
-
.btn-group {
display: inline-block;
margin-left: -1px;
+ > input {
+ border-radius: 3px 0 0 3px;
+ width: @combo-widget-width;
+
+ &[disabled] {
+ background: #fff;
+ cursor: default;
+ }
+ }
.btn {
border-radius: 0 3px 3px 0;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3d73f76/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
index d69d613..74d8b13 100644
--- a/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/combo_config_widget.hbs
@@ -20,8 +20,8 @@
{{/if}}
<div {{bindAttr class="view.isOriginalSCP:original-widget"}}>
<div class="input-append">
- {{view Em.TextField valueBinding="view.content.value" disabled="disabled"}}
<div class="dropdown btn-group">
+ {{view Em.TextField valueBinding="view.content.value" disabled="disabled"}}
<button {{bindAttr class="view.disabled:disabled :btn :dropdown-toggle"}} data-toggle="dropdown">
<span class="caret"></span>
</button>