Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 77fe9cd

Browse files
VividLemonVividLemon
authored
Merge pull request bootstrap-vue-next#1328 from VividLemon/main
revert: BTable dark variants come back
2 parents d35f584 + c8cc69d commit 77fe9cd

File tree

20 files changed

+55
-64
lines changed

20 files changed

+55
-64
lines changed

‎apps/docs/src/docs/components/card.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -881,15 +881,15 @@ When using card groups with footers, their content will automatically line up.
881881
This content is a little bit longer.
882882
</BCardText>
883883
<template #footer>
884-
<small class="text-muted">Last updated 3 mins ago</small>
884+
<small class="text-body-secondary">Last updated 3 mins ago</small>
885885
</template>
886886
</BCard>
887887
<BCard title="Title" img-src="https://placekitten.com/g/300/450" img-alt="Image" img-top>
888888
<BCardText>
889889
This card has supporting text below as a natural lead-in to additional content.
890890
</BCardText>
891891
<template #footer>
892-
<small class="text-muted">Last updated 3 mins ago</small>
892+
<small class="text-body-secondary">Last updated 3 mins ago</small>
893893
</template>
894894
</BCard>
895895
<BCard title="Title" img-src="https://placekitten.com/g/300/450" img-alt="Image" img-top>
@@ -898,7 +898,7 @@ When using card groups with footers, their content will automatically line up.
898898
This card has even longer content than the first to show that equal height action.
899899
</BCardText>
900900
<template #footer>
901-
<small class="text-muted">Last updated 3 mins ago</small>
901+
<small class="text-body-secondary">Last updated 3 mins ago</small>
902902
</template>
903903
</BCard>
904904
</BCardGroup>
@@ -912,7 +912,7 @@ When using card groups with footers, their content will automatically line up.
912912
This content is a little bit longer.
913913
</BCardText>
914914
<template #footer>
915-
<small class="text-muted">Last updated 3 mins ago</small>
915+
<small class="text-body-secondary">Last updated 3 mins ago</small>
916916
</template>
917917
</BCard>
918918
@@ -921,7 +921,7 @@ When using card groups with footers, their content will automatically line up.
921921
This card has supporting text below as a natural lead-in to additional content.
922922
</BCardText>
923923
<template #footer>
924-
<small class="text-muted">Last updated 3 mins ago</small>
924+
<small class="text-body-secondary">Last updated 3 mins ago</small>
925925
</template>
926926
</BCard>
927927
@@ -931,7 +931,7 @@ When using card groups with footers, their content will automatically line up.
931931
This card has even longer content than the first to show that equal height action.
932932
</BCardText>
933933
<template #footer>
934-
<small class="text-muted">Last updated 3 mins ago</small>
934+
<small class="text-body-secondary">Last updated 3 mins ago</small>
935935
</template>
936936
</BCard>
937937
</BCardGroup>
@@ -954,15 +954,15 @@ automatically line up.
954954
This content is a little bit longer.
955955
</BCardText>
956956
<template #footer>
957-
<small class="text-muted">Last updated 3 mins ago</small>
957+
<small class="text-body-secondary">Last updated 3 mins ago</small>
958958
</template>
959959
</BCard>
960960
<BCard title="Title" img-src="https://picsum.photos/300/300/?image=41" img-alt="Image" img-top>
961961
<BCardText>
962962
This card has supporting text below as a natural lead-in to additional content.
963963
</BCardText>
964964
<template #footer>
965-
<small class="text-muted">Last updated 3 mins ago</small>
965+
<small class="text-body-secondary">Last updated 3 mins ago</small>
966966
</template>
967967
</BCard>
968968
<BCard title="Title" img-src="https://picsum.photos/300/300/?image=41" img-alt="Image" img-top>
@@ -971,7 +971,7 @@ automatically line up.
971971
This card has even longer content than the first to show that equal height action.
972972
</BCardText>
973973
<template #footer>
974-
<small class="text-muted">Last updated 3 mins ago</small>
974+
<small class="text-body-secondary">Last updated 3 mins ago</small>
975975
</template>
976976
</BCard>
977977
</BCardGroup>
@@ -985,7 +985,7 @@ automatically line up.
985985
This content is a little bit longer.
986986
</BCardText>
987987
<template #footer>
988-
<small class="text-muted">Last updated 3 mins ago</small>
988+
<small class="text-body-secondary">Last updated 3 mins ago</small>
989989
</template>
990990
</BCard>
991991
@@ -994,7 +994,7 @@ automatically line up.
994994
This card has supporting text below as a natural lead-in to additional content.
995995
</BCardText>
996996
<template #footer>
997-
<small class="text-muted">Last updated 3 mins ago</small>
997+
<small class="text-body-secondary">Last updated 3 mins ago</small>
998998
</template>
999999
</BCard>
10001000
@@ -1004,7 +1004,7 @@ automatically line up.
10041004
This card has even longer content than the first to show that equal height action.
10051005
</BCardText>
10061006
<template #footer>
1007-
<small class="text-muted">Last updated 3 mins ago</small>
1007+
<small class="text-body-secondary">Last updated 3 mins ago</small>
10081008
</template>
10091009
</BCard>
10101010
</BCardGroup>
@@ -1047,7 +1047,7 @@ set them to display: inline-block as column-break-inside: avoid is not a bulletp
10471047
<BCardText>
10481048
This card has supporting text below as a natural lead-in to additional content.
10491049
</BCardText>
1050-
<BCardText class="small text-muted">Last updated 3 mins ago</BCardText>
1050+
<BCardText class="small text-body-secondary">Last updated 3 mins ago</BCardText>
10511051
</BCard>
10521052
<BCard bg-variant="primary" text-variant="white">
10531053
<blockquote class="card-blockquote">
@@ -1062,7 +1062,7 @@ set them to display: inline-block as column-break-inside: avoid is not a bulletp
10621062
<BCardText>
10631063
This card has supporting text below as a natural lead-in to additional content.
10641064
</BCardText>
1065-
<BCardText class="small text-muted">Last updated 3 mins ago</BCardText>
1065+
<BCardText class="small text-body-secondary">Last updated 3 mins ago</BCardText>
10661066
</BCard>
10671067
<BCard img-src="https://picsum.photos/400/400/?image=41" img-alt="Image" overlay />
10681068
<BCard img-src="https://picsum.photos/400/200/?image=41" img-alt="Image" img-top>
@@ -1071,7 +1071,7 @@ set them to display: inline-block as column-break-inside: avoid is not a bulletp
10711071
This card has even longer content than the first.
10721072
</BCardText>
10731073
<template #footer>
1074-
<small class="text-muted">Footer Text</small>
1074+
<small class="text-body-secondary">Footer Text</small>
10751075
</template>
10761076
</BCard>
10771077
</BCardGroup>
@@ -1104,7 +1104,7 @@ set them to display: inline-block as column-break-inside: avoid is not a bulletp
11041104
<BCardText>
11051105
This card has supporting text below as a natural lead-in to additional content.
11061106
</BCardText>
1107-
<BCardText class="small text-muted">Last updated 3 mins ago</BCardText>
1107+
<BCardText class="small text-body-secondary">Last updated 3 mins ago</BCardText>
11081108
</BCard>
11091109
11101110
<BCard bg-variant="primary" text-variant="white">
@@ -1121,7 +1121,7 @@ set them to display: inline-block as column-break-inside: avoid is not a bulletp
11211121
<BCardText>
11221122
This card has supporting text below as a natural lead-in to additional content.
11231123
</BCardText>
1124-
<BCardText class="small text-muted">Last updated 3 mins ago</BCardText>
1124+
<BCardText class="small text-body-secondary">Last updated 3 mins ago</BCardText>
11251125
</BCard>
11261126
11271127
<BCard img-src="https://picsum.photos/400/400/?image=41" img-alt="Image" overlay />
@@ -1132,7 +1132,7 @@ set them to display: inline-block as column-break-inside: avoid is not a bulletp
11321132
This card has even longer content than the first.
11331133
</BCardText>
11341134
<template #footer>
1135-
<small class="text-muted">Footer Text</small>
1135+
<small class="text-body-secondary">Footer Text</small>
11361136
</template>
11371137
</BCard>
11381138
</BCardGroup>

‎apps/docs/src/docs/components/list-group.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -502,22 +502,22 @@ help of [flexbox utility classes](/docs/reference/utility-classes).
502502
<BListGroupItem href="#" class="flex-column align-items-start">
503503
<div class="d-flex w-100 justify-content-between">
504504
<h5 class="mb-1">List Group item heading</h5>
505-
<small class="text-muted">3 days ago</small>
505+
<small class="text-body-secondary">3 days ago</small>
506506
</div>
507507
<p class="mb-1">
508508
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
509509
</p>
510-
<small class="text-muted">Donec id elit non mi porta.</small>
510+
<small class="text-body-secondary">Donec id elit non mi porta.</small>
511511
</BListGroupItem>
512512
<BListGroupItem href="#" disabled class="flex-column align-items-start">
513513
<div class="d-flex w-100 justify-content-between">
514514
<h5 class="mb-1">Disabled List Group item</h5>
515-
<small class="text-muted">3 days ago</small>
515+
<small class="text-body-secondary">3 days ago</small>
516516
</div>
517517
<p class="mb-1">
518518
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
519519
</p>
520-
<small class="text-muted">Donec id elit non mi porta.</small>
520+
<small class="text-body-secondary">Donec id elit non mi porta.</small>
521521
</BListGroupItem>
522522
</BListGroup>
523523
<template #html>
@@ -540,27 +540,27 @@ help of [flexbox utility classes](/docs/reference/utility-classes).
540540
<BListGroupItem href="#" class="flex-column align-items-start">
541541
<div class="d-flex w-100 justify-content-between">
542542
<h5 class="mb-1">List Group item heading</h5>
543-
<small class="text-muted">3 days ago</small>
543+
<small class="text-body-secondary">3 days ago</small>
544544
</div>
545545
546546
<p class="mb-1">
547547
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
548548
</p>
549549
550-
<small class="text-muted">Donec id elit non mi porta.</small>
550+
<small class="text-body-secondary">Donec id elit non mi porta.</small>
551551
</BListGroupItem>
552552
553553
<BListGroupItem href="#" disabled class="flex-column align-items-start">
554554
<div class="d-flex w-100 justify-content-between">
555555
<h5 class="mb-1">Disabled List Group item</h5>
556-
<small class="text-muted">3 days ago</small>
556+
<small class="text-body-secondary">3 days ago</small>
557557
</div>
558558
559559
<p class="mb-1">
560560
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
561561
</p>
562562
563-
<small class="text-muted">Donec id elit non mi porta.</small>
563+
<small class="text-body-secondary">Donec id elit non mi porta.</small>
564564
</BListGroupItem>
565565
</BListGroup>
566566
```

‎apps/playground/src/components/Comps/TTabs.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<BButton @click="tabIndex++">Next</BButton>
3030
</BButtonGroup>
3131

32-
<div class="text-muted">Current Tab: {{ tabIndex }}</div>
32+
<div class="text-body-secondary">Current Tab: {{ tabIndex }}</div>
3333
</div>
3434
</BCol>
3535
</BRow>

‎packages/bootstrap-vue-next/src/components/BButton/BButton.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
:aria-pressed="isToggle ? pressedBoolean : null"
88
:autocomplete="isToggle ? 'off' : null"
99
:disabled="isButton ? disabledBoolean : null"
10-
:href="props.href"
11-
:rel="computedLink ? props.rel : null"
10+
:href="href"
11+
:rel="computedLink ? rel : null"
1212
:role="nonStandardTag || computedLink ? 'button' : null"
13-
:target="computedLink ? props.target : null"
14-
:type="isButton ? props.type : null"
15-
:to="!isButton ? props.to : null"
16-
:append="computedLink ? props.append : null"
13+
:target="computedLink ? target : null"
14+
:type="isButton ? type : null"
15+
:to="!isButton ? to : null"
16+
:append="computedLink ? append : null"
1717
:active-class="isBLink ? activeClass : null"
1818
:event="isBLink ? event : null"
1919
:replace="isBLink ? replace : null"

‎packages/bootstrap-vue-next/src/components/BButton/BCloseButton.vue

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,24 @@
33
:type="type"
44
class="btn-close"
55
:disabled="disabledBoolean"
6-
:class="computedClasses"
76
:aria-label="ariaLabel"
87
@click="emit('click', $event)"
98
/>
109
</template>
1110

1211
<script setup lang="ts">
13-
import {computed} from 'vue'
1412
import type {Booleanish, ButtonType} from '../../types'
1513
import {useBooleanish} from '../../composables'
1614
1715
const props = withDefaults(
1816
defineProps<{
1917
ariaLabel?: string
2018
disabled?: Booleanish
21-
white?: Booleanish
2219
type?: ButtonType
2320
}>(),
2421
{
2522
ariaLabel: 'Close',
2623
disabled: false,
27-
white: false,
2824
type: 'button',
2925
}
3026
)
@@ -34,9 +30,4 @@ const emit = defineEmits<{
3430
}>()
3531
3632
const disabledBoolean = useBooleanish(() => props.disabled)
37-
const whiteBoolean = useBooleanish(() => props.white)
38-
39-
const computedClasses = computed(() => ({
40-
'btn-close-white': whiteBoolean.value,
41-
}))
4233
</script>

‎packages/bootstrap-vue-next/src/components/BButton/_button.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/bootstrap-vue-next/src/components/BButton/close-button.spec.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ describe('close-button', () => {
3131
expect(wrapper.attributes('aria-label')).toBe('Close')
3232
})
3333

34-
it('has class btn-close-white when prop white', () => {
35-
const wrapper = mount(BCloseButton, {
36-
props: {white: true},
37-
})
38-
expect(wrapper.classes()).toContain('btn-close-white')
39-
})
40-
4134
it('has attr disabled when prop disabled', async () => {
4235
const wrapper = mount(BCloseButton, {
4336
props: {disabled: true},

‎packages/bootstrap-vue-next/src/components/BCard/BCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const props = withDefaults(
150150
noBody: false,
151151
overlay: false,
152152
subtitleTag: 'h6',
153-
subtitleTextVariant: 'muted',
153+
subtitleTextVariant: 'body-secondary',
154154
tag: 'div',
155155
titleTag: 'h4',
156156
}

‎packages/bootstrap-vue-next/src/components/BCard/BCardSubtitle.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const props = withDefaults(
1818
}>(),
1919
{
2020
tag: 'h6',
21-
textVariant: 'muted',
21+
textVariant: 'body-secondary',
2222
text: undefined,
2323
}
2424
)

‎packages/bootstrap-vue-next/src/components/BCard/card-subtitle.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ describe('card-subtitle', () => {
5656
expect(wrapper.classes()).toContain('text-primary')
5757
await wrapper.setProps({textVariant: undefined})
5858
expect(wrapper.classes()).not.toContain('text-primary')
59-
expect(wrapper.classes()).toContain('text-muted')
59+
expect(wrapper.classes()).toContain('text-body-secondary')
6060
})
6161
})

‎packages/bootstrap-vue-next/src/components/BDropdown/BDropdownText.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<li role="presentation">
3-
<p class="px-4 py-1 mb-0 text-muted">
3+
<p class="px-4 py-1 mb-0 text-body-secondary">
44
<slot>
55
{{ text }}
66
</slot>

‎packages/bootstrap-vue-next/src/components/BDropdown/dropdown-text.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ describe('dropdown-text', () => {
3333
expect($p.classes()).toContain('mb-0')
3434
})
3535

36-
it('child p tag has static class text-muted', () => {
36+
it('child p tag has static class text-body-secondary', () => {
3737
const wrapper = mount(BDropdownText)
3838
const $p = wrapper.get('p')
39-
expect($p.classes()).toContain('text-muted')
39+
expect($p.classes()).toContain('text-body-secondary')
4040
})
4141

4242
it('child p tag has static class py-1', () => {

‎packages/bootstrap-vue-next/src/components/BForm/BFormText.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const props = withDefaults(
2424
id: undefined,
2525
text: undefined,
2626
tag: 'small',
27-
textVariant: 'muted',
27+
textVariant: 'body-secondary',
2828
}
2929
)
3030

‎packages/bootstrap-vue-next/src/components/BForm/form-text.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('form-text', () => {
3232
})
3333
expect(wrapper.classes()).toContain('text-danger')
3434
await wrapper.setProps({textVariant: undefined})
35-
expect(wrapper.classes()).toContain('text-muted')
35+
expect(wrapper.classes()).toContain('text-body-secondary')
3636
})
3737

3838
it('has attr id when prop id', async () => {

‎packages/bootstrap-vue-next/src/components/BFormTags/BFormTags.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@
101101
<div v-if="isInvalid" class="d-block invalid-feedback">
102102
{{ invalidTagText }}: {{ inputValue }}
103103
</div>
104-
<small v-if="isDuplicate" class="form-text text-muted"
104+
<small v-if="isDuplicate" class="form-text text-body-secondary"
105105
>{{ duplicateTagText }}: {{ inputValue }}</small
106106
>
107-
<small v-if="tags.length === limit" class="form-text text-muted">Tag limit reached</small>
107+
<small v-if="tags.length === limit" class="form-text text-body-secondary"
108+
>Tag limit reached</small
109+
>
108110
</div>
109111
</slot>
110112
<template v-if="name">

0 commit comments

Comments
 (0)