Merge branch 'responsive-app-bar' into styles-test

janfaracik · Jan 8, 2025 · c1c7cff · c1c7cff
2 parents 93a27d2 + 21979d7
commit c1c7cff
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 79 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -10,7 +10,6 @@
   "postUpdateOptions": [
     "yarnDedupeHighest"
   ],
-  "ignoreDeps": ["softprops/action-gh-release"],
   "packageRules": [
     {
       "matchDatasources": [

diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml
@@ -73,7 +73,7 @@ jobs:
           wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
       - name: Upload Release Asset
         id: upload-war
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -108,7 +108,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -144,7 +144,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -180,7 +180,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -216,7 +216,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
-    <jelly.version>1.1-jenkins-20250107</jelly.version>
+    <jelly.version>1.1-jenkins-20250108</jelly.version>
     <stapler.version>1940.v41211a_a_b_b_d8b_</stapler.version>
   </properties>
 

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "10.1.3",
     "postcss-scss": "4.0.9",
     "prettier": "3.4.2",
-    "sass": "1.83.0",
+    "sass": "1.83.1",
     "sass-loader": "16.0.4",
     "style-loader": "4.0.0",
     "stylelint": "16.12.0",

diff --git a/src/main/scss/base/_style.scss b/src/main/scss/base/_style.scss
@@ -287,65 +287,6 @@ pre.console {
   z-index: 998; /* behind top-sticker */
 }
 
-.bottom-sticker-inner {
-  position: relative;
-  padding: 1em var(--section-padding);
-  z-index: 0;
-
-  &::before {
-    content: "";
-    position: absolute;
-    inset: 0;
-    background: var(--background);
-    opacity: 0;
-    z-index: -1;
-  }
-
-  &::after {
-    content: "";
-    position: absolute;
-    top: -30px;
-    left: 0;
-    right: 0;
-    background: linear-gradient(rgba(black, 0), rgba(#556, 0.075) 110%);
-    max-width: 100%;
-    height: 30px;
-    opacity: 0;
-    transition: var(--standard-transition);
-    mask-image: linear-gradient(
-      to right,
-      transparent,
-      white var(--section-padding),
-      white calc(100% - var(--section-padding)),
-      transparent
-    );
-    pointer-events: none;
-  }
-
-  &--stuck {
-    .bottom-sticker-inner {
-      backdrop-filter: blur(15px);
-
-      &::before {
-        opacity: 0.75 !important;
-
-        @supports not (backdrop-filter: blur(15px)) {
-          opacity: 1 !important;
-        }
-      }
-
-      &::after {
-        opacity: 1 !important;
-      }
-    }
-  }
-
-  .yui-button {
-    margin-left: 0;
-    margin-right: 0.5rem;
-  }
-}
-
 .icon16x16 {
   width: 16px;
   height: 16px;

diff --git a/src/main/scss/components/_app-bar.scss b/src/main/scss/components/_app-bar.scss
@@ -3,13 +3,20 @@
   align-items: center;
   justify-content: space-between;
   margin-bottom: var(--section-padding);
+  gap: var(--section-padding);
+  flex-wrap: wrap;
+
+  @media (width <= 800px) {
+    align-items: stretch;
+    flex-direction: column;
+  }
 
   .jenkins-app-bar__content {
     display: flex;
     justify-content: center;
     flex-direction: column;
-    width: 100%;
     min-height: 2.25rem;
+    flex-grow: 1;
   }
 
   .jenkins-app-bar__controls {
@@ -18,11 +25,30 @@
     justify-content: center;
     margin-left: var(--section-padding);
     min-height: 2.25rem;
-    gap: 0.625rem;
+    gap: 0.75rem;
 
     .jenkins-search {
       min-width: 260px;
     }
+
+    @media (width <= 800px) {
+      justify-content: stretch;
+      flex-wrap: wrap;
+
+      & > * {
+        flex-grow: 1;
+        flex-basis: 0;
+      }
+
+      .jenkins-button:first-child {
+        width: 100%;
+        flex-basis: auto !important;
+      }
+    }
+
+    &:empty {
+      display: none;
+    }
   }
 
   &--sticky {
@@ -85,3 +111,57 @@
     height: 2rem !important;
   }
 }
+
+.bottom-sticker-inner {
+  position: relative;
+  padding: 1em var(--section-padding);
+  z-index: 0;
+
+  &::before {
+    content: "";
+    position: absolute;
+    inset: 0;
+    background: var(--background);
+    opacity: 0;
+    z-index: -1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    top: -30px;
+    left: 0;
+    right: 0;
+    background: linear-gradient(transparent, rgba(#556, 0.075) 110%);
+    max-width: 100%;
+    height: 30px;
+    opacity: 0;
+    transition: var(--standard-transition);
+    mask-image: linear-gradient(
+      to right,
+      transparent,
+      white var(--section-padding),
+      white calc(100% - var(--section-padding)),
+      transparent
+    );
+    pointer-events: none;
+  }
+
+  &--stuck {
+    .bottom-sticker-inner {
+      backdrop-filter: blur(15px);
+
+      &::before {
+        opacity: 0.75 !important;
+
+        @supports not (backdrop-filter: blur(15px)) {
+          opacity: 1 !important;
+        }
+      }
+
+      &::after {
+        opacity: 1 !important;
+      }
+    }
+  }
+}
diff --git a/src/main/scss/components/_buttons.scss b/src/main/scss/components/_buttons.scss
@@ -169,20 +169,28 @@
 .jenkins-buttons-row {
   display: flex;
   align-items: center;
-  gap: 1rem;
+  gap: 0.75rem;
 
   &--invert {
     justify-content: flex-end;
   }
 
   &--equal-width {
     .jenkins-button {
-      min-width: 6.25rem;
+      min-width: 6.5rem;
     }
   }
 
   &--equal-width {
-    min-width: 6.25rem;
+    min-width: 6.5rem;
+  }
+
+  @media (width <= 600px) {
+    justify-content: stretch;
+
+    .jenkins-button {
+      flex-grow: 1;
+    }
   }
 }
 

diff --git a/src/main/scss/form/_search-bar.scss b/src/main/scss/form/_search-bar.scss
@@ -1,3 +1,5 @@
+@use "../base/breakpoints";
+
 .jenkins-search-container {
   position: relative;
 }
@@ -150,12 +152,17 @@
   &--app-bar {
     --search-bar-height: 3rem;
 
-    max-width: 50vw;
+    width: 100%;
     margin-block: -6px;
 
     .jenkins-search__input {
       padding: 0 0.5rem 0 45px;
     }
+
+    /* stylelint-disable-next-line media-query-no-invalid */
+    @media (min-width: breakpoints.$tablet-breakpoint) {
+      max-width: 50vw;
+    }
 
     .jenkins-keyboard-shortcut {
       right: 0.8125rem;

diff --git a/test/pom.xml b/test/pom.xml
@@ -350,7 +350,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>design-library</artifactId>
-                  <version>350.v5a_69266b_2c7c</version>
+                  <version>352.v3d38a_04a_9ea_9</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>design-library.jpi</destFileName>

diff --git a/yarn.lock b/yarn.lock
@@ -4392,7 +4392,7 @@ __metadata:
     postcss-preset-env: "npm:10.1.3"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.4.2"
-    sass: "npm:1.83.0"
+    sass: "npm:1.83.1"
     sass-loader: "npm:16.0.4"
     sortablejs: "npm:1.15.6"
     style-loader: "npm:4.0.0"
@@ -6381,9 +6381,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.83.0":
-  version: 1.83.0
-  resolution: "sass@npm:1.83.0"
+"sass@npm:1.83.1":
+  version: 1.83.1
+  resolution: "sass@npm:1.83.1"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -6394,7 +6394,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/4415361229879a9041d77c953da85482e89032aa4321ba13250a9987d39c80fac6c88af3777f2a2d76a4e8b0c8afbd21c1970fdbe84e0b3ec25fb26741f92beb
+  checksum: 10c0/9772506cd8290df7b5e800055098e91a8a65100840fd9e90c660deb74b248b3ddbbd1a274b8f7f09777d472d2c873575357bd87939a40fb5a80bdf654985486f
   languageName: node
   linkType: hard