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

Fix admin menu background color on small screen. #14434

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Fix admin menu background color on small screen. #14434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion src/OrchardCore.Themes/TheAdmin/Assets/scss/components/_sidebar-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,9 @@ body:not(.left-sidebar-compact) {

// fixing a flickering that occurs on compact leftbar while icons load.
html:not(.fontawesome-i2svg-complete) #left-nav ul.menu-admin > li > .item-label {
background-color: $gray-100 !important;
background-color: var(--oc-admin-menu-bg-color, $gray-100) !important;
}

// Layout 5 : leftbar compactor button
// -----------------------------------
.leftbar-compactor {
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Themes/TheAdmin/Assets/scss/themes/dark/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

@include color-mode(dark) {
--oc-scrollbar-color: #76787A;
--oc-admin-menu-bg-color: var(--bs-dark-bg);
--oc-admin-menu-bg-color: var(--bs-dark);

@import "badge";
@import "bootstrap-select";
Expand Down
10 changes: 6 additions & 4 deletions src/OrchardCore.Themes/TheAdmin/Views/Layout-Login.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
</head>
<body>
<div class="d-flex align-items-center justify-content-center h-100">
@await RenderSectionAsync("Header", required: false)
@await RenderSectionAsync("Messages", required: false)
<div class="container-fluid">
@await RenderSectionAsync("Header", required: false)
@await RenderSectionAsync("Messages", required: false)

<div class="auth-wrapper">
@await RenderBodyAsync()
<div class="auth-wrapper">
@await RenderBodyAsync()
</div>
</div>
</div>

Expand Down
4 changes: 2 additions & 2 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 @@ -9272,7 +9272,7 @@ body:not(.left-sidebar-compact) #ta-left-sidebar #filter:focus {
}

html:not(.fontawesome-i2svg-complete) #left-nav ul.menu-admin > li > .item-label {
background-color: #f8f9fa !important;
background-color: var(--oc-admin-menu-bg-color, #f8f9fa) !important;
}

.leftbar-compactor {
Expand Down Expand Up @@ -9751,7 +9751,7 @@ textarea.form-control.input-validation-error {

[data-bs-theme=dark] {
--oc-scrollbar-color: #76787A;
--oc-admin-menu-bg-color: var(--bs-dark-bg);
--oc-admin-menu-bg-color: var(--bs-dark);
}
[data-bs-theme=dark] .ta-badge {
background-color: var(--bs-dark);
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.min.css
View file
Open in desktop

Large diffs are not rendered by default.