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.

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

Jump to bottom

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

Merged
merged 19 commits into from
May 12, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
998d170
Merge pull request #1 from OrchardCMS/main
MikeAlhayek Nov 13, 2021
70b66d3
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Dec 1, 2021
d1c31d2
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Dec 23, 2021
d277228
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Dec 28, 2021
718b31f
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 4, 2022
40b4803
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 5, 2022
25ea712
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 16, 2022
bd905ca
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Jan 20, 2022
295b392
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Feb 23, 2022
7ac581c
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Apr 20, 2022
e4d5a2b
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Apr 22, 2022
0d02eb3
Merge branch 'OrchardCMS:main' into main
MikeAlhayek Apr 27, 2022
4df6578
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 1, 2022
d46460c
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 10, 2022
606d821
Merge branch 'OrchardCMS:main' into main
MikeAlhayek May 10, 2022
85193c6
fix missed classes
malhayek2014 May 12, 2022
cd0ecec
Improve the group shape
malhayek2014 May 12, 2022
a3471ed
restore Message view
malhayek2014 May 12, 2022
2fc7449
Update Message.cshtml
sebastienros May 12, 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
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/SelectPart.Fields.Edit.cshtml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml
View file
Open in desktop
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
25 changes: 17 additions & 8 deletions src/OrchardCore/OrchardCore.DisplayManagement/Shapes/GroupShapes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,29 +81,38 @@ 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 headerArrowTag = new TagBuilder("div");
headerArrowTag.AddCssClass("card-header");
headerArrowTag.Attributes["id"] = $"heading-{cardIdPrefix}";

var headerTitleTag = new TagBuilder("h5");
headerTitleTag.AddCssClass("float-start mb-0 mt-1");
headerTitleTag.InnerHtml.Append(shape.Grouping.Key);

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

buttonTag.InnerHtml.Append(shape.Grouping.Key);
headerTag.InnerHtml.AppendHtml(buttonTag);
var buttonIconTag = new TagBuilder("i");
buttonIconTag.AddCssClass("fa-solid fa-angle-down");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we remove the extra lines here?


buttonTag.InnerHtml.AppendHtml(buttonIconTag);

headerArrowTag.InnerHtml.AppendHtml(headerTitleTag);
headerArrowTag.InnerHtml.AppendHtml(buttonTag);

var bodyTag = new TagBuilder("div");
bodyTag.AddCssClass("collapse show");
bodyTag.Attributes["id"] = $"collapse-{cardIdPrefix}";

bodyTag.InnerHtml.AppendHtml(tagBuilder);
cardTag.InnerHtml.AppendHtml(headerTag);
cardTag.InnerHtml.AppendHtml(headerArrowTag);
cardTag.InnerHtml.AppendHtml(bodyTag);

return cardTag;
Expand Down