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

Improve AdminDashboard Styling #14593

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Improve AdminDashboard Styling #14593

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
41 changes: 10 additions & 31 deletions src/OrchardCore.Modules/OrchardCore.AdminDashboard/Assets/scss/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,44 +68,23 @@

.dashboard-wrapper.ui-resizable {
overflow-y: hidden;
overflow-x: hidden;
}
}

.dashboard-meta {
padding-left: 20px;
padding-right: 20px;

&:first-child {
padding-top: 12px;
.dashboard-wrapper:not(.ui-resizable) {
scrollbar-width: thin;
overflow-y: auto;
overflow-x: hidden;
}
}

@include color-mode(light) {
& .dashboard-wrapper {
& .card {
& .card-header {
background-color: #fff !important;
}

& .card-footer {
background-color: #fff !important;
}
}
}
.dashboard-body-container {
scrollbar-width: thin;
overflow-y: auto;
}

@include color-mode(dark) {
& .dashboard-wrapper {
& .card {
& .card-header {
background-color: rgb(24, 26, 27) !important;
}

& .card-footer {
background-color: rgb(24, 26, 27) !important;
}
}
}
.dashboard-meta {
padding: 0.5rem !important;
}

.dashboard-handle {
Expand Down
7 changes: 2 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard.Wrapper.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@

@{
var dashboardPart = Model.Dashboard.As<DashboardPart>();
var position = dashboardPart.Position;
var width = dashboardPart.Width;
var height = dashboardPart.Height;
var contentItemId = Model.Dashboard.ContentItemId;
}
<div style="--dashboard-width: @(width); --dashboard-height:@(height)" class="dashboard-wrapper" id="@(contentItemId)" >

<div style="--dashboard-width: @(dashboardPart.Width); --dashboard-height: @(dashboardPart.Height);" class="dashboard-wrapper rounded" id="@(Model.Dashboard.ContentItemId)">
@await DisplayAsync(Model.Content)
</div>
18 changes: 9 additions & 9 deletions src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardWidget.DetailAdmin.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="card h-100 @string.Join(" ", Model.Classes.ToArray())">
<div class="card h-100 @string.Join(' ', Model.Classes.ToArray())">
@if (Model.Header != null || Model.Leading != null || Model.ActionsMenu != null)
{
<div class="card-header">
Expand All @@ -17,14 +17,14 @@
}
</div>
}
@if (Model.Tags != null || Model.Meta != null)
{
<div class="dashboard-meta">
@await DisplayAsync(Model.Meta)
@await DisplayAsync(Model.Tags)
</div>
}
<div class="card-body p-0">
<div class="dashboard-body-container card-body p-0 h-100">
@if (Model.Tags != null || Model.Meta != null)
{
<div class="dashboard-meta">
@await DisplayAsync(Model.Meta)
@await DisplayAsync(Model.Tags)
</div>
}
@await DisplayAsync(Model.Content)
</div>
@if (Model.Footer != null)
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/TitlePart.DetailAdmin.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<h5 style="display:inline-block">@Model.ContentItem.DisplayText</h5>
<h5 class="d-inline mb-0">@Model.ContentItem.DisplayText</h5>
27 changes: 10 additions & 17 deletions src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,21 @@
}
.dashboard-container .dashboard-wrapper.ui-resizable {
overflow-y: hidden;
overflow-x: hidden;
}

.dashboard-meta {
padding-left: 20px;
padding-right: 20px;
}
.dashboard-meta:first-child {
padding-top: 12px;
.dashboard-container .dashboard-wrapper:not(.ui-resizable) {
scrollbar-width: thin;
overflow-y: auto;
overflow-x: hidden;
}

[data-bs-theme=light] .dashboard-wrapper .card .card-header {
background-color: #fff !important;
}
[data-bs-theme=light] .dashboard-wrapper .card .card-footer {
background-color: #fff !important;
.dashboard-body-container {
scrollbar-width: thin;
overflow-y: auto;
}

[data-bs-theme=dark] .dashboard-wrapper .card .card-header {
background-color: rgb(24, 26, 27) !important;
}
[data-bs-theme=dark] .dashboard-wrapper .card .card-footer {
background-color: rgb(24, 26, 27) !important;
.dashboard-meta {
padding: 0.5rem !important;
}

.dashboard-handle {
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AdminDashboard/wwwroot/Styles/dashboard.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading