Layouts

7 files changed, 29 insertions, 97 deletions

diff --git a/layouts/404.html b/layouts/404.html
index b320fd6..521dc0f 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,10 +1,13 @@
 {{ define "main" }}

-<article class="post">

-    <header>

-        <h1>{{ .Site.Params.title404 | default "404 - Page not found" }}</h1>

-        <h3>{{ .Site.Params.subtitle404 | default "The content you're looking for doesn't seem to exist." }}</h3>

-    </header>

-

-    {{ partial "latest-posts.html" . }}

-</article>

+	<h1>Oh! <b>404</b></h1>

+    <p>

+        The requested URL was not found on this server. 

+        <br>

+        <i>That’s all I know.</i>

+    </p>

+    <a href="." style="text-decoration:underline">Am here.</a>

 {{ end }}

+

+{{ define "widgets" }}

+	{{ partial "widgets.html" . }}

+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index cbffa94..03b0d19 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -17,21 +17,20 @@
         <main>

             {{ block "main" . }} {{ end }}

         </main>

-            <!-- show widget on larger screen -->

-            <aside class="desktop-only">

-                {{ block "widgets" . }}{{ end }}

-                {{ partial "footer.html" . }}

-            </aside>

-        {{ partial "footer.html" . }}

+        <!-- show widget on larger screen -->

+        <aside class="desktop-only">

+            {{ block "widgets" . }}{{ end }}

+            {{ partial "footer.html" . }}

+        </aside>

     </div>

     {{ else }}

     <!-- no sidebar, content centered to screen -->

-        <div id="site-wrapper-centered">

-            <main class="center">

-                {{ block "main" . }} {{ end }}

-            </main>

-            {{ partial "footer.html" . }}

-        </div>

+    <div id="site-wrapper-centered">

+        <main class="center">

+            {{ block "main" . }} {{ end }}

+        </main>

+        {{ partial "footer.html" . }}

+    </div>

     {{ end }}

     {{ partial "js.html" . }}

 </body>

diff --git a/layouts/partials/author.html b/layouts/partials/author.html
index 15efc9e..c9fb03d 100644
--- a/layouts/partials/author.html
+++ b/layouts/partials/author.html
@@ -1,7 +1,7 @@
 {{ if .Site.Params.authorCard }}

 <div class="author-card" itemscope itemprop="author" itemtype="https://schema.org/Person">

     <div class="author-dp">

-        <img itemprop='image' src="/images/me.jpg" alt=".Site.Param.name" />

+        <img itemprop='image' src="{{ .Site.Params.avatar }}" alt=".Site.Param.name" />

     </div>

     <div class="author-bio">

         <h4 class="author-title">

diff --git a/layouts/partials/brand.html b/layouts/partials/brand.html
index 5db84db..068382c 100644
--- a/layouts/partials/brand.html
+++ b/layouts/partials/brand.html
@@ -1 +1 @@
-<img src="/images/avatar.png" alt="">

+<img src="{{ .Site.Params.Logo }}" alt="">

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index c35d857..8912b7c 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,22 +1,5 @@
-<<<<<<< HEAD
-<footer id="footer" class="mobile-only">
-    <p class="small">
-          {{ .Site.Copyright }}
-    </p>
-</footer>
-=======
-<footer id="footer" class="mobile-only">

+<footer id="footer">

     <p class="small">

-      {{ if or (.Site.Params.copyright) (.Site.Params.credit) }}

-      <div class="col-xs-12">

-        {{ if .Site.Params.copyright }}

-          &copy; {{ now.Format "2006" }} {{ .Site.Params.author }}.

-        {{ end }}

-        {{ if .Site.Params.credit }}

-          <a href="https://ijsucceed.com" target="_blank">OnePress theme.</a>

-        {{ end }}

-      </div>

-      {{ end }}

+      {{ .Site.Copyright }}

     </p>

-</footer>

->>>>>>> bc3b59fd459be92483fe0d7e20a8169a3ec1543d
+</footer>
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index a89fc0c..6b1e0d9 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,47 +1,3 @@
-<<<<<<< HEAD
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<base href="{{ .Site.BaseURL }}">
-{{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
-{{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
-{{ .Hugo.Generator }}
-<title>{{ .Title }}</title>
-<link rel="shortcut icon" href="{{ "images/favicon.ico" | absURL }}">
-<link rel="stylesheet" href="{{ "css/style.css" | absURL }}">
-<link rel="stylesheet" href="{{ "css/highlight.css" | absURL }}">
-{{ if .Site.Params.customCSS }}
-  {{ partials "css.html" . }}
-{{ end }}
-
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css">
-
-{{ if .Site.Params.enableRSS }}
-<link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
-{{ end }}
-
-{{ if .Site.Params.twitter }}
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:site" content="@{{ .Site.Params.twitter }}">
-  <meta name="twitter:creator" content="@{{ .Site.Params.twitter }}">
-{{ end }}
-
-<meta property="og:title" content="{{ if .IsHome }}{{ .Site.Title }}{{ else if .Params.heading }}{{ .Params.heading }}{{ else }}{{ .Title }}{{ end }}">
-<meta property="og:type" content="website">
-<meta property="og:url" content="{{ .Site.BaseURL }}">
-
-{{ if .Site.Params.opengraphImage}}
-  <meta property="og:image" content="{{ if .Params.featuredImage }}{{ .Site.BaseURL }}{{ .Params.featuredImage }}{{ else }}{{ .Site.BaseURL }}{{ .Site.Params.opengraphImage}}{{ end }}">
-{{ end }}
-
-{{ if .Description }}
-  <meta name="og:description" content="{{ .Description }}">
-{{ else if .Site.Params.description }}
-  <meta property="og:description" content="{{ .Site.Params.description}}">
-{{ end }}
-
-<link rel="canonical" href="{{ .Permalink }}">
-=======
 <meta charset="utf-8">

 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 <meta name="viewport" content="width=device-width, initial-scale=1">

@@ -50,7 +6,7 @@
 {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}

 {{ .Hugo.Generator }}

 <title>{{ .Title }}</title>

-<link rel="shortcut icon" href="{{ "images/favicon.ico" | absURL }}">

+<link rel="shortcut icon" href="{{ "/images/favicon.ico" | absURL }}" type="">

 <link rel="stylesheet" href="{{ "css/style.css" | absURL }}">

 <link rel="stylesheet" href="{{ "css/highlight.css" | absURL }}">

 {{ if .Site.Params.customCSS }}

@@ -84,4 +40,3 @@
 {{ end }}

 

 <link rel="canonical" href="{{ .Permalink }}">

->>>>>>> bc3b59fd459be92483fe0d7e20a8169a3ec1543d
diff --git a/layouts/partials/widgets.html b/layouts/partials/widgets.html
index 9bfc682..43f90eb 100644
--- a/layouts/partials/widgets.html
+++ b/layouts/partials/widgets.html
@@ -19,18 +19,10 @@
   </section>

  

   <section class="widget widget-one">

-     <h2 class="widget-title">

-        Widget 2

-    </h2>

     <!-- add content here -->

+    <h2 class="widget-title">Widget 2</h2>

   </section>

     

-  <section itemscope itemtype="https://schema.org/Person" class="widget">

-    <h2 class="widget-title">

-        Widget 3

-    </h2>

-    <!-- add content here -->

-  </section>

     

  <!-- You can add multiple widgets section below -->