Merge branch 'new-new-view-page' into update-forms

janfaracik · Oct 10, 2021 · 275c7da · 275c7da
2 parents 304ba88 + 281b2bd
commit 275c7da
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/core/src/main/resources/lib/hudson/newFromList/form.jelly b/core/src/main/resources/lib/hudson/newFromList/form.jelly
@@ -89,11 +89,14 @@ THE SOFTWARE.
           <div class="jenkins-radio">
             <input class="jenkins-radio__input" type="radio" id="copy" name="mode" value="copy" onchange="updateOk()" onclick="updateOk()" />
             <label class="jenkins-radio__label" for="copy">${attrs.copyTitle}</label>
+            <div class="jenkins-radio__children">
+              <j:set var="descriptor" value="${it.descriptor}" />
+              <div class="jenkins-search">
+                <s:textbox placeholder="Type for suggestions" clazz="jenkins-search__input"  name="from" field="copyNewItemFrom" onfocus="$('copy').click()" />
+                <l:svgIcon href="${resURL}/images/material-icons/svg-sprite-action-symbol.svg#ic_search_24px" class="jenkins-search__icon" />
+              </div>
+            </div>
           </div>
-          <s:entry class="jenkins-radio__children">
-            <j:set var="descriptor" value="${it.descriptor}" />
-            <s:textbox id="from" placeholder="Type for suggestions" name="from" field="copyNewItemFrom" onfocus="$('copy').click()" />
-          </s:entry>
         </j:if>
       </fieldset>
     </div>

diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
@@ -75,6 +75,7 @@
 
 .jenkins-search {
   position: relative;
+  max-width: 420px;
 
   &__input {
     appearance: none;
@@ -300,8 +301,12 @@
 
   &__children {
     position: relative;
-    margin-top: -10px;
+    margin-top: 0;
+    opacity: 0;
     padding-left: 32px;
+    transition: 0.2s ease;
+    visibility: hidden;
+    max-height: 0;
 
     &::after {
       content: "";
@@ -321,6 +326,13 @@
       }
     }
   }
+
+  &__input:checked + &__label + &__children {
+    visibility: visible;
+    margin-top: 10px;
+    opacity: 1;
+    max-height: none;
+  }
 }
 
 .jenkins-checkbox {