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 SolidState theme
  • Loading branch information
@savornicesei
savornicesei committed Aug 13, 2021
1 parent cc14b42 commit 285b4b7
Show file tree
Hide file tree
Showing 69 changed files with 14,638 additions and 3,274 deletions.
Binary file added themes/Blog/Phantom/assets/webfonts/fa-solid-900.woff
View file
Binary file not shown.
10 changes: 4 additions & 6 deletions themes/Blog/SolidState/_Footer.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
<div class="inner">
<section>
@if (Context.String(BlogKeys.RssPath) != null && Context.String(BlogKeys.AtomPath) != null) {
<h2>Feeds</h2>
<h2>Follow</h2>
<ul class="actions">
@if (Context.String(BlogKeys.RssPath) != null) {
<li><a href="@Context.GetLink(Context.String(BlogKeys.RssPath))" class="button small"><i class="fa fa-rss"></i> RSS Feed</a></li>
<li><a href="@Context.GetLink(Context.String(BlogKeys.RssPath))" class="button icon solid fa-rss"><span class="label"> RSS Feed</span></a></li>
}
@if (Context.String(BlogKeys.AtomPath) != null) {
<li><a href="@Context.GetLink(Context.String(BlogKeys.AtomPath))" class="button small"><i class="fa fa-rss"></i> Atom Feed</a></li>
<li><a href="@Context.GetLink(Context.String(BlogKeys.AtomPath))" class="button icon solid fa-rss"><span class="label">Atom Feed</span></a></li>
}
</ul>
}
</section>
<section>
</section>
<ul class="copyright">
<li>Copyright © @DateTime.Now.Year</li>
<li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
<li><a href="https://wyam.io">Generated by Wyam</a></li>
<li><a href="https://wyam2.github.io">Generated by Wyam2</a></li>
</ul>
</div>
1 change: 1 addition & 0 deletions themes/Blog/SolidState/_Header.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<section id="banner">
<div class="inner">
<h2>@Model.WithoutSettings.String(BlogKeys.Title)</h2>
<p>@Model.WithoutSettings.String(BlogKeys.Description)</p>
</div>
</section>
8 changes: 4 additions & 4 deletions themes/Blog/SolidState/_Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ else
}
</section>
}
<ul class="actions">
<ul class="pagination">
@if(Model.Bool(Keys.HasPreviousPage))
{
<li>
<a href="@(Context.GetLink(Model.Document(Keys.PreviousPage)))" class="button"><span aria-hidden="true">&larr;</span> Newer</a>
<a class="page" href="@(Context.GetLink(Model.Document(Keys.PreviousPage)))"><span aria-hidden="true">&larr;</span> Newer</a>
</li>
}
@if(Model.Bool(Keys.HasNextPage))
{
<li>
<a href="@(Context.GetLink(Model.Document(Keys.NextPage)))" class="button">Older <span aria-hidden="true">&rarr;</span></a>
<a class="page" href="@(Context.GetLink(Model.Document(Keys.NextPage)))" class="button">Older <span aria-hidden="true">&rarr;</span></a>
</li>
}
</ul>
Expand All @@ -71,7 +71,7 @@ else
<br />
<ul class="actions">
<li>
<a href="@Context.GetLink("tags/index.html")" class="button">View All Tags &rarr;</a>
<a class="button" href="@Context.GetLink("tags/index.html")">View All Tags &rarr;</a>
</li>
</ul>
</div>
Expand Down
110 changes: 55 additions & 55 deletions themes/Blog/SolidState/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
<head>
<title>@PageTitle</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="@Context.GetLink("/assets/sass/main.css")" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<link rel="stylesheet" href="@Context.GetLink("/assets/css/main.css")" />
<link rel="stylesheet" href="@Context.GetLink("/assets/css/noscript.css")" />
<link rel="stylesheet" href="@Context.GetLink("/assets/css/override.css")" />
@if(Model.ContainsKey(BlogKeys.Image))
{
<style>
Expand All @@ -31,67 +33,65 @@
}
@Html.Partial("_Head")
</head>
<body>
<body class="is-preload">

<!-- Page Wrapper -->
<div id="page-wrapper">

<!-- Header -->
<header id="header">
<h1><a href="@Context.GetLink("/")">@Context.String(BlogKeys.Title)</a></h1>
<nav>
<a href="#menu">Menu</a>
</nav>
</header>
<div id="page-wrapper">

<!-- Header -->
<header id="header" class="alt">
<h1><a href="@Context.GetLink("/")">@Context.String(BlogKeys.Title)</a></h1>
<nav>
<a href="#menu">Menu</a>
</nav>
</header>

<!-- Menu -->
<nav id="menu">
<div class="inner">
<h2>Menu</h2>
<ul class="links">
@Html.Partial("_Navbar")
</ul>
<a href="#" class="close">Close</a>
</div>
</nav>

<!-- Menu -->
<nav id="menu">
@if(IsSectionDefined("Header"))
{
@RenderSection("Header")
}
else
{
@Html.Partial("_Header")
}

<!-- Main -->
<section id="wrapper">
<section class="wrapper style2">
<div class="inner">
<h2>Menu</h2>
<ul class="links">
@Html.Partial("_Navbar")
</ul>
<a href="#" class="close">Close</a>
@RenderBody()
</div>
</nav>

@if(IsSectionDefined("Header"))
{
@RenderSection("Header")
}
else
</section>

@if(IsSectionDefined("Sections"))
{
@Html.Partial("_Header")
@RenderSection("Sections")
}

<!-- Main -->
<section id="wrapper">
<section class="wrapper style2">
<div class="inner">
@RenderBody()
</div>
</section>

@if(IsSectionDefined("Sections"))
{
@RenderSection("Sections")
}
</section>

<!-- Footer -->
<footer id="footer">
@Html.Partial("_Footer")
</footer>
</div>
</section>

<!-- Footer -->
<section id="footer">
@Html.Partial("_Footer")
</footer>
</div>

<!-- Scripts -->
<script src="@Context.GetLink("assets/js/skel.min.js")"></script>
<script src="@Context.GetLink("assets/js/jquery.min.js")"></script>
<script src="@Context.GetLink("assets/js/jquery.scrollex.min.js")"></script>
<script src="@Context.GetLink("assets/js/util.js")"></script>
<!--[if lte IE 8]><script src="@Context.GetLink("/assets/js/ie/respond.min.js")"></script><![endif]-->
<script src="@Context.GetLink("/assets/js/main.js")"></script>

<script src="@Context.GetLink("/assets/js/jquery.min.js")"></script>
<script src="@Context.GetLink("/assets/js/jquery.scrollex.min.js")"></script>
<script src="@Context.GetLink("/assets/js/browser.min.js")"></script>
<script src="@Context.GetLink("/assets/js/breakpoints.min.js")"></script>
<script src="@Context.GetLink("/assets/js/util.js")"></script>
<script src="@Context.GetLink("/assets/js/main.js")"></script>
</body>

</html>
8 changes: 4 additions & 4 deletions themes/Blog/SolidState/_Tag.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Title: All Tags
string tag = Model.String(BlogKeys.Tag).ToLowerInvariant().Replace(' ', '-');
tag = tag.StartsWith(".") ? tag.Substring(1) : tag;
}
<ul class="actions">
<ul class="pagination">
@if(Model.Bool(Keys.HasPreviousPage))
{
<li>
@{
string previousPage = Model.Get<int>(Keys.CurrentPage) == 2
? $"/tags/{tag}.html" : $"/tags/{tag}{Model.Get<int>(Keys.CurrentPage) - 1}";
}
<a href="@previousPage"><span aria-hidden="true">&larr;</span> Newer</a>
<a class="page" href="@previousPage"><span aria-hidden="true">&larr;</span> Newer</a>
</li>
}
@if(Model.Bool(Keys.HasNextPage))
Expand All @@ -25,7 +25,7 @@ Title: All Tags
@{
string nextPage = $"/tags/{tag}{Model.Get<int>(Keys.CurrentPage) + 1}";
}
<a href="@nextPage">Older <span aria-hidden="true">&rarr;</span></a>
<a class="page" href="@nextPage">Older <span aria-hidden="true">&rarr;</span></a>
</li>
}
</ul>
Expand All @@ -40,7 +40,7 @@ Title: All Tags
{
string tagName = tagDocument.String(BlogKeys.Tag);
string postCount = tagDocument.String(Keys.TotalItems);
string buttonStyle = tagName == Model.String(BlogKeys.Tag) ? "special" : "";
string buttonStyle = tagName == Model.String(BlogKeys.Tag) ? "primary" : "";
<a role="button" href="@Context.GetLink(tagDocument)" class="button small @buttonStyle">@tagName (@postCount)</a>
}
</div>
Expand Down
4 changes: 0 additions & 4 deletions themes/Blog/SolidState/assets/css/font-awesome.min.css
View file

This file was deleted.

5 changes: 5 additions & 0 deletions themes/Blog/SolidState/assets/css/fontawesome-all.min.css
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 285b4b7

Please sign in to comment.