Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'

# Conflicts: # exampleSite/config.toml # exampleSite/content/page/about.md # layouts/_default/list.html # layouts/partials/disqus.html # layouts/partials/head.html # layouts/partials/header.html # layouts/partials/page.html # layouts/partials/post.html
2017-03-08 19:03:10 +00:00 · 2017-03-08 19:03:10 +00:00 · 027faa06a2
commit 027faa06a2
parent 0de8a6a977 d3ebf37be4
17 changed files with 304 additions and 232 deletions
--- a/layouts/partials/disqus.html
+++ b/layouts/partials/disqus.html
@ -1,5 +1,7 @@
-{{ if and .Site.DisqusShortname (not .Params.nocomments) }}
+{{ if (.Params.comments) | or (and (not (isset .Params "comments")) (.Site.Params.comments)) }}
+  {{ if .Site.DisqusShortname }}
    <div class="comments">
-        {{ template "_internal/disqus.html" . }}
+      {{ template "_internal/disqus.html" . }}
    </div>
+  {{ end }}
 {{ end }}
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -43,7 +43,7 @@
            </a>
          </li>
          {{ end }}
-		      {{ if .Site.Author.twitter }}
+          {{ if .Site.Author.twitter }}
          <li>
            <a href="https://twitter.com/{{ .Site.Author.twitter }}" title="Twitter">
              <span class="fa-stack fa-lg">
@ -63,7 +63,7 @@
            </a>
          </li>
          {{ end }}
-		      {{ if .Site.Author.linkedin }}
+          {{ if .Site.Author.linkedin }}
          <li>
            <a href="https://linkedin.com/in/{{ .Site.Author.linkedin }}" title="LinkedIn">
              <span class="fa-stack fa-lg">
@ -83,7 +83,7 @@
            </a>
          </li>
          {{ end }}
-	    	  {{ if .Site.Author.stackoverflow }}
+          {{ if .Site.Author.stackoverflow }}
          <li>
            <a href="https://stackoverflow.com/{{ .Site.Author.stackoverflow }}" title="StackOverflow">
              <span class="fa-stack fa-lg">
@ -102,7 +102,7 @@
              </span>
            </a>
          </li>
-          {{ end }} 
+          {{ end }}
          {{ if .Site.Author.instagram }}
          <li>
            <a href="https://www.instagram.com/{{ .Site.Author.instagram }}" title="Instagram">
@ -112,7 +112,7 @@
              </span>
            </a>
          </li>
-          {{ end }} 
+          {{ end }}
          {{ if .Site.Author.youtube }}
          <li>
            <a href="https://www.youtube.com/{{ .Site.Author.youtube }}" title="Youtube">
@ -163,43 +163,44 @@
            </a>
          </li>
          {{ end }}
-
-    		  <li>
-      			<a href="{{ .Site.BaseURL}}index.xml" title="RSS">
-      			  <span class="fa-stack fa-lg">
-        				<i class="fa fa-circle fa-stack-2x"></i>
-        				<i class="fa fa-rss fa-stack-1x fa-inverse"></i>
-      			  </span>
-      			</a>
-    		  </li>		
-
+          {{ if .Site.Params.rss }}
+          <li>
+            <a href="{{ .Site.BaseURL}}index.xml" title="RSS">
+              <span class="fa-stack fa-lg">
+                <i class="fa fa-circle fa-stack-2x"></i>
+                <i class="fa fa-rss fa-stack-1x fa-inverse"></i>
+              </span>
+            </a>
+          </li>
+          {{ end }}
        </ul>
        <p class="credits copyright text-muted">
-    	  {{ .Site.Author.name }}
-    	  &nbsp;&bull;&nbsp;
-    	  {{ .Site.LastChange.Format "2006" }}
-    		  
-    	  {{ if .Site.Title }}
-    	  &nbsp;&bull;&nbsp;
-    	  <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
-    	  {{ end }}
-  	    </p>
-  	    <!-- Please don't remove this, keep my open source work credited :) -->
-    	<p class="credits theme-by text-muted">
-          <a href="http://gohugo.io">Hugo v{{ .Hugo.Version }}</a> powered &nbsp;&bull;&nbsp; Theme by <a href="http://deanattali.com/beautiful-jekyll/">beautiful-jekyll</a> adapted to <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a>
+          {{ .Site.Author.name }}
+          &nbsp;&bull;&nbsp;
+          {{ .Site.LastChange.Format "2006" }}
+
+          {{ if .Site.Title }}
+            &nbsp;&bull;&nbsp;
+            <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
+          {{ end }}
+        </p>
+        <!-- Please don't remove this, keep my open source work credited :) -->
+        <p class="credits theme-by text-muted">
+          <a href="http://gohugo.io">Hugo v{{ .Hugo.Version }}</a> powered &nbsp;&bull;&nbsp; Theme by <a href="http://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a> adapted to <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a>
          {{ with .Site.Params.commit }}&nbsp;&bull;&nbsp;[<a href="{{.}}{{ getenv "GIT_COMMIT_SHA" }}">{{ getenv "GIT_COMMIT_SHA_SHORT" }}</a>]{{ end }}
-    	</p>
+        </p>
      </div>
    </div>
  </div>
 </footer>

+<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.js" integrity="sha384-/y1Nn9+QQAipbNQWU65krzJralCnuOasHncUFXGkdwntGeSvQicrYkiUBwsgUqc1" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/contrib/auto-render.min.js" integrity="sha384-dq1/gEHSxPZQ7DdrM82ID4YVol9BYyU7GbWlIwnwyPzotpoc57wDw/guX8EaYGPx" crossorigin="anonymous"></script>
 <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 <script src="{{ .Site.BaseURL }}/js/main.js"></script>
 <script src="{{ .Site.BaseURL }}/js/highlight.min.js"></script>
-<script>
-  hljs.initHighlightingOnLoad();
-</script>
+<script> hljs.initHighlightingOnLoad(); </script>
+<script> renderMathInElement(document.body); </script>

 {{ template "_internal/google_analytics.html" . }}
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@ -11,6 +11,7 @@

  <link rel="alternate" href="{{ "/index.xml" | absURL }}" type="application/rss+xml" title="{{ .Site.Title }}">

+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.css" integrity="sha384-wITovz90syo1dJWVh32uuETPVEtGigN07tkttEqPv+uR2SE/mbQcG7ATL28aI9H0" crossorigin="anonymous">
  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/main.css" />
@ -18,31 +19,32 @@
  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" />
  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/pygment_highlights.css" />
  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/highlight.min.css">
-  
+
  <!-- Facebook OpenGraph tags -->
  {{ if .Site.Params.fb_app_id }}
-  <meta property="fb:app_id" content="{{ .Site.Params.fb_app_id }}" />
+    <meta property="fb:app_id" content="{{ .Site.Params.fb_app_id }}" />
  {{ end }}
 
  {{ if .Params.meta_title }}
-  <meta property="og:title" content="{{ .Params.meta_title }}" />
+    <meta property="og:title" content="{{ .Params.meta_title }}" />
  {{ else if .Title }}
-  <meta property="og:title" content="{{ .Title }}" />
+    <meta property="og:title" content="{{ .Title }}" />
  {{ else }}
-  <meta property="og:title" content="{{ .Site.Title }}" />
+    <meta property="og:title" content="{{ .Site.Title }}" />
  {{ end }}

  {{ if .Params.meta_description }}
-  <meta property="og:description" content="{{ .Params.meta_description }}">
+    <meta property="og:description" content="{{ .Params.meta_description }}">
  {{ else if .Params.subtitle }}
-  <meta property="og:description" content="{{ .Params.subtitle }}">
+    <meta property="og:description" content="{{ .Params.subtitle }}">
  {{ else }}
-  <meta property="og:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}">
+    <meta property="og:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}">
  {{ end }}

  <meta property="og:type" content="website" />

  {{ if .Params.id }}
+<<<<<<< HEAD
  <meta property="og:url" content="{{ .URL | absURL }}" />
  <link rel="canonical" href="{{ .URL | absURL }}" />
  {{ else }}
@ -56,6 +58,21 @@
  <meta property="og:image" content="{{ .Params.bigimg | absURL }}" />
  {{ else if .Site.Params.logo }}
  <meta property="og:image" content="{{ .Site.Params.logo | absURL }}" />
+=======
+    <meta property="og:url" content="{{ .URL | absURL }}" />
+    <link rel="canonical" href="{{ .URL | absURL }}" />
+  {{ else }}
+    <meta property="og:url" content="{{ .URL | absURL }}" />
+    <link rel="canonical" href="{{ .URL | absURL }}" />
+  {{ end }}
+
+  {{ if .Params.share_img }}
+    <meta property="og:image" content="{{ .Params.share_img | absURL }}" />
+  {{ else if .Params.bigimg }}
+    <meta property="og:image" content="{{ .Params.bigimg | absURL }}" />
+  {{ else if .Site.Params.logo }}
+    <meta property="og:image" content="{{ .Site.Params.logo | absURL }}" />
+>>>>>>> refs/remotes/halogenica/master
  {{ end }}
  
  <!-- Twitter summary cards -->
@ -64,6 +81,7 @@
  <meta name="twitter:creator" content="@{{ .Site.Author.twitter }}" />

  {{ if .Params.meta_title }}
+<<<<<<< HEAD
  <meta name="twitter:title" content="{{ .Params.meta_title }}" />
  {{ else if .Title }}
  <meta name="twitter:title" content="{{ .Title }}" />
@ -86,5 +104,29 @@
  {{ else if .Site.Params.logo }}
  <meta name="twitter:image" content="{{ .Site.Params.logo | absURL }}" />
  {{ end }}  
+=======
+    <meta name="twitter:title" content="{{ .Params.meta_title }}" />
+  {{ else if .Title }}
+    <meta name="twitter:title" content="{{ .Title }}" />
+  {{ else }}
+    <meta name="twitter:title" content="{{ .Site.Title }}" />
+  {{ end }}
+
+  {{ if .Params.meta_description }}
+    <meta name="twitter:description" content="{{ .Params.meta_description }}">
+  {{ else if .Params.subtitle }}
+    <meta name="twitter:description" content="{{ .Params.subtitle }}">
+  {{ else }}
+    <meta name="twitter:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}">
+  {{ end }}
+
+  {{ if .Params.share_img }}
+    <meta name="twitter:image" content="{{ .Params.share_img | absURL }}" />
+  {{ else if .Params.bigimg }}
+    <meta name="twitter:image" content="{{ .Params.bigimg | absURL }}" />
+  {{ else if .Site.Params.logo }}
+    <meta name="twitter:image" content="{{ .Site.Params.logo | absURL }}" />
+  {{ end }} 
+>>>>>>> refs/remotes/halogenica/master

 </head>
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@ -3,18 +3,18 @@
      <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
        <div class="{{ .Type }}-heading">
          <h1>{{ if .Title }}{{ .Title }}{{ else }}<br/>{{ end }}</h1>
-      {{ if .Params.subtitle }}
-        {{ if eq .Type "page" }}
-            <hr class="small">
-            <span class="{{ .Type }}-subheading">{{ .Params.subtitle }}</span>
-      {{ else }}
-      <h2 class="{{ .Type }}-subheading">{{ .Params.subtitle }}</h2>
-      {{ end }}
-      {{ end }}
-      
-      {{ if eq .Type "post" }}
-      <span class="post-meta">Posted on {{ .Date.Format .Site.Params.dateFormat }}</span>
-      {{ end }}
+            {{ if .Params.subtitle }}
+              {{ if eq .Type "page" }}
+                <hr class="small">
+                <span class="{{ .Type }}-subheading">{{ .Params.subtitle }}</span>
+              {{ else }}
+                <h2 class="{{ .Type }}-subheading">{{ .Params.subtitle }}</h2>
+              {{ end }}
+            {{ end }}
+
+            {{ if eq .Type "post" }}
+              <span class="post-meta">Posted on {{ .Date.Format .Site.Params.dateFormat }}</span>
+            {{ end }}
        </div>
      </div>
    </div>
--- a/layouts/partials/header_wp.html
+++ b/layouts/partials/header_wp.html
@ -1,21 +1,18 @@
-<!-- TODO this file has become a mess, refactor it -->
-
 {{ if or .Params.bigimg .Title }}
-
  {{ if .Params.bigimg }}
    <div id="header-big-imgs" data-num-img=1 data-img-src-1="{{.Params.bigimg}}"></div>
  {{ end }}

  <header class="header-section {{ if .Params.bigimg }}has-img{{ end }}">
-  {{ if .Params.bigimg }}
-    <div class="big-img intro-header">
+    {{ if .Params.bigimg }}
+      <div class="big-img intro-header">
+        {{ partial "header.html" . }}
+        <span class='img-desc'></span>
+      </div>
+    {{ end }}
+    <div class="intro-header no-img">
      {{ partial "header.html" . }}
-      <span class='img-desc'></span>
    </div>
-  {{ end }}
-  <div class="intro-header no-img">
-    {{ partial "header.html" . }}
-  </div>
  </header>
 {{ else }}
  <div class="intro-header"></div>
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@ -12,34 +12,34 @@

    <div class="collapse navbar-collapse" id="main-navbar">
      <ul class="nav navbar-nav navbar-right">
-      {{ range .Site.Menus.main.ByWeight }}
-        {{ if .HasChildren }}
-          <li class="navlinks-container">
-            <a class="navlinks-parent" href="javascript:void(0)">{{ .Name }}</a>
-            <div class="navlinks-children">
-            {{ range .Children }}
-              <a href="{{ .URL }}">{{ .Name }}</a>
-            {{ end }}
-            </div>
-          </li>
-        {{ else }}
-          <li>
-          <a title="{{ .Name }}" href="{{ .URL }}">{{ .Name }}</a>
-  	      </li>
-  	    {{ end }}
-      {{ end }}
+        {{ range .Site.Menus.main.ByWeight }}
+          {{ if .HasChildren }}
+            <li class="navlinks-container">
+              <a class="navlinks-parent" href="javascript:void(0)">{{ .Name }}</a>
+              <div class="navlinks-children">
+                {{ range .Children }}
+                  <a href="{{ .URL }}">{{ .Name }}</a>
+                {{ end }}
+              </div>
+            </li>
+          {{ else }}
+            <li>
+              <a title="{{ .Name }}" href="{{ .URL }}">{{ .Name }}</a>
+            </li>
+          {{ end }}
+        {{ end }}
      </ul>
    </div>

-	<div class="avatar-container">
-	  <div class="avatar-img-border">
-      {{ if isset .Site.Params "logo" }}
+    <div class="avatar-container">
+      <div class="avatar-img-border">
+        {{ if isset .Site.Params "logo" }}
          <a title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}">
-              <img class="avatar-img" src="{{ .Site.BaseURL }}/{{ .Site.Params.logo }}" alt="{{ .Site.Title }}" />
+            <img class="avatar-img" src="{{ .Site.BaseURL }}/{{ .Site.Params.logo }}" alt="{{ .Site.Title }}" />
          </a>
-      {{ end }}
-	  </div>
-	</div>
+        {{ end }}
+      </div>
+    </div>

  </div>
 </nav>
--- a/layouts/partials/page.html
+++ b/layouts/partials/page.html
@ -2,10 +2,12 @@
  <div class="row">
    <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
      {{ .Content }}
-      {{ if and .Site.DisqusShortname (not .Params.nocomments) }}
-        <div class="disqus-comments">
-        {{ template "_internal/disqus.html" . }}
-        </div>
+      {{ if (.Params.comments) | or (and (not (isset .Params "comments")) (.Site.Params.comments)) }}
+        {{ if .Site.DisqusShortname }}
+          <div class="disqus-comments">
+            {{ template "_internal/disqus.html" . }}
+          </div>
+        {{ end }}
      {{ end }}
    </div>
  </div>
--- a/layouts/partials/post.html
+++ b/layouts/partials/post.html
@ -2,26 +2,28 @@
  <div class="row">
    <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
      <article role="main" class="blog-post">
-          {{ .Content }}
+        {{ .Content }}
      </article>

      <ul class="pager blog-pager">
        {{ if .PrevInSection }}
-        <li class="previous">
-          <a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; Previous Post</a>
-        </li>
+          <li class="previous">
+            <a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; Previous Post</a>
+          </li>
        {{ end }}
        {{ if .NextInSection }}
-        <li class="next">
-          <a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">Next Post &rarr;</a>
-        </li>
+          <li class="next">
+            <a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">Next Post &rarr;</a>
+          </li>
        {{ end }}
      </ul>

-      {{ if and .Site.DisqusShortname (not .Params.nocomments) }}
-      <div class="disqus-comments">
-        {{ template "_internal/disqus.html" . }}
-      </div>
+      {{ if (.Params.comments) | or (and (not (isset .Params "comments")) (.Site.Params.comments)) }}
+        {{ if .Site.DisqusShortname }}
+          <div class="disqus-comments">
+            {{ template "_internal/disqus.html" . }}
+          </div>
+        {{ end }}
      {{ end }}

    </div>