Skip to content

Commit 116c4c6

Browse files
committed
Fix api token css
Change jenkinsci#11141 added display: flex with direction column to jenkins-card. This broke the styling of the api token display This makes the api-tokens more independent from jenkins-card
1 parent 91c0643 commit 116c4c6

File tree

2 files changed

+34
-3
lines changed

2 files changed

+34
-3
lines changed

core/src/main/resources/jenkins/security/ApiTokenProperty/config.jelly

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ THE SOFTWARE.
6262
</d:tag>
6363
</d:taglib>
6464
<div class="jenkins-hidden" id="api-token-row-template" xmlns:local="local">
65-
<div class="token-card jenkins-card" id="${token.uuid}">
65+
<div class="token-card" id="${token.uuid}">
6666
<div class="token-card-inner">
6767
<div class="token-card__title">
6868
<span class="token-name">${token.name}</span>
@@ -122,7 +122,7 @@ THE SOFTWARE.
122122
<j:set var="legacyClazz" value="legacy-token" />
123123
<j:set var="legacyToolTip" value="${%LegacyToken}" />
124124
</j:if>
125-
<div class="token-card jenkins-card ${legacyClazz}" id="${token.uuid}">
125+
<div class="token-card ${legacyClazz}" id="${token.uuid}">
126126
<div class="token-card-inner">
127127
<div class="token-card__title ${legacyClazz}" tooltip="${legacyToolTip}">
128128
<j:if test="${token.isLegacy}">

core/src/main/resources/jenkins/security/ApiTokenProperty/resources.css

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,41 @@
2626
max-width: 700px;
2727
}
2828

29+
#api-tokens {
30+
width: 100%;
31+
}
32+
33+
#api-token-list {
34+
display: flex;
35+
flex-direction: column;
36+
gap: 0.75rem;
37+
margin-bottom: 0.75rem;
38+
}
39+
40+
.token-card {
41+
flex-direction: row;
42+
display: flex;
43+
gap: 0.5rem;
44+
border-radius: var(--form-input-border-radius);
45+
background: var(--card-background);
46+
position: relative;
47+
}
48+
49+
.token-card::after {
50+
content: "";
51+
position: absolute;
52+
inset: 0;
53+
border-radius: inherit;
54+
border: var(--card-border-width) solid var(--card-border-color);
55+
z-index: 1;
56+
pointer-events: none;
57+
}
58+
59+
2960
.token-card__title,
3061
.token-stats,
3162
.token-never-used,
32-
.token-list .jenkins-card,
63+
.token-list,
3364
.token-controls {
3465
display: flex;
3566
gap: 0.5rem;

0 commit comments

Comments
 (0)