Pārlūkot izejas kodu

HUE-4143 [editor] Snippet configuration layout is broken

Conflicts:
	desktop/libs/notebook/src/notebook/static/notebook/css/notebook.css
	desktop/libs/notebook/src/notebook/templates/editor_components.mako
Johan Ahlen 9 gadi atpakaļ
vecāks
revīzija
ebd99e5

+ 5 - 5
desktop/core/src/desktop/templates/config_ko_components.mako

@@ -85,11 +85,6 @@ from desktop.views import _ko
   <script type="text/html" id="property-selector-template">
     <!-- ko foreach: selectedProperties -->
     <div>
-      <div class="config-property-remove">
-        <a class="inactive-action" href="javascript:void(0)" data-bind="click: function() { $parent.removeProperty($data) }" title="${ _('Remove') }">
-          <i class="fa fa-times"></i>
-        </a>
-      </div>
       <!-- ko template: {
         name: 'property',
         data: {
@@ -101,6 +96,11 @@ from desktop.views import _ko
           visibleObservable: $parent.visibleObservable
         }
       } --><!-- /ko -->
+      <div class="config-property-remove">
+        <a class="inactive-action" href="javascript:void(0)" data-bind="click: function() { $parent.removeProperty($data) }" title="${ _('Remove') }">
+          <i class="fa fa-times"></i>
+        </a>
+      </div>
     </div>
     <!-- /ko -->
     <div class="config-property-available margin-left-10" data-bind="visible: availableProperties().length > 0">

+ 15 - 15
desktop/libs/notebook/src/notebook/static/notebook/css/notebook.css

@@ -1105,36 +1105,36 @@ pre {
   font-style: italic;
 }
 
-.config-property {
-  display: inline!important;
+.session-config .config-property {
+  display: inline !important;
 }
 
-.config-property-available {
-  margin-left: 0!important;
+.session-config .config-property-available {
+  margin-left: 0 !important;
   margin-top: 10px;
 }
 
-.config-property-add-value {
-  margin-top: -8px!important;
+.session-config  .config-property-add-value {
+  margin-top: -8px !important;
   margin-bottom: 20px;
 }
 
-.config-property-input-small {
-  width: 120px!important;
+.session-config .config-property-input-small {
+  width: 120px !important;
 }
 
-.config-property-input-mini {
-  width: 90px!important;
+.session-config .config-property-input-mini {
+  width: 90px !important;
 }
 
-.config-label {
-  text-align: left!important;
+.session-config .config-label {
+  text-align: left !important;
   margin-left: 0!important;
 }
 
-.config-property-remove {
+.session-config .config-property-remove {
   float: right;
-  margin-top: 2px!important;
+  margin-top: 2px !important;
 }
 
 #schedulerEditor .container-fluid, #schedulerEditor .card-heading, #schedulerEditor .card-body {
@@ -1162,4 +1162,4 @@ pre {
 
 #schedulerEditor .workflow-parameter:hover {
   background-color: #FAFAFA;
-}
+}

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -996,7 +996,7 @@ ${ hueIcons.symbols() }
         <div class="row-fluid">
           <div class="span12">
             <!-- ko with: $root.selectedNotebook() -->
-            <form class="form-horizontal">
+            <form class="form-horizontal session-config">
               <fieldset>
                 <!-- ko ifnot: sessions().length -->
                <p>${ _('There are currently no active sessions.') }</p>