Merge branch 'master' into fix-form-margin

pom.xml

@@ -58,7 +58,9 @@ THE SOFTWARE.
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/design-library-plugin</gitHubRepo>
-    <jenkins.version>2.479.1</jenkins.version>
+    <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <node.version>20.18.1</node.version>
     <npm.version>10.9.2</npm.version>
     <spotless.check.skip>false</spotless.check.skip>
@@ -68,7 +70,7 @@ THE SOFTWARE.
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.479.x</artifactId>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
         <version>3482.vc10d4f6da_28a_</version>
         <type>pom</type>
         <scope>import</scope>

src/main/resources/io/jenkins/plugins/designlibrary/AppBar/index.jelly

@@ -43,12 +43,10 @@
               <div />
             </div>
             <f:bottomButtonBar>
-              <div class="jenkins-buttons-row">
-                <button class="jenkins-button jenkins-button--primary">
-                  Save
-                </button>
-                <button class="jenkins-button">Apply</button>
-              </div>
+              <button class="jenkins-button jenkins-button--primary">
+                Save
+              </button>
+              <button class="jenkins-button">Apply</button>
             </f:bottomButtonBar>
           </div>
         </s:preview>

src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/form.jelly

@@ -1,15 +1,14 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:s="/lib/samples">
-  <l:layout title="Forms">
-    <l:side-panel>
-      <s:sidepanel />
-    </l:side-panel>
-    <l:main-panel>
-
+  <s:layout>
+    <h1>Form submission result</h1>
+    <s:preview>
+      <div>
       <h2>Hello ${request.getParameter("name")}</h2>
       <b>Here are your order details</b><br/>
       Quantity: ${request.getParameter("quantity")}<br/>
       Flavor: ${request.getParameter("_.flavor")}<br/>
-    </l:main-panel>
-  </l:layout>
+      </div>
+    </s:preview>
+  </s:layout>
 </j:jelly>

src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly

@@ -153,7 +153,7 @@
           <f:textbox name="name"/>
         </f:entry>
         <f:entry title="${%Quantity}">
-          <f:number name="quantity" min="1" max="9"/>
+          <f:number name="quantity" min="1" max="9" default="1"/>
         </f:entry>
         <f:entry title="${%Choose flavor}">
           <f:select field="flavor"/>

src/main/webapp/AppBar/bottomAppBar.jelly

@@ -1,10 +1,8 @@
 <div>
   <f:bottomButtonBar>
-    <div class="jenkins-buttons-row">
-      <button class="jenkins-button jenkins-button--primary">
-        Save
-      </button>
-      <button class="jenkins-button">Apply</button>
-    </div>
+    <button class="jenkins-button jenkins-button--primary">
+      Save
+    </button>
+    <button class="jenkins-button">Apply</button>
   </f:bottomButtonBar>
 </div>

src/main/webapp/Dialogs/form.jelly

@@ -4,7 +4,7 @@
       <f:textbox name="name"/>
     </f:entry>
     <f:entry title="${%Quantity}">
-      <f:number name="quantity" min="1" max="9"/>
+      <f:number name="quantity" min="1" max="9" default="1"/>
     </f:entry>
     <f:entry title="${%Choose flavor}">
       <f:select field="flavor"/>