Skip to content

Commit 042baf2

Browse files
authored
Improve app bar appearance (#635)
1 parent c4d6093 commit 042baf2

File tree

9 files changed

+38
-53
lines changed

9 files changed

+38
-53
lines changed

src/main/frontend/pipeline-console-view/pipeline-console/main/pipeline-console.scss

-5
Original file line numberDiff line numberDiff line change
@@ -373,11 +373,6 @@ a {
373373
cursor: pointer !important;
374374
}
375375

376-
.app-details__prev_next {
377-
color: inherit !important;
378-
text-decoration: none !important;
379-
}
380-
381376
.split-pane--stage-view {
382377
margin: 0;
383378
padding: 0;

src/main/frontend/pipeline-graph-view/app.scss

-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@
4040
}
4141
}
4242

43-
.app-details__prev_next {
44-
color: inherit !important;
45-
text-decoration: none !important;
46-
}
47-
4843
.pgw-graph-container {
4944
width: 100%;
5045
overflow: auto;

src/main/resources/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewAction/index.jelly

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:t="/lib/hudson">
66
<l:layout title="${%Graph} [${it.fullBuildDisplayName}]" type="one-column">
77
<l:main-panel>
8-
<p:symbols />
8+
<link rel="stylesheet" href="${resURL}/plugin/pipeline-graph-view/js/style.css" type="text/css" />
99

1010
<j:set var="controls">
1111
<j:if test="${it.buildable}">
@@ -33,14 +33,14 @@
3333

3434
<t:buildCaption controls="${controls}">
3535
<j:if test="${it.previousBuildNumber!=null}">
36-
<a href="../../${it.previousBuildNumber}/pipeline-graph" class="app-details__prev_next">
37-
<l:icon class="symbol-chevron-back-outline plugin-ionicons-api icon-md" tooltip="${%Previous Build}" />
36+
<a href="../../${it.previousBuildNumber}/pipeline-graph" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Previous Build}">
37+
<l:icon class="symbol-chevron-back-outline plugin-ionicons-api icon-md" />
3838
</a>
3939
</j:if>
40-
${%Build} ${it.buildDisplayName}
40+
${it.buildDisplayName}
4141
<j:if test="${it.nextBuildNumber!=null}">
42-
<a href="../../${it.nextBuildNumber}/pipeline-graph" class="app-details__prev_next">
43-
<l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" tooltip="${%Next Build}"/>
42+
<a href="../../${it.nextBuildNumber}/pipeline-graph" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Next Build}">
43+
<l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" />
4444
</a>
4545
</j:if>
4646
</t:buildCaption>

src/main/resources/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewAction/summary.jelly

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?jelly escape-by-default='true'?>
3-
<j:jelly xmlns:j="jelly:core" xmlns:p="/lib/pipeline-graph-view">
3+
<j:jelly xmlns:j="jelly:core">
44
<j:if test="${it.showGraphOnBuildPage}">
5-
<p:symbols />
65
<div class="pgw-graph-container">
76
<div id="graph"
87
data-current-run-path="${rootURL + '/' + it.buildUrl}"

src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<?jelly escape-by-default='true'?>
4-
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:dd="/lib/layout/dropdowns"
5-
xmlns:p="/lib/pipeline-graph-view" xmlns:t="/lib/hudson">
4+
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:dd="/lib/layout/dropdowns" xmlns:t="/lib/hudson">
65
<l:layout title="${%Build log} [${it.buildDisplayName}]" type="one-column">
76
<l:main-panel>
8-
<p:symbols />
9-
7+
<link rel="stylesheet" href="${resURL}/plugin/pipeline-graph-view/js/style.css" type="text/css" />
108
<j:out value="${h.generateConsoleAnnotationScriptAndStylesheet()}"/>
119

1210
<j:set var="controls">
@@ -43,14 +41,14 @@
4341

4442
<t:buildCaption controls="${controls}">
4543
<j:if test="${it.previousBuildNumber!=null}">
46-
<a href="../../${it.previousBuildNumber}/pipeline-console" class="app-details__prev_next">
47-
<l:icon class="symbol-chevron-back-outline plugin-ionicons-api icon-md" tooltip="${%Previous Build}"/>
44+
<a href="../../${it.previousBuildNumber}/pipeline-console" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Previous Build}">
45+
<l:icon class="symbol-chevron-back-outline plugin-ionicons-api icon-md" />
4846
</a>
4947
</j:if>
50-
${%Build} ${it.buildDisplayName}
48+
${it.buildDisplayName}
5149
<j:if test="${it.nextBuildNumber!=null}">
52-
<a href="../../${it.nextBuildNumber}/pipeline-console" class="app-details__prev_next">
53-
<l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" tooltip="${%Next Build}"/>
50+
<a href="../../${it.nextBuildNumber}/pipeline-console" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Next Build}">
51+
<l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" />
5452
</a>
5553
</j:if>
5654
</t:buildCaption>

src/main/resources/io/jenkins/plugins/pipelinegraphview/multipipelinegraphview/MultiPipelineGraphViewAction/index.jelly

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<?jelly escape-by-default='true'?>
4-
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:p="/lib/pipeline-graph-view">
4+
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
55
<l:layout title="Stages [${it.jobDisplayName}]" type="one-column">
66
<l:main-panel>
77
<l:app-bar title="${%Build} ${it.jobDisplayName}">
@@ -23,7 +23,6 @@
2323
</a>
2424
</l:hasPermission>
2525
</l:app-bar>
26-
<p:symbols />
2726
<div id="multiple-pipeline-root"
2827
data-current-job-path="${rootURL + '/' + it.jobUrl}" />
2928
<script src="${rootURL}/plugin/pipeline-graph-view/js/bundles/multi-pipeline-graph-view-bundle.js"/>

src/main/resources/io/jenkins/plugins/pipelinegraphview/multipipelinegraphview/MultiPipelineGraphViewAction/jobMain.jelly

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?jelly escape-by-default='true'?>
33
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:p="/lib/pipeline-graph-view">
4-
<p:symbols />
54
<j:if test="${it.showGraphOnJobPage}">
65
<div id="multiple-pipeline-root"
76
data-current-job-path="${rootURL + '/' + it.jobUrl}" />

src/main/resources/lib/pipeline-graph-view/symbols.jelly

-23
This file was deleted.

src/main/webapp/js/style.css

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
h1 {
2+
display: flex;
3+
align-items: center;
4+
gap: 1rem;
5+
}
6+
7+
.app-details__prev_next {
8+
padding: 0.5rem;
9+
min-width: 2.375rem;
10+
border-radius: 100px;
11+
margin-inline: -0.75rem;
12+
color: var(--text-color-secondary) !important;
13+
14+
&::before,
15+
&::after {
16+
inset: 0.375rem;
17+
}
18+
19+
svg {
20+
width: 1.175rem !important;
21+
height: 1.175rem !important;
22+
}
23+
}

0 commit comments

Comments
 (0)