Skip to content

Commit

Permalink
Update CSS and JS in CleanBlog theme #15
Browse files Browse the repository at this point in the history 
Updated CleanBlog theme to v5.0.4
  • Loading branch information
@savornicesei
savornicesei committed Aug 13, 2021
1 parent ac2ded4 commit c4458ed
Show file tree
Hide file tree
Showing 36 changed files with 13,089 additions and 1,522 deletions.
36 changes: 25 additions & 11 deletions themes/Blog/CleanBlog/_Archive.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,36 @@ Title: Archive
.OrderByDescending(x => x.Key))
{
<h1>@group.Key</h1>
<hr />
<hr class="my-4" />
@Html.Partial("_PostList", group);
}

<ul class="pager">
<li class="previous">
@if(Model.Bool(Keys.HasPreviousPage))
<nav aria-label="Archive navigation">
<ul class="pagination justify-content-center">
@if(Model.Bool(Keys.HasPreviousPage))
{
<a href="@(Context.GetLink(Model.Document(Keys.PreviousPage)))"><span aria-hidden="true">&larr;</span> Newer</a>
}
</li>
<li class="next">
<li class="page-item">
<a class="page-link" href="@(Context.GetLink(Model.Document(Keys.PreviousPage)))"><span aria-hidden="true">&larr;</span> Newer</a>
</li>
}
else
{
<li class="page-item disabled">
<a class="page-link" href="#" tabindex="-1" aria-disabled="true">Newer</a>
</li>
}
@if(Model.Bool(Keys.HasNextPage))
{
<a href="@(Context.GetLink(Model.Document(Keys.NextPage)))">Older <span aria-hidden="true">&rarr;</span></a>
<li class="page-item">
<a class="page-link" href="@(Context.GetLink(Model.Document(Keys.NextPage)))">Older <span aria-hidden="true">&rarr;</span></a>
</li>
}
else
{
<li class="page-item disabled">
<a class="page-link" href="#" tabindex="-1" aria-disabled="true">Older</a>
</li>
}
</li>
</ul>
</ul>
</nav>
}
50 changes: 35 additions & 15 deletions themes/Blog/CleanBlog/_Footer.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,39 @@
<div class="container">
<div class="row">
<div class="col-md-12 text-center">
<p class="copyright text-muted">
Copyright © @DateTime.Now.Year
<br />
<footer class="border-top">
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<!-- centered content -->
<div class="col-md-10 col-lg-8 col-xl-7">
<ul class="list-inline text-center">
<li class="list-inline-item">
<div class="small text-center text-muted">
<span>Copyright © @DateTime.Now.Year</span>
</div>
</li>
</ul>
<div class="small text-center text-muted fst-italic">
<strong><a href="https://wyam2.github.io">Generated by Wyam2</a></strong>
</div>
</div>

<!-- right aligned content -->
<div class="col-md-1 col-lg-2 col-xl-3">
<ul class="list-inline text-right">
<li class="list-inline-item">
@if (Context.String(BlogKeys.RssPath) != null) {
<a href="@Context.GetLink(Context.String(BlogKeys.RssPath))"><i class="fa fa-rss"></i> RSS Feed</a>
<a href="@Context.GetLink(Context.String(BlogKeys.RssPath))">
<i class="fas fa-rss-square"></i>
</a>
}
@(Context.String(BlogKeys.RssPath) != null && Context.String(BlogKeys.AtomPath) != null ? "|" : "")
@if (Context.String(BlogKeys.AtomPath) != null) {
<a href="@Context.GetLink(Context.String(BlogKeys.AtomPath))"><i class="fa fa-rss"></i> Atom Feed</a>
</li>
<li class="list-inline-item">
@if (Context.String(BlogKeys.AtomPath) != null) {
<a href="@Context.GetLink(Context.String(BlogKeys.AtomPath))">
<i class="fas fa-atom"></i>
</a>
}
<br />
<strong><a href="https://wyam.io">Generated by Wyam</a></strong>
</p>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</footer>
1 change: 0 additions & 1 deletion themes/Blog/CleanBlog/_Head.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

1 change: 1 addition & 0 deletions themes/Blog/CleanBlog/_Header.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<div class="site-heading">
<h1>@Model.WithoutSettings.String(BlogKeys.Title)</h1>
<span class="subheading">@Model.WithoutSettings.String(BlogKeys.Description)</span>
</div>
34 changes: 24 additions & 10 deletions themes/Blog/CleanBlog/_Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,37 @@
</div>
}
}
<ul class="pager">
<li class="previous">
<nav aria-label="Index navigation">
<ul class="pagination justify-content-center">
@if(Model.Bool(Keys.HasPreviousPage))
{
<a href="@(Context.GetLink(Model.Document(Keys.PreviousPage)))"><span aria-hidden="true">&larr;</span> Newer</a>
}
</li>
<li class="next">
<li class="page-item">
<a class="page-link" href="@(Context.GetLink(Model.Document(Keys.PreviousPage)))"><span aria-hidden="true">&larr;</span> Newer</a>
</li>
}
else
{
<li class="page-item disabled">
<a class="page-link" href="#" tabindex="-1" aria-disabled="true">Newer</a>
</li>
}
@if(Model.Bool(Keys.HasNextPage))
{
<a href="@(Context.GetLink(Model.Document(Keys.NextPage)))">Older <span aria-hidden="true">&rarr;</span></a>
<li class="page-item">
<a class="page-link" href="@(Context.GetLink(Model.Document(Keys.NextPage)))">Older <span aria-hidden="true">&rarr;</span></a>
</li>
}
</li>
</ul>
else
{
<li class="page-item disabled">
<a class="page-link" href="#" tabindex="-1" aria-disabled="true">Older</a>
</li>
}
</ul>
</nav>
</div>
<div class="col-sm-4 sidebar">
<hr class="visible-xs-block" />
<hr class="hidden-xs-down hidden-md-up" />

@if(Documents[Blog.Tags].Any())
{
Expand Down
192 changes: 79 additions & 113 deletions themes/Blog/CleanBlog/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
@{
string Title = Model.WithoutSettings.String(BlogKeys.Title);
string PageTitle = Context.String(BlogKeys.Title) + (string.IsNullOrWhiteSpace(Title) ? string.Empty : " - " + Title);
string Title = Model.WithoutSettings.String(BlogKeys.Title);
string PageTitle = Context.String(BlogKeys.Title) + (string.IsNullOrWhiteSpace(Title) ? string.Empty : " - " + Title);
}

<!DOCTYPE html>
<html lang="en">
<head>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>@PageTitle</title>
<meta name="description" content="@Context.String(BlogKeys.Description)" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="@Context.String(BlogKeys.Description)" />

@if (Context.String(BlogKeys.RssPath) != null) {
<link type="application/rss+xml" rel="alternate" title="@Context.String(BlogKeys.Title)" href="@Context.GetLink(Context.String(BlogKeys.RssPath))" />
<link type="application/rss+xml" rel="alternate" title="@Context.String(BlogKeys.Title)" href="@Context.GetLink(Context.String(BlogKeys.RssPath))" />
}
@if (Context.String(BlogKeys.AtomPath) != null) {
<link type="application/atom+xml" rel="alternate" title="@Context.String(BlogKeys.Title)" href="@Context.GetLink(Context.String(BlogKeys.AtomPath))" />
<link type="application/atom+xml" rel="alternate" title="@Context.String(BlogKeys.Title)" href="@Context.GetLink(Context.String(BlogKeys.AtomPath))" />
}
<link rel="shortcut icon" href="@Context.GetLink("/favicon.ico")" type="image/x-icon">
<link rel="icon" href="@Context.GetLink("/favicon.ico")" type="image/x-icon">

<link href="@Context.GetLink("/assets/css/bootstrap.min.css")" rel="stylesheet" />
<!-- Font Awesome icons (free version)-->
<script src="@Context.GetLink("/assets/js/font-awesome.all.js")"></script>
<!-- Google fonts-->
<link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>

<link href="@Context.GetLink("/assets/css/highlight.css")" rel="stylesheet">
<!-- Core theme CSS (includes Bootstrap)-->
<link href="@Context.GetLink("/assets/css/clean-blog.css")" rel="stylesheet" />
<link href="@Context.GetLink("/assets/css/master.css")" rel="stylesheet" />
<link href="@Context.GetLink("/assets/css/font-awesome.min.css")" rel="stylesheet" type="text/css">
<link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
<link href="@Context.GetLink("/assets/css/override.css")" rel="stylesheet" />


Expand All @@ -44,111 +47,74 @@

@Html.Partial("_Head")

</head>
<body>

<!-- Navigation -->
<nav class="navbar navbar-default navbar-custom navbar-fixed-top">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="@Context.GetLink("/")">@Context.String(BlogKeys.Title)</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
@Html.Partial("_Navbar")
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>

<!-- Page Header -->
@{
string backgroundImage = null;
if(Model.String(BlogKeys.Image) != null)
</head>
<body>

<!-- Navigation -->
<nav class="navbar navbar-expand-lg navbar-light" id="mainNav">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="container px-4 px-lg-5">
<a class="navbar-brand" href="@Context.GetLink("/")">@Context.String(BlogKeys.Title)</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
Toggle menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto py-4 py-lg-0">
@Html.Partial("_Navbar")
</ul>
</div>
</div>
</div>
<!-- /.container -->
</nav>

<!-- Page Header -->
@{
string backgroundImage = null;
if(Model.String(BlogKeys.Image) != null)
{
backgroundImage = $"background-image: url(\"{Model.String(BlogKeys.Image)}\")";
}
}
<header class="masthead" style="@backgroundImage">
<div class="container position-relative px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-11 col-lg-9 col-xl-8">
@if(IsSectionDefined("Header"))
{
@RenderSection("Header")
}
else
{
backgroundImage = $"background-image: url(\"{Model.String(BlogKeys.Image)}\")";
@Html.Partial("_Header")
}
}
<header class="intro-header" id="intro-header" style="@backgroundImage">
<div class="container">
<div class="row">
<div class="col-md-12">
@if(IsSectionDefined("Header"))
{
@RenderSection("Header")
}
else
{
@Html.Partial("_Header")
}
</div>
</div>
</div>
</header>

<!-- Main Content -->
<div class="container">
<div class="row">
<div id="content" class="col-md-12">
@RenderBody()
</div>
</div>
</div>
</div>

<hr>

<!-- Footer -->
<footer>
@Html.Partial("_Footer")
</footer>

<script src="@Context.GetLink("/assets/js/jquery.min.js")"></script>
<script src="@Context.GetLink("/assets/js/bootstrap.min.js")"></script>
<script src="@Context.GetLink("/assets/js/highlight.pack.js")"></script>
<script src="@Context.GetLink("/assets/js/clean-blog.js")"></script>
<script src="@Context.GetLink("/assets/js/d3.v3.min.js")"></script>
<script src="@Context.GetLink("/assets/js/trianglify.min.js")"></script>
<script src="@Context.GetLink("/assets/js/Please-compressed.js")"></script>
<script src="@Context.GetLink("/assets/js/background-check.min.js")"></script>

@Html.Partial("_Scripts")
<script>hljs.initHighlightingOnLoad();</script>

@if(Model.String(BlogKeys.Image) == null)
{
<script type="text/javascript">
// Header background
var colors = Please.make_color({
colors_returned: 3,
saturation: .6
});
var t = new Trianglify({
x_gradient: colors,
y_gradient: ["#FFFFFF"]
});
var header = document.getElementById("intro-header");
var pattern = t.generate(header.clientWidth, header.clientHeight);
header.setAttribute('style', 'background-image: ' + pattern.dataUrl);
</script>
}
</div>
</header>

<!-- Main Content -->
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
@RenderBody()
</div>
</div>
</div>

<!-- Footer -->
<footer>
@Html.Partial("_Footer")
</footer>

<script>
BackgroundCheck.init({
targets: '.intro-header,.navbar',
images: '.intro-header'
});
</script>
</body>
<script src="@Context.GetLink("/assets/js/bootstrap.bundle.min.js")"></script>
<script src="@Context.GetLink("/assets/js/highlight.min.js")"></script>
<script src="@Context.GetLink("/assets/js/clean-blog.js")"></script>

@Html.Partial("_Scripts")
<script>hljs.highlightAll();</script>
</body>
</html>

2 changes: 1 addition & 1 deletion themes/Blog/CleanBlog/_Navbar.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
}
foreach(Tuple<string, string> page in pages)
{
<li><a href="@(page.Item2)">@(page.Item1)</a></li>
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="@(page.Item2)">@(page.Item1)</a></li>
}
}
Loading

0 comments on commit c4458ed

Please sign in to comment.