Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove seo option in _config.yml #1414

Merged
merged 3 commits into from
Mar 21, 2020
Merged

Remove seo option in _config.yml #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4177d
Optimize the structure of brand
stevenjoezhang Mar 14, 2020
455198d
Remove `seo` option in `_config.yml`
stevenjoezhang Mar 14, 2020
1f1e5dd
Revert
stevenjoezhang Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,6 @@ font:
# Disable Baidu transformation on mobile devices.
disable_baidu_transformation: false

# Change headers hierarchy on site-subtitle (will be main site description) and on all post / page titles for better SEO-optimization.
seo: false

# If true, site-subtitle will be added to index page.
# Remember to set up your site-subtitle in Hexo `_config.yml` (e.g. subtitle: Subtitle)
index_with_subtitle: false
Expand Down
6 changes: 3 additions & 3 deletions layout/_macro/post-collapse.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{%- if year !== current_year %}
{%- set current_year = year %}
<div class="collection-year">
<{%- if theme.seo %}h2{% else %}h1{%- endif %} class="collection-header">{{ current_year }}</{%- if theme.seo %}h2{% else %}h1{%- endif %}>
<span class="collection-header">{{ current_year }}</span>
</div>
{%- endif %}

Expand All @@ -22,7 +22,7 @@
</time>
</div>

<{%- if theme.seo %}h3{% else %}h2{%- endif %} class="post-title">
<div class="post-title">
{%- if post.link %}{# Link posts #}
{%- set postTitleIcon = '<i class="fa fa-external-link"></i>' %}
{%- set postText = post.title or post.link %}
Expand All @@ -32,7 +32,7 @@
<span itemprop="name">{{ post.title or __('post.untitled') }}</span>
</a>
{%- endif %}
</{%- if theme.seo %}h3{% else %}h2{%- endif %}>
</div>

</header>
</article>
Expand Down
4 changes: 2 additions & 2 deletions layout/_macro/post.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

{%- if post.header !== false %}
<header class="post-header">
<{%- if theme.seo %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction and post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline">
<{%- if is_index %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction and post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline">
{# Link posts #}
{%- if post.link %}
{%- if post.sticky > 0 %}
Expand All @@ -38,7 +38,7 @@
{{- post.title }}
{{- post_edit(post.source) }}
{%- endif %}
</{%- if theme.seo %}h2{% else %}h1{%- endif %}>
</{%- if is_index %}h2{% else %}h1{%- endif %}>

<div class="post-meta">

Expand Down
18 changes: 6 additions & 12 deletions layout/_partials/header/brand.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,13 @@
</div>
{%- endif %}

<div>
<a href="{{ config.root }}" class="brand" rel="start">
<span class="logo-line-before"><i></i></span>
<span class="site-title">{{ title }}</span>
<span class="logo-line-after"><i></i></span>
</a>
</div>
<a href="{{ config.root }}" class="brand" rel="start">
<span class="logo-line-before"><i></i></span>
<h1 class="site-title">{{ title }}</h1>
<span class="logo-line-after"><i></i></span>
</a>
{%- if subtitle %}
{%- if theme.seo %}
<h1 class="site-subtitle" itemprop="description">{{ subtitle }}</h1>
{% else %}
<p class="site-subtitle">{{ subtitle }}</p>
{%- endif %}
<p class="site-subtitle" itemprop="description">{{ subtitle }}</p>
{%- endif %}
{%- if theme.custom_logo and (theme.scheme === 'Gemini' or theme.scheme === 'Pisces') %}
<a>
Expand Down
10 changes: 2 additions & 8 deletions layout/_partials/header/index.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
{{ partial('_partials/header/brand.swig', {}, {cache: theme.cache.enable}) }}

<nav class="site-nav">
{{ partial('_partials/header/menu.swig', {}, {cache: theme.cache.enable}) }}
</nav>
{{ partial('_partials/header/menu.swig', {}, {cache: theme.cache.enable}) }}

{%- if theme.algolia_search.enable or theme.local_search.enable %}
<div class="site-search">
{{ partial('_partials/search/index.swig', {}, {cache: theme.cache.enable}) }}
</div>
{%- endif %}
{{ partial('_partials/search/index.swig', {}, {cache: theme.cache.enable}) }}

{{- next_inject('header') }}
2 changes: 2 additions & 0 deletions layout/_partials/header/menu.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% import 'menu-item.swig' as menu_item with context %}

<nav class="site-nav">
{%- if theme.menu %}
<ul id="menu" class="menu">
{%- for name, path in theme.menu %}
Expand Down Expand Up @@ -30,3 +31,4 @@
{%- endif %}
</ul>
{%- endif %}
</nav>
4 changes: 2 additions & 2 deletions layout/_partials/page/page-header.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<header class="post-header">

<{%- if theme.seo %}h2{% else %}h1{%- endif %} class="post-title" itemprop="name headline">
<h1 class="post-title" itemprop="name headline">
{{- page.title }}
{{- post_edit(page.source) }}
</{%- if theme.seo %}h2{% else %}h1{%- endif %}>
</h1>

<div class="post-meta">
{%- if page.description %}
Expand Down
18 changes: 10 additions & 8 deletions layout/_partials/search/index.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div class="search-pop-overlay">
<div class="popup search-popup">
{%- if theme.algolia_search.enable %}
{% include 'algolia-search.swig' %}
{% elif theme.local_search.enable %}
{% include 'localsearch.swig' %}
{%- endif %}
{%- if theme.algolia_search.enable or theme.local_search.enable %}
<div class="search-pop-overlay">
<div class="popup search-popup">
{%- if theme.algolia_search.enable %}
{% include 'algolia-search.swig' %}
{% elif theme.local_search.enable %}
{% include 'localsearch.swig' %}
{%- endif %}
</div>
</div>
</div>
{%- endif %}
4 changes: 2 additions & 2 deletions layout/category.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<div class="post-block">
<div class="posts-collapse">
<div class="collection-title">
<{%- if theme.seo %}h2{% else %}h1{%- endif %} class="collection-header">
<h2 class="collection-header">
{{- page.category }}
<small>{{ __('title.category') }}</small>
</{%- if theme.seo %}h2{% else %}h1{%- endif %}>
</h2>
</div>

{{ post_template.render(page.posts) }}
Expand Down
4 changes: 2 additions & 2 deletions layout/tag.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<div class="post-block">
<div class="posts-collapse">
<div class="collection-title">
<{%- if theme.seo %}h2{% else %}h1{%- endif %} class="collection-header">
<h2 class="collection-header">
{{- page.tag }}
<small>{{ __('title.tag') }}</small>
</{%- if theme.seo %}h2{% else %}h1{%- endif %}>
</h2>
</div>

{{ post_template.render(page.posts) }}
Expand Down
5 changes: 2 additions & 3 deletions source/css/_common/components/post/post-collapse.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
}

.collection-year {
font-size: $font-size-largest;
font-weight: bold;
margin: 60px 0;
position: relative;

Expand All @@ -46,7 +48,6 @@
}

.collection-header {
display: inline-block;
margin: 0 0 0 20px;

small {
Expand Down Expand Up @@ -95,8 +96,6 @@

.post-title {
display: inline;
font-size: $font-size-medium;
font-weight: normal;

a, span.exturl {
border-bottom: none;
Expand Down
1 change: 1 addition & 0 deletions source/css/_common/components/post/post-header.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
}

.posts-expand .post-title {
font-size: $font-size-largest;
font-weight: normal;
margin: initial;
text-align: center;
Expand Down
4 changes: 1 addition & 3 deletions source/css/_common/outline/header/site-meta.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@
}

.site-title {
display: inline-block;
font-family: $font-family-logo;
font-size: $font-size-title;
font-weight: normal;
line-height: 1.5;
vertical-align: top;
margin: 0;
}

.site-subtitle {
Expand Down
4 changes: 2 additions & 2 deletions source/css/_variables/base.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ $font-size-small = .875em;
$font-size-medium = 1em;
$font-size-large = 1.125em;
$font-size-larger = 1.25em;
$font-size-largest = 1.375em;
$font-size-largest = 1.5em;


// Headings font size
Expand Down Expand Up @@ -192,7 +192,7 @@ $brand-hover-color = white;
$brand-color-dark = white;
$brand-hover-color-dark = white;

$font-size-title = (hexo-config('font.enable') and hexo-config('font.title.size') is a 'unit') ? unit(hexo-config('font.title.size'), em) : $font-size-largest;
$font-size-title = (hexo-config('font.enable') and hexo-config('font.title.size') is a 'unit') ? unit(hexo-config('font.title.size'), em) : 1.375em;
$font-size-subtitle = $font-size-smaller;
$subtitle-color = $grey-dark;
$site-subtitle-color = $grey-dark;
Expand Down