commit 3d7e7320a64d4d04b68fc734802b18c6bc50e7f8
author Ben Rohlfs <brohlfs@google.com> Mon Jan 09 20:10:02 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 09 20:10:02 2023 +0000
tree 8593ac17e962076163949b89d5106edd017e9518
parent 4c4ae50349b467bc481c54d9fd2811303a28aa7e
parent c325458cedd2b94fe97e74e9aac16bd4d3c61287

Merge "Support --header-icon-width and -height instead of just -size"

polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.ts

diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.ts b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.ts
index 41cf952..b1ff749 100644
--- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.ts
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.ts
@@ -204,15 +204,18 @@
           text-decoration: underline;
         }
         .titleText::before {
+          --icon-width: var(--header-icon-width, var(--header-icon-size, 0));
+          --icon-height: var(--header-icon-height, var(--header-icon-size, 0));
           background-image: var(--header-icon);
-          background-size: var(--header-icon-size) var(--header-icon-size);
+          background-size: var(--icon-width) var(--icon-height);
           background-repeat: no-repeat;
           content: '';
           display: inline-block;
-          height: var(--header-icon-size);
-          margin-right: calc(var(--header-icon-size) / 4);
+          height: var(--icon-height);
+          /* If size or height are set, then use 'spacing-m', 0px otherwise. */
+          margin-right: clamp(0px, var(--icon-height), var(--spacing-m));
           vertical-align: text-bottom;
-          width: var(--header-icon-size);
+          width: var(--icon-width);
         }
         .titleText::after {
           content: var(--header-title-content);