Merge pull request #520 from ZakKemble/fix-script-location-and-url-encode

cotes2020 · web-flow · commit d2bbcb791fe1 · 2022-03-03T21:06:48.000+08:00
diff --git a/_includes/head.html b/_includes/head.html
@@ -87,4 +87,7 @@
 
   <script src="{{ site.data.assets[origin].jquery.js }}"></script>
 
+  {% unless site.theme_mode %}
+    {% include mode-toggle.html %}
+  {% endunless %}
 </head>
diff --git a/_includes/post-sharing.html b/_includes/post-sharing.html
@@ -6,10 +6,11 @@
   <span class="share-label text-muted mr-1">{{ site.data.locales[lang].post.share }}</span>
   <span class="share-icons">
     {% capture title %}{{ page.title }} - {{ site.title }}{% endcapture %}
-    {% assign url = page.url | absolute_url %}
+    {% assign title = title | url_encode %}
+    {% assign url = page.url | absolute_url | url_encode %}
 
     {% for share in site.data.share.platforms %}
-      {% assign link = share.link | replace: 'TITLE', title | replace: 'URL', url | escape %}
+      {% assign link = share.link | replace: 'TITLE', title | replace: 'URL', url %}
         <a href="{{ link }}" data-toggle="tooltip" data-placement="top"
           title="{{ share.type }}" target="_blank" rel="noopener" aria-label="{{ share.type }}">
           <i class="fa-fw {{ share.icon }}"></i>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -19,10 +19,6 @@
 
   {% include head.html %}
 
-  {% unless site.theme_mode %}
-    {% include mode-toggle.html %}
-  {% endunless %}
-
   <body data-spy="scroll" data-target="#toc" data-topbar-visible="true">
 
     {% include sidebar.html %}
