Skip to content

Commit

Permalink
Merge pull request #443 from poppastring/fix-summary-themes
Browse files Browse the repository at this point in the history
Fix summary portion of the theme
  • Loading branch information
poppastring authored Aug 9, 2020
2 parents fad2d54 + c17775a commit 64170c0
Show file tree
Hide file tree
Showing 12 changed files with 92 additions and 130 deletions.
42 changes: 11 additions & 31 deletions source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml
Original file line number Diff line number Diff line change
@@ -1,37 +1,17 @@
@model PostViewModel
@{
ViewData["Title"] = @Model.Title;
}

<div class="post">
<div class="row post-title">
<div class="col-md-12 mb-6">
<h2><post-title-link post=@Model /></h2>
<small class="text-muted"><post-created-date post="@Model" /></small>
</div>
</div>
<div class="col-md-6">
<div class="card flex-md-row mb-4 shadow-sm h-md-250">
<div class="card-body d-flex flex-column align-items-start">
<small class="text-muted"><post-categories-list post="@Model" /></small>
<h3 class="mb-0">
<post-title-link post=@Model />
</h3>
<small class="mb-1 text-muted"><post-created-date post="@Model" /></small>
<p class="card-text mb-auto"><post-content post="@Model" strip-html="true" content-length="20" /></p>

<div class="row post-body">
<div class="col-md-12 mb-6">
<post-content post="@Model" />
</div>
</div>
<div class="row post-footer">
<div class="col-md-12 mb-6">
Categories: <post-categories-list post="@Model" />
</div>
<div class="col-md-12 mb-6">
Share on <post-to-twitter post="@Model">Twitter</post-to-twitter> or <post-to-facebook post="@Model">Facebook</post-to-facebook>
</div>
<div dasblog-authorized class="col-md-12 mb-6">
<post-edit-link post="@Model" />
<span style="display:inline-block; width: 1em;"></span>
<post-delete-link post="@Model" />
</div>
<div class="col-md-12 mb-6">
<post-comment-link post="@Model" />
<post-title-link post=@Model>Continue reading...</post-title-link>
</div>
<img class="card-img-right flex-auto d-none d-lg-block" style="width: 200px; height: 250px;" alt="Thumbnail [200x250]" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22200%22%20height%3D%22250%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20200%20250%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_166f4e7d3df%20text%20%7B%20fill%3A%23eceeef%3Bfont-weight%3Abold%3Bfont-family%3AArial%2C%20Helvetica%2C%20Open%20Sans%2C%20sans-serif%2C%20monospace%3Bfont-size%3A13pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_166f4e7d3df%22%3E%3Crect%20width%3D%22200%22%20height%3D%22250%22%20fill%3D%22%2355595c%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%2256.19000244140625%22%20y%3D%22130.97899951934815%22%3EThumbnail%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" data-src="holder.js/200x250?theme=thumb" data-holder-rendered="true">
</div>
</div>

<hr />
12 changes: 9 additions & 3 deletions source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
@using DasBlog.Web.Models.BlogViewModels;
@model ListPostsViewModel

<div class="row">
<div id="contents" class="container col-md-12">
<partial name="_BlogItemsSummary" model="Model" />
<div class="jumbotron p-3 p-md-5 text-white rounded bg-dark mt-lg-2">
<div class="col-md-6 px-0">
<h1 class="display-4 font-italic"><site-sub-title /></h1>
<p class="lead my-3"><site-description /></p>
</div>
</div>

<div class="row mb-2">
<partial name="_BlogItemsSummary" model="Model" />
</div>
42 changes: 11 additions & 31 deletions source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml
Original file line number Diff line number Diff line change
@@ -1,37 +1,17 @@
@model PostViewModel
@{
ViewData["Title"] = @Model.Title;
}

<div class="post">
<div class="row post-title">
<div class="col-md-12 mb-6">
<h2><post-title-link post=@Model /></h2>
<small class="text-muted"><post-created-date post="@Model" /></small>
</div>
</div>
<div class="col-md-6">
<div class="card flex-md-row mb-4 shadow-sm h-md-250">
<div class="card-body d-flex flex-column align-items-start">
<small class="text-muted"><post-categories-list post="@Model" /></small>
<h3 class="mb-0">
<post-title-link post=@Model />
</h3>
<small class="mb-1 text-muted"><post-created-date post="@Model" /></small>
<p class="card-text mb-auto"><post-content post="@Model" strip-html="true" content-length="20" /></p>

<div class="row post-body">
<div class="col-md-12 mb-6">
<post-content post="@Model" />
</div>
</div>
<div class="row post-footer">
<div class="col-md-12 mb-6">
Categories: <post-categories-list post="@Model" />
</div>
<div class="col-md-12 mb-6">
Share on <post-to-twitter post="@Model">Twitter</post-to-twitter> or <post-to-facebook post="@Model">Facebook</post-to-facebook>
</div>
<div dasblog-authorized class="col-md-12 mb-6">
<post-edit-link post="@Model" />
<span style="display:inline-block; width: 1em;"></span>
<post-delete-link post="@Model" />
</div>
<div class="col-md-12 mb-6">
<post-comment-link post="@Model" />
<post-title-link post=@Model>Continue reading...</post-title-link>
</div>
<img class="card-img-right flex-auto d-none d-lg-block" style="width: 200px; height: 250px;" alt="Thumbnail [200x250]" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22200%22%20height%3D%22250%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20200%20250%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_166f4e7d3df%20text%20%7B%20fill%3A%23eceeef%3Bfont-weight%3Abold%3Bfont-family%3AArial%2C%20Helvetica%2C%20Open%20Sans%2C%20sans-serif%2C%20monospace%3Bfont-size%3A13pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_166f4e7d3df%22%3E%3Crect%20width%3D%22200%22%20height%3D%22250%22%20fill%3D%22%2355595c%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%2256.19000244140625%22%20y%3D%22130.97899951934815%22%3EThumbnail%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" data-src="holder.js/200x250?theme=thumb" data-holder-rendered="true">
</div>
</div>

<hr />
13 changes: 9 additions & 4 deletions source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
@using DasBlog.Web.Models.BlogViewModels;
@model ListPostsViewModel

<div class="row">
<div id="contents" class="container col-md-9">
<partial name="_BlogItemsSummary" model="Model" />
<div class="jumbotron p-3 p-md-5 text-white rounded bg-dark mt-lg-2">
<div class="col-md-6 px-0">
<h1 class="display-4 font-italic"><site-sub-title /></h1>
<p class="lead my-3"><site-description /></p>
</div>
<site-search-box/>
</div>

<div class="row mb-2">
<partial name="_BlogItemsSummary" model="Model" />
</div>
7 changes: 3 additions & 4 deletions source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
<div class="card-body d-flex flex-column align-items-start">
<small class="text-muted"><post-categories-list post="@Model" /></small>
<h3 class="mb-0">
<post-title-link post=@Model css="text-dark" />
<post-title-link post=@Model />
</h3>
<small class="mb-1 text-muted"><post-created-date post="@Model" /></small>
<p class="card-text mb-auto"><post-description post="@Model" /></p>
<p class="card-text mb-auto"><post-content post="@Model" strip-html="true" content-length="20" /></p>

<post-perma-link post="@Model">Continue reading</post-perma-link>
<post-title-link post=@Model>Continue reading...</post-title-link>
</div>
<img class="card-img-right flex-auto d-none d-lg-block" style="width: 200px; height: 250px;" alt="Thumbnail [200x250]" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22200%22%20height%3D%22250%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20200%20250%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_166f4e7d3df%20text%20%7B%20fill%3A%23eceeef%3Bfont-weight%3Abold%3Bfont-family%3AArial%2C%20Helvetica%2C%20Open%20Sans%2C%20sans-serif%2C%20monospace%3Bfont-size%3A13pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_166f4e7d3df%22%3E%3Crect%20width%3D%22200%22%20height%3D%22250%22%20fill%3D%22%2355595c%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%2256.19000244140625%22%20y%3D%22130.97899951934815%22%3EThumbnail%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" data-src="holder.js/200x250?theme=thumb" data-holder-rendered="true">
</div>
</div>

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using DasBlog.Web.Models.BlogViewModels;
@model ListPostsViewModel

<div class="jumbotron p-3 p-md-5 text-white rounded bg-dark">
<div class="jumbotron p-3 p-md-5 text-white rounded bg-primary">
<div class="col-md-6 px-0">
<h1 class="display-4 font-italic"><site-sub-title /></h1>
<p class="lead my-3"><site-description /></p>
Expand Down
4 changes: 4 additions & 0 deletions source/DasBlog.Web.UI/Themes/fulcrum/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

a { color: forestgreen}

.bg-primary {
background-color: forestgreen !important
}

.blog-header {
line-height: 1;
border-bottom: 1px solid #e5e5e5;
Expand Down
42 changes: 11 additions & 31 deletions source/DasBlog.Web.UI/Themes/journal/_BlogItemSummary.cshtml
Original file line number Diff line number Diff line change
@@ -1,37 +1,17 @@
@model PostViewModel
@{
ViewData["Title"] = @Model.Title;
}

<div class="post">
<div class="row post-title">
<div class="col-md-12 mb-6">
<h2><post-title-link post=@Model /></h2>
<small class="text-muted"><post-created-date post="@Model" /></small>
</div>
</div>
<div class="col-md-6">
<div class="card flex-md-row mb-4 shadow-sm h-md-250">
<div class="card-body d-flex flex-column align-items-start">
<small class="text-muted"><post-categories-list post="@Model" /></small>
<h3 class="mb-0">
<post-title-link post=@Model css="text-dark" />
</h3>
<small class="mb-1 text-muted"><post-created-date post="@Model" /></small>
<p class="card-text mb-auto"><post-content post="@Model" strip-html="true" content-length="20" /></p>

<div class="row post-body">
<div class="col-md-12 mb-6">
<post-content post="@Model" />
</div>
</div>
<div class="row post-footer">
<div class="col-md-12 mb-6">
Categories: <post-categories-list post="@Model" />
</div>
<div class="col-md-12 mb-6">
Share on <post-to-twitter post="@Model">Twitter</post-to-twitter> or <post-to-facebook post="@Model">Facebook</post-to-facebook>
</div>
<div dasblog-authorized class="col-md-12 mb-6">
<post-edit-link post="@Model" />
<span style="display:inline-block; width: 1em;"></span>
<post-delete-link post="@Model" />
</div>
<div class="col-md-12 mb-6">
<post-comment-link post="@Model" />
<post-title-link post=@Model>Continue reading...</post-title-link>
</div>
<img class="card-img-right flex-auto d-none d-lg-block" style="width: 200px; height: 250px;" alt="Thumbnail [200x250]" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22200%22%20height%3D%22250%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20200%20250%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_166f4e7d3df%20text%20%7B%20fill%3A%23eceeef%3Bfont-weight%3Abold%3Bfont-family%3AArial%2C%20Helvetica%2C%20Open%20Sans%2C%20sans-serif%2C%20monospace%3Bfont-size%3A13pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_166f4e7d3df%22%3E%3Crect%20width%3D%22200%22%20height%3D%22250%22%20fill%3D%22%2355595c%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%2256.19000244140625%22%20y%3D%22130.97899951934815%22%3EThumbnail%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" data-src="holder.js/200x250?theme=thumb" data-holder-rendered="true">
</div>
</div>

<hr />
11 changes: 8 additions & 3 deletions source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
@using DasBlog.Web.Models.BlogViewModels;
@model ListPostsViewModel

<div class="row">
<div id="contents" class="container col-md-12">
<partial name="_BlogItemsSummary" model="Model" />
<div class="jumbotron p-3 p-md-5 text-white rounded bg-primary mt-lg-2">
<div class="col-md-6 px-0">
<h1 class="display-4 font-italic"><site-sub-title /></h1>
<p class="lead my-3"><site-description /></p>
</div>
</div>

<div class="row mb-2">
<partial name="_BlogItemsSummary" model="Model" />
</div>
6 changes: 3 additions & 3 deletions source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

<div class="jumbotron">
<h3 class="mb-0">
<post-title-link post=@Model css="text-dark"></post-title-link>
<post-title-link post=@Model ></post-title-link>
</h3>
<p>
<small class="mb-1 text-muted"><post-created-date post="@Model" date-time-format="MMMM dd, yyyy" /></small>
</p>
<div>
<post-description post="@Model"></post-description>
<p class="card-text mb-auto"><post-content post="@Model" strip-html="true" content-length="20" /></p>
</div>

<p class="lead">
<post-perma-link post="@Model" css="btn btn-primary btn-lg mt-2">Continue Reading</post-perma-link>
<post-title-link post=@Model>Continue reading...</post-title-link>
</p>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@model ListCommentsViewModel
@inject IDasBlogSettings dasBlogSettings

@if (Model != null && Model.Comments != null)
@if (dasBlogSettings.SiteConfiguration.EnableComments && Model?.Comments != null)
{
<hr />
<h3 class="comment-section-title" id="@DasBlog.Core.Common.Constants.CommentsStartId">Comment Section</h3>
Expand Down
39 changes: 21 additions & 18 deletions source/DasBlog.Web.UI/Views/Shared/_CommentPartial.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,31 @@
}
}

<div class="modal-body form-horizontal @admincommentstyle">
<div class="row">
<div class="col-md-12">
<comment-gravatar-image comment="@Model" css="img-thumbnail rounded float-left" />
@if (dasBlogSettings.SiteConfiguration.EnableComments)
{
<div class="modal-body form-horizontal @admincommentstyle">
<div class="row">
<div class="col-md-12">
<comment-gravatar-image comment="@Model" css="img-thumbnail rounded float-left" />

<div class="row">
<div class="col-md-12 mb-6">
<strong><comment-user-home-page-link comment="@Model" /></strong> <i>(<comment-date comment="@Model" date-time-format="MMMM dd, yyyy H:mm" />)</i>
<div class="row">
<div class="col-md-12 mb-6">
<strong><comment-user-home-page-link comment="@Model" /></strong> <i>(<comment-date comment="@Model" date-time-format="MMMM dd, yyyy H:mm" />)</i>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 mb-6 font-weight-light" >
<comment-content comment="@Model" />
<div class="row">
<div class="col-md-12 mb-6 font-weight-light">
<comment-content comment="@Model" />
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div dasblog-authorized class="col-md-12 mb-6">
<comment-approval-link comment="@Model" />
<span style="display:inline-block; width: 1em;"></span>
<comment-delete-link comment="@Model" />
<div class="row">
<div dasblog-authorized class="col-md-12 mb-6">
<comment-approval-link comment="@Model" />
<span style="display:inline-block; width: 1em;"></span>
<comment-delete-link comment="@Model" />
</div>
</div>
</div>
</div>
}

0 comments on commit 64170c0

Please sign in to comment.