Fix admin UI regressions (#11495)

OrchardCMS · Apr 5, 2022 · 361dc89 · 361dc89
1 parent 5d3cdca
commit 361dc89
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 32 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/UserMenu.cshtml
@@ -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">
             <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>

diff --git a/src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/_layout.scss b/src/OrchardCore.Themes/TheAdmin/Assets/scss/modules/_layout.scss
@@ -164,3 +164,7 @@ svg {
         right: calc(-14px + 50%);
     }
 }
+
+.unset{
+    all: unset;
+}
diff --git a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
@@ -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>
                     }
@@ -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>

diff --git a/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css b/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }

diff --git a/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.min.css b/src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.min.css