Skip to content

Commit 27bb83f

Browse files
committed
refactor: use jenkins cards over bootstrap cards
Signed-off-by: Lewis Birks <[email protected]>
1 parent f224a16 commit 27bb83f

File tree

2 files changed

+45
-35
lines changed

2 files changed

+45
-35
lines changed
Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,34 @@
11
<?jelly escape-by-default='true'?>
2-
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
2+
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5" xmlns:l="/lib/layout">
33

44
<st:header name="Content-Type" value="text/html;charset=UTF-8"/>
55

66
<bs:page it="${it}">
7-
87
<j:if test="${size(it.errorMessages) > 0}">
9-
<div class="row py-3">
10-
<div class="col">
11-
12-
<bs:card title="${%Error Messages}" fontAwesomeIcon="triangle-exclamation">
13-
<pre>
14-
<samp id="errors" class="log-output">
15-
<j:forEach var="message" items="${it.errorMessages}">
16-
<div>
17-
${message}
18-
</div>
19-
</j:forEach>
20-
</samp>
21-
</pre>
22-
</bs:card>
8+
<l:card title="${%Error Messages}">
9+
<div class="bs5-console-output">
10+
<pre id="errors">
11+
<j:forEach var="message" items="${it.errorMessages}">
12+
<div>
13+
${message}
14+
</div>
15+
</j:forEach>
16+
</pre>
2317
</div>
24-
</div>
18+
</l:card>
2519
</j:if>
2620

27-
<div class="row py-3">
28-
<div class="col">
29-
30-
<bs:card title="${%Information Messages}" fontAwesomeIcon="circle-info">
31-
32-
<pre>
33-
<samp id="info" class="log-output">
34-
<j:forEach var="message" items="${it.infoMessages}">
35-
<div>
36-
${message}
37-
</div>
38-
</j:forEach>
39-
</samp>
40-
</pre>
41-
</bs:card>
42-
21+
<l:card title="${%Information Messages}">
22+
<div class="bs5-console-output">
23+
<pre id="info">
24+
<j:forEach var="message" items="${it.infoMessages}">
25+
<div>
26+
${message}
27+
</div>
28+
</j:forEach>
29+
</pre>
4330
</div>
44-
</div>
45-
31+
</l:card>
4632
</bs:page>
4733

4834
</j:jelly>

src/main/webapp/css/jenkins-style.css

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,27 @@ pre {
155155
backdrop-filter: contrast(0.6) brightness(2.4) saturate(2) blur(15px);
156156
box-shadow: 0 0 8px 2px rgba(0,0,30,.05), 0 0 1px 1px rgba(0,0,20,.025), 0 10px 20px rgba(0,0,20,.15);
157157
}
158+
159+
/* ------------------------------------------------------------------------------------------------------------------- */
160+
/* Console output */
161+
/* ------------------------------------------------------------------------------------------------------------------- */
162+
163+
.bs5-console-output {
164+
margin: 0 -1rem -1rem;
165+
padding: 0 1rem 1rem;
166+
overflow-y: auto;
167+
168+
pre {
169+
background: transparent;
170+
border: none;
171+
margin: 0;
172+
padding: 0;
173+
line-height: 1.75;
174+
font-size: var(--font-size-sm);
175+
overflow-wrap: break-word;
176+
177+
a {
178+
overflow-wrap: break-word;
179+
}
180+
}
181+
}

0 commit comments

Comments
 (0)