Skip to content

Commit 6e927c1

Browse files
Fix namespacing for transparent tag class
1 parent f96b614 commit 6e927c1

2 files changed

Lines changed: 18 additions & 11 deletions

File tree

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
@use "../vendor/nhsuk-frontend" as *;
22

3-
.nhsuk-tag {
4-
&--transparent {
5-
border-color: $nhsuk-text-colour;
6-
color: $nhsuk-text-colour;
7-
background-color: transparent;
8-
}
9-
}
10-
113
.nhsuk-tag + .nhsuk-u-secondary-text-colour {
124
margin-left: nhsuk-spacing(2);
135

@@ -17,3 +9,9 @@
179
.app-tag--attached {
1810
margin-right: -1px;
1911
}
12+
13+
.app-tag--transparent {
14+
border-color: $nhsuk-text-colour;
15+
color: $nhsuk-text-colour;
16+
background-color: transparent;
17+
}

app/utils/string.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,19 @@ export function formatWithSecondaryText(text, secondary, breakLine = true) {
169169
*/
170170
export function formatTag({ text, html, colour, classes }) {
171171
text = html || text
172-
classes = ['nhsuk-tag', classes].join(' ')
172+
173+
const classAttr = classes ? classes.split(' ') : []
174+
175+
if (colour && colour === 'transparent') {
176+
classAttr.push('app-tag--transparent')
177+
} else if (colour) {
178+
classAttr.push(`nhsuk-tag--${colour}`)
179+
}
180+
181+
classAttr.unshift('nhsuk-tag')
173182

174183
if (colour) {
175-
return `<strong class="${classes} nhsuk-tag--${colour}">${text}</strong>`
184+
return `<strong class="${classAttr.join(' ')}">${text}</strong>`
176185
}
177186

178187
return `<strong class="${classes}">${text}</strong>`
@@ -182,7 +191,7 @@ export function formatProgrammeStatus(programme, status, note) {
182191
let html = formatTag({
183192
classes: 'app-tag--attached',
184193
text: programme.name,
185-
colour: 'white'
194+
colour: 'transparent'
186195
})
187196

188197
if (status) {

0 commit comments

Comments
 (0)