Skip to content

Commit

Permalink
Merge pull request #3 from kenthorvath/fix-parse-errors-and-links
Browse files Browse the repository at this point in the history 
Fix parse errors and links
  • Loading branch information
@katychuang
katychuang authored Oct 26, 2018
2 parents 2d9c242 + 55c6e9d commit d375973
Show file tree
Hide file tree
Showing 9 changed files with 290 additions and 210 deletions.
68 changes: 35 additions & 33 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="site-heading">
<div class="hero-block">
<img class="img-circle portfolio-link" src="$baseurl$/static/img/face.png" href="#portfolioModal1" data-toggle="modal" width="150" height="150" alt="" title="">
</div><br><br>
<div class="hero-block">
<img class="img-circle portfolio-link" src="$baseurl$/static/img/face.png" href="#portfolioModal1" data-toggle="modal" width="150" height="150" alt="" title="">
</div><br><br>
<h1 id="top-title-font-weight-bold">title</h1>
<!-- <hr class="small"> -->
<!-- <hr class="small"> -->
<span class="subheading" id="textfloat">$site_description$
<br> <br>
<!-- ///// Fade Out Navbar Profile Picture -///// New Adding Front Profile Picture Mo. 6. April 2015 -->
<!--
<br> <br>
<!-- ///// Fade Out Navbar Profile Picture -///// New Adding Front Profile Picture Mo. 6. April 2015 -->
<!--
<img src="$baseurl$/static/img/kc.jpg" id="small-img-nav" width="40" height="40" class="img-circle" alt="newspace"> -->
<i class="fa fa-chevron-down" id="scroll-down"></i>
<i class="fa fa-chevron-down" id="scroll-down"></i>
</span>
</div>
</div>
Expand All @@ -28,41 +28,43 @@ <h1 id="top-title-font-weight-bold">title</h1>

<!-- Main Content -->
<div class="container front-end">
<div class="row">
<div class="posts">
<article>
<header class="intro-header" style="background-image: url('$baseurl$/static/img/sky.jpg')">
<div class="post-meta">
</div>
<h1 class="post-title"><a href="#" id="post-title-h1" rel="bookmark" title="link" itemprop="url">title of your website</a></h1>
<h1 class="post-title-readmore"><a href="#" rel="bookmark" title="title" itemprop="url" id="readmore-link"> ReadMore</a></h1>
</header>
<div class="row">
<div class="posts">
<article>
<header class="intro-header" style="background-image: url('$baseurl$/static/img/sky.jpg')">
<div class="post-meta">

</div>
<h1 class="post-title"><a href="#" id="post-title-h1" rel="bookmark" title="link" itemprop="url">title of your website</a></h1>
<h1 class="post-title-readmore"><a href="#" rel="bookmark" title="title" itemprop="url" id="readmore-link"> ReadMore</a></h1>
</header>

</article>
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">

<p>Welcome to my blog!</p>
<p>Welcome to my blog!</p>

<p>I've reproduced a list of recent posts here for your reading pleasure:</p>
<p>I've reproduced a list of recent posts here for your reading pleasure:</p>

<h3>Recent Posts</h3>
$partial("templates/post-list.html")$
<h3>Recent Posts</h3>
$partial("templates/post-list.html")$

<p>…or you can find more in the <a href="/archive.html">archives</a>.
<p>…or you can find more in the <a href="/archive.html">archives</a>.

<hr>
<hr>

$partial("templates/_pager.html)$
</div></div></div>
</div>
$partial("templates/_pager.html)$
</div>
</div>
</div>
</div>

</div>

</div>
</div>



<hr>
<hr>
11 changes: 5 additions & 6 deletions templates/archive.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

<!-- Post Header -->
<header class="intro-header" style="background-image: url('/static/img/beach.jpg')" alt="" title="">
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="post-heading">
<div class="post-heading">
<h1>$title$</h1>
</div>
</div>
</div>
</div>
</div>
Expand All @@ -18,13 +17,13 @@ <h1>$title$</h1>
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">

Here you can find all my previous posts:
$partial("templates/post-list.html")$
Here you can find all my previous posts:
$partial("templates/post-list.html")$

<hr>

</div>
</div>
</div>
</article>
<hr>
<hr>
32 changes: 17 additions & 15 deletions templates/default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
$partial("templates/head.html")$
<body>
<div id="preloader">
<div id="status">
$partial("templates/head.html")$

</div>
<body>
<div id="preloader">
<div id="status">

</div>
$partial("templates/nav.html")$

<div id="content">
$body$
</div>
<div id="footer">
</div>
$partial("templates/footer.html")$
</body>
</html>

</div>
$partial("templates/nav.html")$

<div id="content">
$body$
</div>
<div id="footer">
</div>
$partial("templates/footer.html")$
</body>

</html>
34 changes: 16 additions & 18 deletions templates/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,54 +31,52 @@
</span>
</a>
</li>
$endif$
$if(github_username)$
$endif$
$if(github_username)$
<li>
<a href="https://github.com/$github_username$" target="_blank">
<span class="fa-stack fa-lg">

<i class="fa fa-arrow-circle-o-down"></i>
<i class="fa fa-arrow-circle-o-down"></i>
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-github fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
$endif$
$if(instagram_username)$
$if(instagram_username)$
<li>
<a href="https://instagram.com/$instagram_username$" target="_blank">
<span class="fa-stack fa-lg">

<i class="fa fa-arrow-circle-o-down"></i>
<i class="fa fa-arrow-circle-o-down"></i>
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-instagram fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
$endif$
$endif$
</ul>
<p class="copyright text-muted">Copyright &copy; katychuang 2015. <br><br>
<p class="copyright text-muted">Copyright &copy; katychuang 2015. <br><br>
</p>
<div class="col-md-12">
<p class="copyright text-muted">
Site generated by
<a href="http://jaspervdj.be/hakyll">Hakyll</a>. Modified theme inspired by
<!-- ICE AND FIRE THEME https://github.com/SpaceG/iceandfire -->
<a href="https://github.com/SpaceG/CleanMagicMedium-Jekyll">CleanMagic.</a> available from <a href="http://katychuang.com/hakyll-themes/">Hakyll Themes</a> </p>
</div>
<div class="col-md-12">
<p class="copyright text-muted">
Site generated by
<a href="http://jaspervdj.be/hakyll">Hakyll</a>. Modified theme inspired by
<!-- ICE AND FIRE THEME https://github.com/SpaceG/iceandfire -->
<a href="https://github.com/dindi-jekyll/CleanMagicMedium-Jekyll">CleanMagic</a>. Available on <a href="https://github.com/katychuang/CleanMagic-hakyll">GitHub</a> </p>
</div>




</div>
</div>
</div>
</footer>

<!-- jQuery -->
<script src="$baseurl$/static/js/jquery.min.js"></script>
<script src="$baseurl$/static/js/spaceg.stylesheets.min.js"></script>
<script src="$baseurl$/static/js/spaceg.stylesheets.min.js"></script>
<script src="$baseurl$/static/js/bootstrap.min.js"></script>
<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
<script src="$baseurl$/static/js/scripts.js"></script>


Loading

0 comments on commit d375973

Please sign in to comment.