Skip to content

Bootstrap 5: Close button #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonahtanjz merged 3 commits into from
Apr 9, 2022
Merged

Bootstrap 5: Close button #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36bc8f4
close button: migrate TipBox
jovyntls Apr 7, 2022
79db03f
close button: migrate Modal
jovyntls Apr 7, 2022
de99e50
Linting
jovyntls Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/vue-components/src/Modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
</h5>
<button
type="button"
class="close"
class="btn-close"
aria-label="Close"
@click="close()"
>
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
Expand Down
20 changes: 12 additions & 8 deletions packages/vue-components/src/TipBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@
<button
v-if="dismissible"
type="button"
class="close close-with-heading"
data-dismiss="alert"
class="btn-close close-with-heading"
data-bs-dismiss="alert"
aria-label="Close"
>
<span aria-hidden="true">&times;</span>
</button>
</div>

Expand Down Expand Up @@ -98,11 +97,10 @@
<button
v-if="dismissible && !headerBool()"
type="button"
class="close"
data-dismiss="alert"
class="btn-close"
data-bs-dismiss="alert"
aria-label="Close"
>
<span aria-hidden="true">&times;</span>
</button>
</div>
</div>
Expand Down Expand Up @@ -346,14 +344,20 @@ export default {
}

.close-with-heading {
top: auto;
padding: 0 1.25rem;
top: 0;
right: 0;
position: absolute;
padding: 1rem;
}

.close-with-heading > span {
vertical-align: text-top;
}

.alert-dismissible .btn-close {
padding: 1rem;
}

.contents > :last-child {
margin-bottom: 0;
}
Expand Down
60 changes: 12 additions & 48 deletions packages/vue-components/src/__tests__/__snapshots__/Modal.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,9 @@ exports[`Modal can be centered 1`] = `

<button
aria-label="Close"
class="close"
class="btn-close"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
/>
</div>

<div
Expand Down Expand Up @@ -129,15 +123,9 @@ exports[`Modal can be large 1`] = `

<button
aria-label="Close"
class="close"
class="btn-close"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
/>
</div>

<div
Expand Down Expand Up @@ -207,15 +195,9 @@ exports[`Modal can be small 1`] = `

<button
aria-label="Close"
class="close"
class="btn-close"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
/>
</div>

<div
Expand Down Expand Up @@ -285,15 +267,9 @@ exports[`Modal should be closable by clicking the backdrop by default 1`] = `

<button
aria-label="Close"
class="close"
class="btn-close"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
/>
</div>

<div
Expand Down Expand Up @@ -431,15 +407,9 @@ exports[`Modal should not be closable by clicking the backdrop if backdrop is se

<button
aria-label="Close"
class="close"
class="btn-close"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
/>
</div>

<div
Expand Down Expand Up @@ -509,15 +479,9 @@ exports[`Modal should not show footer when no footer is given 1`] = `

<button
aria-label="Close"
class="close"
class="btn-close"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
/>
</div>

<div
Expand Down
12 changes: 3 additions & 9 deletions packages/vue-components/src/__tests__/__snapshots__/TipBox.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,16 +755,10 @@ exports[`TipBox with dismissible option renders correctly 1`] = `

<button
aria-label="Close"
class="close"
data-dismiss="alert"
class="btn-close"
data-bs-dismiss="alert"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
/>
</div>
</div>
</div>
Expand Down