Skip to content

Commit d5e77b6

Browse files
committed
Layout improvement
1 parent 3403597 commit d5e77b6

File tree

16 files changed

+96
-255
lines changed

16 files changed

+96
-255
lines changed

Blogifier.Web/Views/Account/ChangePassword.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
bool demo = config.GetSetting("Demo") == "true" && !Model.Profile.IsAdmin;
99
}
1010

11-
<div class="bf-settings bf-settings-boxed bf-settings-changepassword" data-page-title="@ViewData["Title"]">
11+
<div class="bf-content bf-content-boxed bf-settings" data-page-title="@ViewData["Title"]">
1212
<div class="bf-title"><span>@ViewData["Title"]</span></div>
1313
@Html.Partial("_StatusMessage", Model.StatusMessage)
1414
<form method="post">

Blogifier.Web/Views/Blogifier/Admin/Settings/About.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
77
}
88

9-
<div class="bf-settings bf-settings-boxed bf-settings-about mx-auto">
9+
<div class="bf-content bf-content-boxed bf-settings bf-settings-about mx-auto">
1010

1111
<div class="text-center pt-5">
1212
<p class="mb-3">

Blogifier.Web/Views/Blogifier/Admin/Settings/Advanced.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ViewData["Title"] = "Avanced Settings";
55
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
66
}
7-
<div class="bf-settings bf-settings-boxed">
7+
<div class="bf-content bf-content-boxed bf-settings">
88
<div class="bf-title"><span>Import & Export</span></div>
99
<div class="btn-group d-flex" role="group">
1010
<button type="button" class="btn btn-outline-primary w-100" data-toggle="modal" data-target="#importRss">Import RSS</button>

Blogifier.Web/Views/Blogifier/Admin/Settings/General.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
66
}
77
<form method="post" asp-controller="Settings" asp-action="General" asp-antiforgery="true">
8-
<div class="bf-settings bf-settings-boxed bf-settings-appsettings">
8+
<div class="bf-content bf-content-boxed bf-settings">
99
<div class="bf-title d-none d-lg-block"><span>@ViewData["Title"]</span></div>
1010
<div class="form-group">
1111
<label class="form-group-label">Title</label>

Blogifier.Web/Views/Blogifier/Admin/Settings/Posts.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ViewData["Title"] = "Posts Settings";
55
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
66
}
7-
<div class="bf-settings bf-settings-boxed bf-settings-import">
7+
<div class="bf-content bf-content-boxed bf-settings">
88
<div class="bf-title d-none d-lg-block"><span>@ViewData["Title"]</span></div>
99
<form method="post" asp-controller="Settings" asp-action="Posts" asp-antiforgery="true">
1010
<div class="form-group">

Blogifier.Web/Views/Blogifier/Admin/Settings/Profile.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Settings.cshtml";
66
if (!Model.CustomFields.ContainsKey("SendGridApiKey")) { Model.CustomFields.Add("SendGridApiKey", ""); }
77
}
8-
<div class="bf-settings bf-settings-boxed bf-settings-profile">
8+
<div class="bf-content bf-content-boxed bf-settings">
99
<div class="bf-title d-none d-lg-block"><span>@ViewData["Title"]</span></div>
1010
<form method="post" asp-controller="Settings" asp-action="Profile" asp-antiforgery="true">
1111
<div class="form-group">

Blogifier.Web/Views/Blogifier/Admin/Settings/Users.cshtml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
var cntFrom = pgr.CurrentPage == 1 ? 1 : (pgr.CurrentPage - 1) * pgr.ItemsPerPage + 1;
1111
var cntTo = pgr.CurrentPage * pgr.ItemsPerPage < pgr.Total ? pgr.CurrentPage * pgr.ItemsPerPage : pgr.Total;
1212
}
13-
<div class="bf-settings bf-settings-users">
14-
13+
<div class="bf-settings">
1514
<div class="bf-toolbar d-flex">
1615
<label class="custom-control custom-checkbox my-auto mr-3"><input class="custom-control-input item-checkbox" type="checkbox" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
1716
<button type="button" class="btn btn-primary btn-rounded btn-sm mr-3" data-toggle="modal" data-target="#createUserModal">Create User</button>
1817
<button type="button" id="userActionButtons" class="btn btn-outline-secondary btn-rounded btn-sm btn-icon mr-3" disabled="disabled" data-tooltip onclick="return usersController.removeUser()" title="Delete"><i class="fa fa-trash"></i></button>
1918
<div class="loading loading-sm"><div class="loading-dot-1"></div><div class="loading-dot-2"></div><div class="loading-dot-3"></div></div>
2019
</div>
21-
2220
<ul class="bf-users-list d-block" aria-label="posts">
2321
@foreach (var blog in Model.Blogs)
2422
{
@@ -33,7 +31,6 @@
3331
</li>
3432
}
3533
</ul>
36-
3734
@if (pgr.ShowNewer || pgr.ShowOlder)
3835
{
3936
<ul class="bf-posts-pagination">
@@ -48,8 +45,6 @@
4845
<li class="item"><a class="item-count">@cntFrom-@cntTo out of @pgr.Total</a></li>
4946
</ul>
5047
}
51-
52-
5348
</div>
5449

5550
<!-- Create User Modal -->

Blogifier.Web/Views/Blogifier/Admin/_Layout/_Settings.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Layout.cshtml";
44
}
55
<div class="bf-header d-flex d-lg-none">@ViewData["Title"] <i class="fa fa-chevron-down"></i></div>
6-
<div class="bf-body">
6+
<div class="bf-main">
77
<div class="bf-sidebar d-lg-block">
88
<div class="bf-settings-sidebar">
99
@if (Model.Profile.IsAdmin)
@@ -44,7 +44,7 @@
4444
}
4545
</div>
4646
</div>
47-
<div class="bf-content">
47+
<div class="bf-body">
4848
@RenderBody()
4949
</div>
5050
</div>

Blogifier.Web/wwwroot/admin/css/styles.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Blogifier.Web/wwwroot/admin/scss/layouts/_bf.scss

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,25 @@
55
padding-left: $width-taskbar;
66
}
77
}
8+
9+
.bf-main {
10+
position: relative;
11+
@media screen and (min-width: 992px) {
12+
min-height: 100%;
13+
padding-left: $width-sidebar;
14+
}
15+
}
16+
17+
.bf-body {
18+
width: 100%;
19+
}
20+
21+
.bf-content {
22+
padding: 2rem;
23+
@media screen and (min-width:992px) {
24+
&-boxed {
25+
max-width: 38rem;
26+
width: 100%;
27+
}
28+
}
29+
}

0 commit comments

Comments
 (0)