Skip to content

Commit a94e80c

Browse files
linkdotnetlinkdotnet
committed
Fix non-index pages to be under navbar
1 parent a7adc6a commit a94e80c

File tree

9 files changed

+83
-63
lines changed

9 files changed

+83
-63
lines changed

‎LinkDotNet.Blog.Web/Pages/Admin/CreateNewBlogPostPage.razor

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
@inject IRepository repository
88
@inject IToastService toastService
99

10-
<CreateNewBlogPost Title="Create new BlogPost" OnBlogPostCreated="@(StoreBlogPostAsync)" ></CreateNewBlogPost>
10+
<div class="page">
11+
<CreateNewBlogPost Title="Create new BlogPost" OnBlogPostCreated="@(StoreBlogPostAsync)" ></CreateNewBlogPost>
12+
</div>
1113

1214
@code {
1315
private async Task StoreBlogPostAsync(BlogPost blogPost)

‎LinkDotNet.Blog.Web/Pages/Admin/DraftBlogPosts.razor

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
@using LinkDotNet.Domain
44
@attribute [Authorize]
55
@inject IRepository repository
6-
<h3>Draft Blog Posts</h3>
76

8-
<div class="content px-4">
9-
@for (var i = 0; i < blogPosts.Count; i++)
10-
{
11-
<ShortBlogPost BlogPost="blogPosts[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
12-
}
7+
<div class="page">
8+
<h3>Draft Blog Posts</h3>
9+
10+
<div class="content px-4">
11+
@for (var i = 0; i < blogPosts.Count; i++)
12+
{
13+
<ShortBlogPost BlogPost="blogPosts[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
14+
}
15+
</div>
1316
</div>
1417

1518
@code {

‎LinkDotNet.Blog.Web/Pages/Admin/UpdateBlogPostPage.razor

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@
77
@inject IRepository repository
88
@inject IToastService toastService
99

10-
@if (blogPostFromDb != null)
11-
{
12-
<CreateNewBlogPost
13-
Title="Update BlogPost"
14-
BlogPost="@blogPostFromDb"
15-
OnBlogPostCreated="StoreBlogPostAsync"
16-
ClearAfterCreated="false"></CreateNewBlogPost>
17-
}
18-
else
19-
{
20-
<p>Loading...</p>
21-
}
10+
<div class="page">
11+
@if (blogPostFromDb != null)
12+
{
13+
<CreateNewBlogPost
14+
Title="Update BlogPost"
15+
BlogPost="@blogPostFromDb"
16+
OnBlogPostCreated="StoreBlogPostAsync"
17+
ClearAfterCreated="false"></CreateNewBlogPost>
18+
}
19+
else
20+
{
21+
<p>Loading...</p>
22+
}
23+
</div>
2224

2325
@code {
2426
[Parameter]

‎LinkDotNet.Blog.Web/Pages/BlogPostPage.razor

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,40 @@
88
@inject IJSRuntime jsRuntime
99
@inherits MarkdownComponentBase
1010

11-
@if (BlogPost == null)
12-
{
13-
<h3>Loading...</h3>
14-
}
15-
else
16-
{
17-
<Title>@BlogPost.Title</Title>
18-
<OgData Title="@BlogPost.Title"
19-
AbsolutePreviewImageUrl="@BlogPost.PreviewImageUrl"
20-
Description="@(Markdown.ToPlainText(BlogPost.ShortDescription))"
21-
Keywords="@Tags"></OgData>
22-
<div class="blog-outer-box">
23-
<div class="content blog-container">
24-
<div class="blog-content">
25-
<header>
26-
<h1>@BlogPost.Title</h1></header>
27-
<div class="blogpost-date">
28-
@BlogPost.UpdatedDate.ToString("dd/MM/yyyy")
29-
</div>
11+
<div class="page">
12+
@if (BlogPost == null)
13+
{
14+
<h3>Loading...</h3>
15+
}
16+
else
17+
{
18+
<Title>@BlogPost.Title</Title>
19+
<OgData Title="@BlogPost.Title"
20+
AbsolutePreviewImageUrl="@BlogPost.PreviewImageUrl"
21+
Description="@(Markdown.ToPlainText(BlogPost.ShortDescription))"
22+
Keywords="@Tags"></OgData>
23+
<div class="blog-outer-box">
24+
<div class="content blog-container">
25+
<div class="blog-content">
26+
<header>
27+
<h1>@BlogPost.Title</h1></header>
28+
<div class="blogpost-date">
29+
@BlogPost.UpdatedDate.ToString("dd/MM/yyyy")
30+
</div>
3031

31-
<div class="admin-action">
32-
<BlogPostAdminActions BlogPostId="@BlogPostId"></BlogPostAdminActions>
33-
</div>
32+
<div class="admin-action">
33+
<BlogPostAdminActions BlogPostId="@BlogPostId"></BlogPostAdminActions>
34+
</div>
3435

35-
<div class="blogpost-content">
36-
@(RenderMarkupString(BlogPost.Content))
36+
<div class="blogpost-content">
37+
@(RenderMarkupString(BlogPost.Content))
38+
</div>
3739
</div>
40+
<Like BlogPost="@BlogPost" OnBlogPostLiked="@UpdateLikes"></Like>
3841
</div>
39-
<Like BlogPost="@BlogPost" OnBlogPostLiked="@UpdateLikes"></Like>
4042
</div>
41-
</div>
42-
}
43+
}
44+
</div>
4345

4446
@code {
4547
[Parameter]

‎LinkDotNet.Blog.Web/Pages/Index.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</div>
1616
</section>
1717

18-
<section>
18+
<section class="introduction">
1919
<IntroductionCard Introduction="appConfiguration.Introduction"></IntroductionCard>
2020
</section>
2121

‎LinkDotNet.Blog.Web/Pages/Search.razor

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
@using LinkDotNet.Infrastructure.Persistence
33
@using LinkDotNet.Domain
44
@inject IRepository repository
5-
<h3>Results for @SearchTerm</h3>
65

7-
<div class="content px-4">
8-
@for (var i = 0; i < blogPosts.Count; i++)
9-
{
10-
<ShortBlogPost BlogPost="blogPosts[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
11-
}
12-
</div>
6+
<div class="page">
7+
<h3>Results for @SearchTerm</h3>
138

9+
<div class="content px-4">
10+
@for (var i = 0; i < blogPosts.Count; i++)
11+
{
12+
<ShortBlogPost BlogPost="blogPosts[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
13+
}
14+
</div>
15+
</div>
1416
@code {
1517
[Parameter]
1618
public string SearchTerm { get; set; }

‎LinkDotNet.Blog.Web/Pages/SearchByTag.razor

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
@inject IRepository repository
66

77
<Title>Search for tag: @Tag</Title>
8-
<h3>All posts with Tag <em>@Tag</em></h3>
98

10-
@for (var i = 0; i < blogPosts.Count; i++)
9+
<div class="page">
10+
<h3>All posts with Tag <em>@Tag</em></h3>
11+
12+
@for (var i = 0; i < blogPosts.Count; i++)
1113
{
1214
<ShortBlogPost BlogPost="blogPosts[i]" UseAlternativeStyle="@(i % 2 != 0)"></ShortBlogPost>
1315
}
14-
16+
</div>
1517
@code {
1618
[Parameter]
1719
public string Tag { get; set; }

‎LinkDotNet.Blog.Web/Shared/ShortBlogPost.razor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<article>
66
<div class="blog-card @AltCssClass">
77
<div class="meta">
8-
<div class="photo" style="background-image: url(@BlogPost.PreviewImageUrl)"></div>
98
<ul class="details">
109
<li class="date">@BlogPost.UpdatedDate.ToString("dd/MM/yyyy")</li>
1110
@if (BlogPost.Tags != null)

‎LinkDotNet.Blog.Web/wwwroot/css/basic.css

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
--white: #ffffff;
1010
--wild-sand: #f4f4f4;
1111

12-
/* Usage */
12+
/* Usages */
1313
--active-link: var(--ceramic);
1414
--disabled-link: var(--pewter);
1515
--link-hover: var(--tana);
@@ -26,7 +26,7 @@
2626
--blockquote-border: var(--pewter);
2727

2828
--button-text-color: var(--wild-sand);
29-
--button-primary-color: var(--william:);
29+
--button-primary-color: var(--william);
3030
--button-primary-border-color: var(--big-stone);
3131
--button-primary-hover-color: var(--big-stone);
3232
--button-secondary-color: var(--big-stone);
@@ -45,7 +45,7 @@ body {
4545
}
4646

4747
a {
48-
font-weight: semi-bold;
48+
font-weight: 500;
4949
color: var(--active-link) !important;
5050
}
5151

@@ -104,5 +104,13 @@ blockquote p {
104104
.background-image {
105105
background-repeat: no-repeat;
106106
background-size: cover;
107-
height:75vh;
108-
}
107+
min-height:55vh;
108+
}
109+
110+
section {
111+
padding-bottom: 10px;
112+
}
113+
114+
.page {
115+
padding-top: 100px;
116+
}

0 commit comments

Comments
 (0)