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 admin UI regressions #11495

Merged
merged 2 commits into from
Apr 5, 2022
Merged

Fix admin UI regressions #11495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31c3d41
Fix admin UI regressions
Skrypt Apr 5, 2022
aaa6b33
eof
Skrypt Apr 5, 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
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@inject IAuthorizationService AuthorizationService
<div class="dropdown">
<form asp-route-area="OrchardCore.Users" asp-controller="Account" asp-action="LogOff" method="post" class="form-inline no-multisubmit">
<button type="button" class="ml-3 dropdown-toggle" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle-tooltip="tooltip" title="@User.Identity.Name">
<button class="unset ml-3 dropdown-toggle" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle-tooltip="tooltip" title="@User.Identity.Name">
Copy link
Member

Choose a reason for hiding this comment

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

While type doesn't seem to be required, it's good to include it. Also see: https://dev.to/clairecodes/why-its-important-to-give-your-html-button-a-type-58k9

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think you are right. My mistake. I will create another PR.

<i class="fa fa-fw fa-user" aria-hidden="true"></i>
<span>@T[User.Identity.Name]</span>
<span class="d-none">@T[User.Identity.Name]</span>
</button>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<h6 class="dropdown-header">@T["Signed in as"]<span class="ml-1 font-weight-bold">@User.Identity.Name</span></h6>
Expand Down
4 changes: 4 additions & 0 deletions src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,7 @@ svg {
right: calc(-14px + 50%);
}
}

.unset{
all: unset;
}
8 changes: 4 additions & 4 deletions src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@
@await RenderSectionAsync("NavbarTop", required: false)
@if (adminSettings.DisplayDarkMode)
{
<button type="button" id="btn-darkmode" class="ml-3" data-toggle="tooltip" title="@(darkMode ? T["Light mode"] : T["Dark mode"])">
<button id="btn-darkmode" class="unset ml-3" data-toggle="tooltip" title="@(darkMode ? T["Light mode"] : T["Dark mode"])">
@if (darkMode)
{
<i class="fas fa-sun" aria-hidden="true"></i>
<span>@T["Light mode"]</span>
<span class="d-none">@T["Light mode"]</span>
}
else
{
<i class="fas fa-moon" aria-hidden="true"></i>
<span>@T["Dark mode"]</span>
<span class="d-none">@T["Dark mode"]</span>
}
</button>
}
Expand All @@ -68,7 +68,7 @@
@await RenderSectionAsync("Navigation", required: false)
<div class="footer">
<button type="button" class="leftbar-compactor" title="@T["Collapse / expand menu"]">
<span>@T["Collapse / expand menu"]</span>
<span class="d-none">@T["Collapse / expand menu"]</span>
</button>
</div>
</div>
Expand Down
30 changes: 6 additions & 24 deletions src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22138,15 +22138,6 @@ a[dir]:root[data-theme=default] .badge-dark:focus, a[data-theme=default][dir]:ro
color: #495057;
text-decoration: none;
}
:root[data-theme=default] .ta-navbar-top button {
border: 0;
background-color: transparent;
color: #495057;
padding: 0;
}
:root[data-theme=default] .ta-navbar-top button.ml-3 > span {
display: none;
}
[dir]:root[data-theme=default] .ta-badge {
background-color: #e9ecef;
}
Expand Down Expand Up @@ -23223,9 +23214,6 @@ a[dir]:root[data-theme=default] .badge-dark:focus, a[data-theme=default][dir]:ro
transition-duration: 0.2s;
transform: scale(2, 1);
}
[dir]:root[data-theme=default] button.leftbar-compactor > span {
display: none;
}
[dir=ltr]:root[data-theme=default] .leftbar-compactor {
float: right;
}
Expand Down Expand Up @@ -23383,6 +23371,9 @@ a[dir]:root[data-theme=default] .badge-dark:focus, a[data-theme=default][dir]:ro
:root[data-theme=default] [dir=rtl] .btn-dropdown > .btn-group {
right: calc(-14px + 50%);
}
:root[data-theme=default] .unset {
all: unset;
}
[dir]:root[data-theme=default] .bg-primary {
background-color: #f8f9fa !important;
}
Expand Down Expand Up @@ -45617,15 +45608,6 @@ a[dir]:root[data-theme=darkmode] .badge-dark:focus, a[dir]:root[data-theme=darkm
color: #dee2e6;
text-decoration: none;
}
:root[data-theme=darkmode] .ta-navbar-top button {
border: 0;
background-color: transparent;
color: #dee2e6;
padding: 0;
}
:root[data-theme=darkmode] .ta-navbar-top button.ml-3 > span {
display: none;
}
[dir]:root[data-theme=darkmode] .ta-badge {
background-color: #0c0d0e;
}
Expand Down Expand Up @@ -46702,9 +46684,6 @@ a[dir]:root[data-theme=darkmode] .badge-dark:focus, a[dir]:root[data-theme=darkm
transition-duration: 0.2s;
transform: scale(2, 1);
}
[dir]:root[data-theme=darkmode] button.leftbar-compactor > span {
display: none;
}
[dir=ltr]:root[data-theme=darkmode] .leftbar-compactor {
float: right;
}
Expand Down Expand Up @@ -46862,6 +46841,9 @@ a[dir]:root[data-theme=darkmode] .badge-dark:focus, a[dir]:root[data-theme=darkm
:root[data-theme=darkmode] [dir=rtl] .btn-dropdown > .btn-group {
right: calc(-14px + 50%);
}
:root[data-theme=darkmode] .unset {
all: unset;
}
[dir]:root[data-theme=darkmode] .bg-primary {
background-color: #1b1e1f !important;
}
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.min.css
View file
Open in desktop

Large diffs are not rendered by default.