Selaa lähdekoodia

AMBARI-16163 Config dependencies panel overlap with service config version. (atkach)

Andrii Tkach 9 vuotta sitten
vanhempi
commit
03600998f0

+ 0 - 14
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;
-  }
 }
 
 

+ 0 - 5
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;

+ 2 - 2
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">

+ 1 - 1
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">