[ambari] branch trunk updated: AMBARI-23220 Customise Services : Alignment not proper for Select Config group Pop up and overriden text box

[atkach]

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 611c60d  AMBARI-23220 Customise Services : Alignment not proper for 
Select Config group Pop up and overriden text box
611c60d is described below

commit 611c60d3adf4fa6affd76b1368650ebf009b6ae0
Author: Andrii Tkach <atk...@apache.org>
AuthorDate: Tue Mar 13 18:26:20 2018 +0200

    AMBARI-23220 Customise Services : Alignment not proper for Select Config 
group Pop up and overriden text box
---
 ambari-web/app/styles/service_configurations.less          | 14 ++++++++++++++
 .../app/templates/common/configs/overriddenProperty.hbs    |  2 +-
 .../templates/common/modal_popups/select_groups_popup.hbs  |  8 ++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ambari-web/app/styles/service_configurations.less 
b/ambari-web/app/styles/service_configurations.less
index 60360b0..bd60bab 100644
--- a/ambari-web/app/styles/service_configurations.less
+++ b/ambari-web/app/styles/service_configurations.less
@@ -131,6 +131,20 @@
           margin-bottom: 5px;
         }
       }
+      .overrideField {
+        .long-input {
+          width: 101%;
+        }
+        .config-controls {
+          padding-left: 0;
+          padding-right: 0;
+          margin-left: -5px;
+          .help-block {
+            margin: 0;
+            line-height: 32px;
+          }
+        }
+      }
     }
     form {
       margin-bottom: 0;
diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs 
b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
index b258137..f54b939 100644
--- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
+++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
@@ -21,7 +21,7 @@
     <div class="col-md-9">
       {{view view.overriddenSCP.viewClass 
serviceConfigBinding="view.overriddenSCP" 
categoryConfigsBinding="view.parentView.categoryConfigs"}}
     </div>
-    <div class="col-md-3">
+    <div class="col-md-3 config-controls">
       {{#if view.overriddenSCP.supportsFinal}}
         <a href="#" data-toggle="tooltip"
           {{bindAttr class=":btn-sm :btn-final 
view.overriddenSCP.isFinal:active view.overriddenSCP.hideFinalIcon:hidden" 
disabled="view.overriddenSCP.isNotEditable"}}
diff --git 
a/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs 
b/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs
index f21be28..f739ca0 100644
--- a/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs
@@ -17,13 +17,13 @@
 }}
 
 <form class="form-horizontal">
-  <div class="form-group">
-    <label class="col-sm-2 
control-label"><strong>{{view.serviceName}}&nbsp;</strong>&nbsp;</label>
-    <div class="col-sm-8">
+  <div class="form-group form-text">
+    <div class="col-sm-3 
align-right"><strong>{{view.serviceName}}&nbsp;</strong>&nbsp;</div>
+    <div class="col-sm-7">
       {{#if view.hasGroups}}
         {{view Ember.Select classNames="form-control" 
contentBinding="view.groups" valueBinding="view.selectedGroup" 
disabledBinding="view.disabled"}}
       {{else}}
-        <p>{{t popup.dependent.configs.select.config.group.no.groups}}</p>
+        <span>{{t 
popup.dependent.configs.select.config.group.no.groups}}</span>
       {{/if}}
     </div>
   </div>

-- 
To stop receiving notification emails like this one, please contact
atk...@apache.org.