Merge branch 'master' of https://github.com/alshedivat/al-folio into …

…update-bootstrap
rohandebsarkar · Jul 28, 2022 · ccac0d8 · ccac0d8 · vercel · Jul 28, 2022
2 parents 20125e3 + 4817639
commit ccac0d8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/404.html b/404.html
@@ -6,4 +6,4 @@
 redirect: true
 ---
 
-<p>You will be redirected to the main page within 3 seconds. If not redirected, please click <a href="{{ site.baseurl | prepend: site.url }}/">here</a>.</p>
+<p>You will be redirected to the main page within 3 seconds. If not redirected, please click <a href="{{ site.baseurl }}/">here</a>.</p>
diff --git a/README.md b/README.md
@@ -72,6 +72,7 @@ Feel free to add your own page(s) by sending a PR.
 <a href="https://tirtharajdash.github.io" target="_blank">★</a>
 <a href="https://carolinacarreira.github.io" target="_blank">★</a>
 <a href="https://manandey.github.io" target="_blank">★</a>
+<a href="https://johanneshoerner.github.io" target="_blank">★</a>
 </td>
 </tr>
 <tr>

diff --git a/_config.yml b/_config.yml
@@ -91,7 +91,7 @@ contact_note: >
 # Analytics and search engine verification
 # -----------------------------------------------------------------------------
 
-google_analytics:  # your google-analytics ID (format: UA-XXXXXXXXX)
+google_analytics:  # your Goole Analytics measurement ID (format: G-XXXXXXXXXX)
 panelbear_analytics:  # panelbear analytics site ID (format: XXXXXXXXX)
 
 google_site_verification:  # your google-site-verification ID (Google Search Console)

diff --git a/_includes/header.html b/_includes/header.html
@@ -5,8 +5,20 @@
       <nav id="navbar" class="navbar navbar-light navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
         <div class="container">
           {% if page.permalink != '/' -%}
-          <a class="navbar-brand title fw-lighter" href="{{ site.baseurl | prepend: site.url }}/">
-              {%- if site.title == "blank" -%}<span class="fw-bold">{{ site.first_name }}&nbsp;</span>{{ site.middle_name }}  {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif -%}
+          <a class="navbar-brand title fw-lighter" href="{{ site.baseurl }}/">
+            {%- if site.title == "blank" -%}
+              {%- if site.first_name -%}
+                <span class="fw-bold">{{- site.first_name -}}&nbsp;</span>
+              {%- endif -%}
+              {%- if site.middle_name -%}
+                {{- site.middle_name -}}&nbsp;
+              {%- endif -%}
+              {%- if site.last_name -%}
+                {{- site.last_name -}}
+              {%- endif -%}
+            {%- else -%}
+              {{- site.title -}}
+            {%- endif -%}
           </a>
           {%- elsif site.enable_navbar_social -%}
           <!-- Social Icons -->

diff --git a/_includes/scripts/analytics.html b/_includes/scripts/analytics.html
@@ -3,12 +3,12 @@
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
-    function gtag() { dataLayer.push(arguments); }
+    function gtag(){ window.dataLayer.push(arguments); }
     gtag('js', new Date());
     gtag('config', '{{ site.google_analytics }}');
   </script>
-  {%- endif -%}
-  {%- if site.enable_panelbear_analytics -%}
+{%- endif -%}
+{%- if site.enable_panelbear_analytics -%}
   <!-- Panelbear Analytics - We respect your privacy -->
   <script async src="https://cdn.panelbear.com/analytics.js?site={{site.panelbear_analytics}}"></script>
   <script>

diff --git a/_includes/social.html b/_includes/social.html
@@ -53,5 +53,5 @@
             <a href="https://stackoverflow.com/users/{{ site.stackoverflow_id }}" title="Stackoverflow"><i class="fab fa-stack-overflow"></i></a>
             {% endif %}
             {%- if site.rss_icon -%}
-            <a href="{{ site.baseurl | prepend: site.url }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
-            {% endif %}
+            <a href="{{ site.baseurl }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
+            {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -4,7 +4,7 @@
   <!-- Head -->
   <head>
   {%- if page.redirect -%}
-    <meta http-equiv="refresh" content="3; url={{ site.baseurl | prepend: site.url }}/" />
+    <meta http-equiv="refresh" content="3; url={{ site.baseurl }}/" />
   {%- endif -%}
   {% include head.html %}
   </head>