fix: issues for displaying

ourai · Mar 23, 2023 · d35646a · d35646a
1 parent fd7561e
commit d35646a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -7,9 +7,9 @@
  "scripts": {
  "build": "node bin generate",
  "clean": "rm -rf src/jekyll/.asset-cache",
- "start": "node bin serve",
+ "start": "node bin site serve",
  "predeploy": "npm run clean",
- "deploy": "node bin deploy"
+ "deploy": "node bin site deploy"
  },
  "repository": {
  "type": "git",

diff --git a/src/jekyll/_assets/images/favicon.ico → src/jekyll/_assets/images/ksio/favicon.ico b/src/jekyll/_assets/images/favicon.ico → src/jekyll/_assets/images/ksio/favicon.ico
diff --git a/src/jekyll/_includes/ksio/components/link.html b/src/jekyll/_includes/ksio/components/link.html
@@ -1,10 +1,4 @@
-{% assign _inc_link = include.link %}
-{% if include.wrap == true %}
- {% capture _inc_text %}<span>{{ _inc_link.text }}</span>{% endcapture %}
-{% else %}
- {% assign _inc_text = _inc_link.text %}
-{% endif %}
-{% if _inc_link.url contains "http" %}
+{% assign _inc_link = include.link %}{% if _inc_link.url contains "http" %}
  {% assign _inc_link_url = _inc_link.url | append: "?" | append: include.utm %}
  {% assign _inc_external = true %}
 {% else %}
@@ -14,5 +8,4 @@
  {% assign _inc_link_url = "javascript:void(0);" %}
  {% endif %}
  {% assign _inc_external = false %}
-{% endif %}
-<a href="{{ _inc_link_url }}"{% if _inc_external %} target="_blank" rel="external "{% endif %}>{{ _inc_text }}</a>
+{% endif %}<a href="{{ _inc_link_url }}"{% if _inc_external %} target="_blank" rel="external "{% endif %}>{% if include.wrap == true %}<span>{{ _inc_link.text }}</span>{% else %}{{ _inc_link.text }}{% endif %}</a>
diff --git a/src/jekyll/_includes/ksio/footer.html b/src/jekyll/_includes/ksio/footer.html
@@ -5,11 +5,7 @@
  {% if site.ksio.links and site.ksio.links.size > 0 %}
  <!-- Important links -->
  <nav class="Footer-navs">
- <ul>
- {% for link in site.ksio.links %}
- <li>{% include ksio/components/link.html link=link wrap=true utm=utm_params %}</li>
- {% endfor %}
- </ul>
+ <ul>{% for link in site.ksio.links %}<li>{% include ksio/components/link.html link=link wrap=true utm=utm_params %}</li>{% endfor %}</ul>
  </nav>
  {% endif %}
  <!-- Copyright -->

diff --git a/src/jekyll/_includes/ksio/meta/brand.html b/src/jekyll/_includes/ksio/meta/brand.html
@@ -1,2 +1,2 @@
 {% if site.ksio.brand.color %}<meta name="theme-color" content="{{ site.ksio.brand.color }}">{% endif %}
-<link rel="icon" href="{{ 'favicon' | asset_path }}">
+<link rel="icon" href="{{ site.ksio.brand.icon | default: 'ksio/favicon' | asset_path }}">
diff --git a/src/jekyll/_layouts/ksio/default.html b/src/jekyll/_layouts/ksio/default.html
@@ -10,7 +10,7 @@
  <head>
  {% include ksio/head.html %}
  <!-- 静态资源 -->
- {% stylesheet ksio/vendors/disqusjs.min %}
+ {% if site.ksio.modules.social.comment.disqus.proxy %}{% stylesheet ksio/vendors/disqusjs.min %}{% endif %}
  {% stylesheet global %}
  {% if layout.css %}
  {% for css in layout.css %}{{ css | stylesheet }}{% endfor %}