Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/parsiya/Hugo-Octopress.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsiya@gmail.com <parsiya@gmail.com>2016-04-10 04:30:30 +0300
committerparsiya@gmail.com <parsiya@gmail.com>2016-04-10 04:30:30 +0300
commit2c9b60b7958e7025d19ea4dae8f222d78fb7d018 (patch)
tree0c2450b126edf03b2be05bb139c5bc98017b8f68
parent2d9392535e0bedc63baa71212ce558951c3f252d (diff)
Do some general cleanup in theme and remobe some comments
-rw-r--r--README.md2
-rw-r--r--images/screenshot2.pngbin0 -> 130420 bytes
-rw-r--r--layouts/partials/disqus.html2
-rw-r--r--layouts/partials/footer.html11
-rw-r--r--layouts/partials/header.html9
-rw-r--r--layouts/partials/navigation.html1
-rw-r--r--layouts/partials/pagination.html17
-rw-r--r--layouts/partials/sidebar.html14
8 files changed, 8 insertions, 48 deletions
diff --git a/README.md b/README.md
index d6b5f3f..88bbbdc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Hugo-Octopress
Hugo-Octopress is a port of the classic [Octopress][octopress-link] theme to [Hugo][hugo-link]. For a live demo of the website please see [http://parsiya.net](http://parsiya.net).
-![screenshot](/images/tn.png)
+![screenshot](/images/screenshot2.png)
## Contents
- [Config file parameters](#config)
diff --git a/images/screenshot2.png b/images/screenshot2.png
new file mode 100644
index 0000000..a914497
--- /dev/null
+++ b/images/screenshot2.png
Binary files differ
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html
index f6f8750..da5228a 100644
--- a/layouts/partials/disqus.html
+++ b/layouts/partials/disqus.html
@@ -14,4 +14,4 @@
})();
</script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> \ No newline at end of file
+<a href="http://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 0610940..542fc78 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,12 +1,5 @@
-
-<!-- Will this even work?
-if we want to do theme specific highlighting - incase we don't want to do solarized highlighting via pygment and want to do with js
-{{ if isset .Site.Params "highlight" }}<script src="{{ "/js/highlight.pack.js" | absURL }}"></script>
-<script>hljs.initHighlightingOnLoad();</script>{{ end }}
--->
-
<footer role="contentinfo">
- <p>Copyright &copy; {{ .Now.Format "2006" }} {{ .Site.Params.author }} - <a href="{{ "/license/" | absURL }}">License</a> -
+ <p>Copyright &copy; {{ .Now.Format "2006" }} {{ .Site.Params.author }} - <a href="{{ "/license/" | absURL }}">License</a> -
<span class="credit">Powered by <a target="_blank" href="https://gohugo.io">Hugo</a> and <a target="_blank" href="https://github.com/parsiya/hugo-octopress/">Hugo-Octopress</a> theme.
</p>
@@ -21,4 +14,4 @@ if we want to do theme specific highlighting - incase we don't want to do solari
</script>
{{ end }}
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 7432a42..b1ee375 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -28,11 +28,6 @@
<!-- For sidebar icons - TODO: find local icons I guess-->
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
- <!-- if you want your own highlight.css -->
- <!--
- {{ if isset .Site.Params "highlight" }}<link rel="stylesheet" href="{{ "/css/highlight/" | absURL }}{{ .Site.Params.highlight }}.css">{{ end }}
- -->
-
<!-- Icons -->
<link href="{{ "/favicon.png" | absURL }}" rel="icon">
@@ -40,10 +35,6 @@
{{ $siteTitle := .Site.Title }}
{{ $authorName := .Site.Author.name }}
- <!--
- {{ with .RSSLink }}<link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $siteTitle }} &middot; {{ $authorName }}" />{{ end }}
- -->
-
{{ with .RSSLink }}<link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $siteTitle }}" />{{ end }}
<meta name="description" content="{{ if ne .Description "" }}{{ .Description }}{{ else }}{{ .Site.Params.defaultDescription }}{{ end }}">
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index adaec40..a846ac8 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -1,4 +1,3 @@
-
<!-- reading menu items from config file -->
<ul class="main-navigation">
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index ce59635..8efbd91 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -2,18 +2,6 @@
<!-- default pagination.html creates <ul class="pagination"> and then a list of links for counters, forwardw and backward
while Octopress uses <div class="pagination"> and links inside-->
-<!-- this is how octopress implements the pagination links
-<div class="pagination">
-
- <a class="prev" href="/blog/page/3/">← Older</a>
-
- <a href="/blog/archives">Blog Archives</a>
-
- <a class="next" href="/">Newer →</a>
-
- </div>
--->
-
{{ $pag := $.Paginator }}
{{ if gt $pag.TotalPages 1 }}
<div class="pagination">
@@ -37,8 +25,8 @@
{{ if $pag.HasNext }}
<!-- <a href="{{ if $pag.HasNext }}{{ $pag.Next.URL }}{{ end }}" aria-label="Next" class="label-pagination"><span aria-hidden="true">&raquo;</span></a> -->
<a href="{{ if $pag.HasNext }}{{ $pag.Next.URL }}{{ end }}" aria-label="Next" class="label-pagination"><i class="fa fa-angle-right fa-lg"></i></a>
- {{ end }}
-
+ {{ end }}
+
{{ with $pag.Last }}
<!-- <a href="{{ .URL }}" aria-label="Last"><span aria-hidden="true" class="label-pagination">&raquo;&raquo;</span></a> -->
<a href="{{ .URL }}" aria-label="Last"><i class="fa fa-angle-double-right fa-lg"></i></a>
@@ -46,4 +34,3 @@
</div>
{{ end }}
-
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 9ba3904..739d365 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,4 +1,3 @@
-
<!-- to modify sidebar width check the css file lines 757 and 765 (for large screens) -->
<aside class="sidebar thirds">
@@ -15,22 +14,13 @@
</p>
</section>
- <!-- Links in side bar, for example the following links add blog - I have removed them as we have links in the navigation
- you can also add sidebar links from config file via the .Site.Menus.main part
- <ul class="sidebar-nav">
- <li class="sidebar-nav-item"><a href="{{ "/" | absURL }}">{{ if isset .Site.Params "home"}}{{ .Site.Params.home }}{{ else }}Blog{{ end }}</a></li>
- {{ range .Site.Menus.main }}
- <li class="sidebar-nav-item">{{ .Pre }}<a href="{{ .URL | absURL }}">{{ .Name }}</a></li>
- {{end}}
- </ul>
--->
-
<!-- Font awesome icons - code taken from the Hyde-x theme - "Font Awesome by Dave Gandy - http://fontawesome.io"
Icons: https://fortawesome.github.io/Font-Awesome/icons/
to give icons square dark backgrounds use them like this: fa fa-key-square
size is fa-3x, sizes are 1-5
-->
+ <!-- Sidebar social network icons -->
<ul class="sidebar-nav">
<li class="sidebar-nav-item">
{{ with .Site.Params.github }}<a target="_blank" href="{{ . }}" title="{{ . }}"><i class="fa fa-github fa-3x"></i></a>{{ end }}
@@ -48,7 +38,7 @@
</li>
</ul>
- <!-- sidebar menu
+ <!-- sidebar menu - items are read from the config file
first we check if it is enabled in config file and then start adding the items -->
{{ if eq .Site.Params.sidebar_menu_enabled true }}