diff --git a/package-lock.json b/package-lock.json index ec0c7c27..2222996b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,7 +4,6 @@ "requires": true, "packages": { "": { - "name": "platform", "license": "MIT + CC BY-NC-SA 4.0", "dependencies": { "@11ty/eleventy-plugin-vite": "^4.0.0", @@ -5197,9 +5196,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001571", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001571.tgz", - "integrity": "sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==", + "version": "1.0.30001642", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", + "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", "funding": [ { "type": "opencollective", diff --git a/src/includes/blocks/header.njk b/src/includes/blocks/header.njk index b13cf4fa..983d6dfa 100644 --- a/src/includes/blocks/header.njk +++ b/src/includes/blocks/header.njk @@ -1,91 +1,137 @@ {% from "blocks/logo.njk" import logo %} -{% macro divider(isLarge) %} - +{% macro devider() %} + {% endmacro %} -{% macro header(pageCategoryId, category, title, link, isLogoContrastColor, hasAccentColor, isMainPage = false, isCategoryVisible = false, isLogoImageHidden = false) %} +{% macro header( + pageCategoryId, + category, + title, + link, + isLogoContrastColor, + hasAccentColor, + isMainPage=false, + isSearchPage=false, + isCategoryVisible=false, + isLogoImageHidden=false) +%} {% set articleIndexes = collections.articleIndexes %} + + {% include "blocks/skip-link.njk" %} +
-
+
    {% if category %} {% if title %} -
  • +
  • {{ category }} - {{ divider() }} + {{ devider() }}
    • {% else %} -
  • +
  • {{ category }}
    • {% endif %} {% endif %} - - {% if title %} -
  • - - {{ title | descriptionMarkdown | safe }} - -
    • - {% endif %}
-
- -
-
+ {% include "blocks/search.njk" %} -
- + {% if (not isMainPage) and (not isSearchPage) %} +
+ + Клавиша / + + + esc + - {% include "blocks/search.njk" %} - {% include "blocks/nav-list.njk" %} +
{% endif %} + + {% if isSearchPage %} + + {% endif %}
+ + {% if not isSearchPage %} +
+ {% include "blocks/nav-list.njk" %} +
+ {% endif %}
{% endmacro %} diff --git a/src/includes/blocks/linked-article.njk b/src/includes/blocks/linked-article.njk index 2c7942f5..d8da329f 100644 --- a/src/includes/blocks/linked-article.njk +++ b/src/includes/blocks/linked-article.njk @@ -1,7 +1,10 @@ {% macro linkedArticle(article, type = 'previous') %} {% set icon = '←' if type === 'previous' else '→' %} -
+
diff --git a/src/includes/blocks/logo.njk b/src/includes/blocks/logo.njk index efe79c9b..c4739fda 100644 --- a/src/includes/blocks/logo.njk +++ b/src/includes/blocks/logo.njk @@ -1,4 +1,10 @@ -{% macro logo(isLink, isContrastColor, class, letters, isImageHidden=false) %} +{% macro logo( + isLink, + isContrastColor, + class, + letters, + isImageHidden = false) +%} {% set logoWrapper = linkLogo if isLink else simpleLogo %} {% set tag = 'a' if isLink else 'div' %} {% set attrs = 'href=/' if isLink %} @@ -17,15 +23,21 @@ <{{tag}} class="{{ classes }}" {{ attrs }}> {% if (not isImageHidden) %} - + + {% endif %} -
Дока
+ + Дока + {% endmacro %} diff --git a/src/includes/blocks/nav-list.njk b/src/includes/blocks/nav-list.njk index 61e8446a..72102c34 100644 --- a/src/includes/blocks/nav-list.njk +++ b/src/includes/blocks/nav-list.njk @@ -1,4 +1,4 @@ -