diff --git a/src/hexo/_config.yml b/src/hexo/_config.yml index f4e4206..bc92b58 100644 --- a/src/hexo/_config.yml +++ b/src/hexo/_config.yml @@ -15,7 +15,7 @@ timezone: Asia/Shanghai ## Set your site url here. For example, if you use GitHub Page, set url as 'https://username.github.io/project' url: http://example.com root: /lime/ -permalink: :year/:month/:day/:title/ +permalink: posts/:title/ permalink_defaults: pretty_urls: trailing_index: false # Set to false to remove trailing 'index.html' from permalinks @@ -130,7 +130,6 @@ theme_config: navbar: placement: right footer: - partial: footer.html links: - text: OOSS url: https://oss.ourai.ws/ diff --git a/src/hexo/themes/lime/layout/_components/brand-link.ejs b/src/hexo/themes/lime/layout/_ksio/components/brand-link.ejs similarity index 100% rename from src/hexo/themes/lime/layout/_components/brand-link.ejs rename to src/hexo/themes/lime/layout/_ksio/components/brand-link.ejs diff --git a/src/hexo/themes/lime/layout/_components/copyright.ejs b/src/hexo/themes/lime/layout/_ksio/components/copyright.ejs similarity index 100% rename from src/hexo/themes/lime/layout/_components/copyright.ejs rename to src/hexo/themes/lime/layout/_ksio/components/copyright.ejs diff --git a/src/hexo/themes/lime/layout/_components/link.ejs b/src/hexo/themes/lime/layout/_ksio/components/link.ejs similarity index 100% rename from src/hexo/themes/lime/layout/_components/link.ejs rename to src/hexo/themes/lime/layout/_ksio/components/link.ejs diff --git a/src/hexo/themes/lime/layout/_components/nav-list.ejs b/src/hexo/themes/lime/layout/_ksio/components/nav-list.ejs similarity index 51% rename from src/hexo/themes/lime/layout/_components/nav-list.ejs rename to src/hexo/themes/lime/layout/_ksio/components/nav-list.ejs index 81a3a77..538fed5 100644 --- a/src/hexo/themes/lime/layout/_components/nav-list.ejs +++ b/src/hexo/themes/lime/layout/_ksio/components/nav-list.ejs @@ -2,9 +2,9 @@ <% if (_inc_nav.children) { %> <% } else { %> -
  • <%- partial('_components/link', { link: _inc_nav, utm: `utm_source=${theme.meta.url}&utm_medium=common-header`, wrap: false }) %>
  • +
  • <%- partial('_ksio/components/link', { link: _inc_nav, utm: `utm_source=${theme.meta.url}&utm_medium=common-header`, wrap: false }) %>
  • <% } %> <% }) %> diff --git a/src/hexo/themes/lime/layout/_ksio/layouts/index.ejs b/src/hexo/themes/lime/layout/_ksio/layouts/index.ejs new file mode 100644 index 0000000..422a8ba --- /dev/null +++ b/src/hexo/themes/lime/layout/_ksio/layouts/index.ejs @@ -0,0 +1,10 @@ +<%- partial(theme.header && theme.header.partial || '_ksio/partials/header') %> +
    +
    +
    +

    <%= config.title %>

    +

    <%= config.subtitle || config.description %>

    +
    +
    +
    +<%- partial(theme.footer && theme.footer.partial || '_ksio/partials/footer') %> diff --git a/src/hexo/themes/lime/layout/_partials/footer.ejs b/src/hexo/themes/lime/layout/_ksio/partials/footer.ejs similarity index 86% rename from src/hexo/themes/lime/layout/_partials/footer.ejs rename to src/hexo/themes/lime/layout/_ksio/partials/footer.ejs index b13690d..125e152 100644 --- a/src/hexo/themes/lime/layout/_partials/footer.ejs +++ b/src/hexo/themes/lime/layout/_ksio/partials/footer.ejs @@ -5,13 +5,13 @@ <% if (theme.footer && (theme.footer.links || []).length > 0) { %> <% } %> <% if (theme.copyright) { %> diff --git a/src/hexo/themes/lime/layout/_ksio/partials/head.ejs b/src/hexo/themes/lime/layout/_ksio/partials/head.ejs new file mode 100644 index 0000000..0bf810d --- /dev/null +++ b/src/hexo/themes/lime/layout/_ksio/partials/head.ejs @@ -0,0 +1,5 @@ + +<%- partial('_ksio/partials/meta/seo') %> +<%- partial('_ksio/partials/meta/render') %> +<%- partial('_ksio/partials/meta/feed') %> +<%- partial('_ksio/partials/meta/brand') %> diff --git a/src/hexo/themes/lime/layout/_partials/header.ejs b/src/hexo/themes/lime/layout/_ksio/partials/header.ejs similarity index 77% rename from src/hexo/themes/lime/layout/_partials/header.ejs rename to src/hexo/themes/lime/layout/_ksio/partials/header.ejs index 674ca01..63d5b1e 100644 --- a/src/hexo/themes/lime/layout/_partials/header.ejs +++ b/src/hexo/themes/lime/layout/_ksio/partials/header.ejs @@ -11,15 +11,15 @@ <% } %> <% if (theme.brand && theme.brand.parent) { %> - + <% } else { %> - <%- partial('_components/brand-link', { className: 'navbar-brand' }) %> + <%- partial('_ksio/components/brand-link', { className: 'navbar-brand' }) %> <% } %> diff --git a/src/hexo/themes/lime/layout/_partials/meta/brand.ejs b/src/hexo/themes/lime/layout/_ksio/partials/meta/brand.ejs similarity index 100% rename from src/hexo/themes/lime/layout/_partials/meta/brand.ejs rename to src/hexo/themes/lime/layout/_ksio/partials/meta/brand.ejs diff --git a/src/hexo/themes/lime/layout/_partials/meta/feed.ejs b/src/hexo/themes/lime/layout/_ksio/partials/meta/feed.ejs similarity index 100% rename from src/hexo/themes/lime/layout/_partials/meta/feed.ejs rename to src/hexo/themes/lime/layout/_ksio/partials/meta/feed.ejs diff --git a/src/hexo/themes/lime/layout/_partials/meta/render.ejs b/src/hexo/themes/lime/layout/_ksio/partials/meta/render.ejs similarity index 100% rename from src/hexo/themes/lime/layout/_partials/meta/render.ejs rename to src/hexo/themes/lime/layout/_ksio/partials/meta/render.ejs diff --git a/src/hexo/themes/lime/layout/_partials/meta/seo.ejs b/src/hexo/themes/lime/layout/_ksio/partials/meta/seo.ejs similarity index 100% rename from src/hexo/themes/lime/layout/_partials/meta/seo.ejs rename to src/hexo/themes/lime/layout/_ksio/partials/meta/seo.ejs diff --git a/src/hexo/themes/lime/layout/_partials/head.ejs b/src/hexo/themes/lime/layout/_partials/head.ejs deleted file mode 100644 index ad8fe61..0000000 --- a/src/hexo/themes/lime/layout/_partials/head.ejs +++ /dev/null @@ -1,5 +0,0 @@ - -<%- partial('meta/seo') %> -<%- partial('meta/render') %> -<%- partial('meta/feed') %> -<%- partial('meta/brand') %> diff --git a/src/hexo/themes/lime/layout/index.ejs b/src/hexo/themes/lime/layout/index.ejs index d4a54b1..6a8bf20 100644 --- a/src/hexo/themes/lime/layout/index.ejs +++ b/src/hexo/themes/lime/layout/index.ejs @@ -1,10 +1 @@ -<%- partial('_partials/header') %> -
    -
    -
    -

    <%= config.title %>

    -

    <%= config.subtitle || config.description %>

    -
    -
    -
    -<%- partial('_partials/footer') %> +<%- partial('_ksio/layouts/index') %> diff --git a/src/hexo/themes/lime/layout/layout.ejs b/src/hexo/themes/lime/layout/layout.ejs index 14b3eda..b194959 100644 --- a/src/hexo/themes/lime/layout/layout.ejs +++ b/src/hexo/themes/lime/layout/layout.ejs @@ -1,7 +1,7 @@ - <%- partial('_partials/head') %> + <%- partial('_ksio/partials/head') %> <%- css('stylesheets/global') %> <% if (page.__index) { %>