Skip to content
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.

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

Fix some bootstrap 5 left after migration from bootstrap 4 #11683

Merged
merged 19 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<script type="text/x-template" id="select-options-modal" asp-name="select-options-modal" at="Foot">
<div>
<transition v-on:enter="showStart" v-on:after-enter="showEnd" v-on:leave="showEnd" v-on:after-leave="showStart" >
<div class="modal fade text-left" role="dialog" aria-hidden="true" ref="modal" v-if="showModal" v-on:click.self="$emit('modal-cancel')" >
<div class="modal fade text-start" role="dialog" aria-hidden="true" ref="modal" v-if="showModal" v-on:click.self="$emit('modal-cancel')" >
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
</script>

<script type="text/x-template" id="parameters-modal">
<div class="modal fade @Html.IdFor(m => m)-ModalBody text-left" role="dialog" aria-hidden="true">
<div class="modal fade @Html.IdFor(m => m)-ModalBody text-start" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
Expand Down
4 changes: 4 additions & 0 deletions src/OrchardCore.Themes/TheAdmin/Views/Message.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
@{
if (Model.Type == null)
{
return;
}
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved
string type = Model.Type.ToString().ToLowerInvariant();
}
<div class="alert alert-dismissible fade show message-@type" role="alert">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ public async Task<IHtmlContent> Card(IDisplayHelper displayAsync, GroupingViewMo
var cardIdPrefix = $"card-{shape.Identifier}-{shape.Grouping.Key}".HtmlClassify();

var cardTag = new TagBuilder("div");
cardTag.AddCssClass("card");
cardTag.AddCssClass("card mb-2");

var headerTag = new TagBuilder("div");
headerTag.AddCssClass("card-header");
headerTag.Attributes["id"] = $"heading-{cardIdPrefix}";

var buttonTag = new TagBuilder("button");
buttonTag.AddCssClass("btn btn-link btn-block text-left");
buttonTag.AddCssClass("btn btn-link btn-block text-start");
buttonTag.Attributes["type"] = "button";
buttonTag.Attributes["data-bs-toggle"] = "collapse";
buttonTag.Attributes["data-bs-target"] = $"#collapse-{cardIdPrefix}";
Expand Down