From 2e873c18dc78b9cb6a1fd64aef6a9e5f261f5ac4 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:49:30 +0100 Subject: [PATCH 01/11] Use Jenkins cards SCSS --- pom.xml | 2 +- .../main/pipeline-console.scss | 5 +- .../frontend/pipeline-graph-view/_cards.scss | 55 +------------------ .../frontend/pipeline-graph-view/app.scss | 12 ---- .../pipeline-graph/styles/main.scss | 1 - .../lib/pipeline-graph-view/card.jelly | 31 ++++++----- 6 files changed, 20 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index 02fdadef..f5017403 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 999999-SNAPSHOT jenkinsci/pipeline-graph-view-plugin - 2.452.1 + 2.464 20.15.0 10.8.1 false diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/pipeline-console.scss b/src/main/frontend/pipeline-console-view/pipeline-console/main/pipeline-console.scss index 50237515..aae03112 100644 --- a/src/main/frontend/pipeline-console-view/pipeline-console/main/pipeline-console.scss +++ b/src/main/frontend/pipeline-console-view/pipeline-console/main/pipeline-console.scss @@ -1,7 +1,6 @@ @import "react-tippy/dist/tippy.css"; :root { - --card-background: hsl(212, 30%, 96%); --step-bg-running: color-mix(in srgb, var(--accent-color) 50%, white); --step-bg-success: color-mix(in srgb, var(--success-color) 50%, white); --step-bg-unstable: color-mix(in srgb, var(--warning-color) 50%, white); @@ -17,7 +16,6 @@ } [data-theme="dark"] { - --card-background: hsl(230deg 14% 23%); --step-bg-running: color-mix(in srgb, var(--accent-color) 50%, black); --step-bg-success: color-mix(in srgb, var(--success-color) 50%, black); --step-bg-unstable: color-mix(in srgb, var(--warning-color) 50%, black); @@ -29,8 +27,7 @@ @media (prefers-color-scheme: dark) { [data-theme="dark-system"], [data-theme="dark-system"] { - --card-background: hsl(230deg 14% 23%); - //--step-text-color: hsl(230deg 14% 23%); + --step-text-color: hsl(230deg 14% 23%); --step-bg-running: color-mix(in srgb, var(--accent-color) 50%, black); --step-bg-success: color-mix(in srgb, var(--success-color) 50%, black); --step-bg-unstable: color-mix(in srgb, var(--warning-color) 50%, black); diff --git a/src/main/frontend/pipeline-graph-view/_cards.scss b/src/main/frontend/pipeline-graph-view/_cards.scss index 0da6dfc9..1aa7ce98 100644 --- a/src/main/frontend/pipeline-graph-view/_cards.scss +++ b/src/main/frontend/pipeline-graph-view/_cards.scss @@ -20,15 +20,6 @@ } &__item { - position: relative; - border-radius: 15px; - padding: 20px; - background: var(--card-background); - overflow: auto; - box-shadow: 0 0 1px rgba(black, 0.06); - min-height: unset; - max-height: unset; - hr { background: var(--secondary); border: none; @@ -37,43 +28,11 @@ opacity: 0.2; } - &:hover { - .pgv-cards__item__title__actions { - opacity: 1; - } - } - &--wide { grid-column: span 2; } } - &__item__title { - display: flex; - align-items: center; - justify-content: space-between; - margin: 0 0 20px 0; - padding: 0; - font-weight: 600; - font-size: 1rem; - - a { - svg { - width: 18px; - height: 18px; - color: var(--text-color) !important; - } - } - } - - &__item__title__actions { - display: flex; - align-items: center; - gap: 15px; - opacity: 0.5; - transition: 0.3s ease; - } - &__item__title-float { position: absolute; top: 0; @@ -139,24 +98,14 @@ background-color: var(--card-background); } -.pgv-modal__close_button:hover { - background-color: darkgray; -} - .pgv-modal__closer { - display: none; + display: none !important; } .pgv-modal__open .pgv-modal__closer { - display: flex; + display: flex !important; } .pgv-modal__open .pgv-modal__expander { display: none; } - -.pgv-modal__expander:hover, -.pgv-modal__closer:hover { - background: var(--item-background--hover); - border-radius: 14px; -} diff --git a/src/main/frontend/pipeline-graph-view/app.scss b/src/main/frontend/pipeline-graph-view/app.scss index 4321ce51..b4055eb6 100644 --- a/src/main/frontend/pipeline-graph-view/app.scss +++ b/src/main/frontend/pipeline-graph-view/app.scss @@ -1,5 +1,4 @@ :root { - --card-background: hsl(212, 30%, 96%); --card-gap: 1rem; } @@ -8,17 +7,6 @@ max-width: unset; } -[data-theme="dark"] { - --card-background: hsl(230deg 14% 23%); -} - -@media (prefers-color-scheme: dark) { - [data-theme="dark-system"], - [data-theme="dark-system"] { - --card-background: hsl(230deg 14% 23%); - } -} - @import "cards"; .app-details__item svg { diff --git a/src/main/frontend/pipeline-graph-view/pipeline-graph/styles/main.scss b/src/main/frontend/pipeline-graph-view/pipeline-graph/styles/main.scss index 4ac5eb39..408cbf46 100644 --- a/src/main/frontend/pipeline-graph-view/pipeline-graph/styles/main.scss +++ b/src/main/frontend/pipeline-graph-view/pipeline-graph/styles/main.scss @@ -5,7 +5,6 @@ display: flex; flex-direction: column; align-items: center; - margin-bottom: 16px; * { box-sizing: border-box; diff --git a/src/main/resources/lib/pipeline-graph-view/card.jelly b/src/main/resources/lib/pipeline-graph-view/card.jelly index c0025c08..a88a378f 100644 --- a/src/main/resources/lib/pipeline-graph-view/card.jelly +++ b/src/main/resources/lib/pipeline-graph-view/card.jelly @@ -14,28 +14,29 @@ Set true if you want to allow users to click a button to pop out a larger version of the card -
+
-

${attrs.title} - - - - - - - - - - -

+
+ ${attrs.title} + +
-

${attrs.title}

- +
${attrs.title}
+
+ +
From f450d686bc599237a545b097ba162894315d8cc0 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:12:39 +0100 Subject: [PATCH 02/11] Push --- .../frontend/pipeline-graph-view/app.scss | 14 +++--- .../PipelineGraphViewAction/index.jelly | 50 ++++++++++--------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/main/frontend/pipeline-graph-view/app.scss b/src/main/frontend/pipeline-graph-view/app.scss index b4055eb6..658a5e89 100644 --- a/src/main/frontend/pipeline-graph-view/app.scss +++ b/src/main/frontend/pipeline-graph-view/app.scss @@ -9,17 +9,17 @@ @import "cards"; -.app-details__item svg { - color: currentColor !important; - width: 16px; - height: 16px; +.idkidkidk { + display: flex; + flex-direction: column; + gap: 1rem; } .app-details__item { display: flex; align-items: center; gap: 10px; - margin: 0 0 15px; + margin: 0; span { display: contents; @@ -27,8 +27,8 @@ svg { color: currentColor !important; - width: 16px; - height: 16px; + width: 1.125rem; + height: 1.125rem; } &--link { diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewAction/index.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewAction/index.jelly index 253a7ace..b2f1bea3 100644 --- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewAction/index.jelly +++ b/src/main/resources/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewAction/index.jelly @@ -51,31 +51,33 @@