Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
nzakas committed Jun 8, 2022
1 parent a4782f0 commit 0b7155c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/src/_includes/components/rule-categories.macro.html
@@ -1,6 +1,6 @@

{%- macro ruleCategories(params) -%}
<div class="rule-categories" aria-label="Rule Categories">
<div class="{% if params.index %}rule-categories{% endif %}" aria-label="Rule Categories">
{%- if params.recommended == true -%}
<div class="rule-category">
<span class="rule-category__icon"><span class="visually-hidden">Recommended</span></span>
Expand Down
5 changes: 2 additions & 3 deletions docs/src/_includes/layouts/doc.html
Expand Up @@ -15,6 +15,7 @@

{# Add in various sections to content so TOC is accurate #}
{% set all_content = content %}
{% set rule_meta = rules_meta[title] %}

{% if related_rules %}
{% set related_rules_content %}
Expand All @@ -36,7 +37,7 @@ <h2 id="further-reading">Further Reading</h2>
{% set all_content = [all_content, further_reading_content] | join %}
{% endif %}

{% if rule_type %}
{% if rule_meta %}
{% set resources_content %}
<h2 id="resources">Resources</h2>
<ul>
Expand All @@ -47,8 +48,6 @@ <h2 id="resources">Resources</h2>
{% set all_content = [all_content, resources_content] | join %}
{% endif %}

{% set rule_meta = rules_meta[title] %}

<div class="docs-content">
<main id="main" tabindex="-1" class="docs-main">
<div class="docs-main__content">
Expand Down
1 change: 1 addition & 0 deletions docs/src/pages/rules.md
Expand Up @@ -15,6 +15,7 @@ eleventyNavigation:
Rules in ESLint are grouped by type to help you understand their purpose. Each rule has emojis denoting:

{{ ruleCategories({
index: true,
recommended: true,
fixable: true,
hasSuggestions: true
Expand Down

0 comments on commit 0b7155c

Please sign in to comment.