Skip to content

Commit 46e5037

Browse files
authored
Merge pull request #38 from ita-design-system/develop
v0.11.0
2 parents 6c13c37 + 80af5f6 commit 46e5037

File tree

6 files changed

+41
-12
lines changed

6 files changed

+41
-12
lines changed

_includes/libdoc_before_html.liquid

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,18 @@
9292
{%- assign tag_to_replace = '<' | append: libdocSystem.navigationOptions.listElement | append: '>' -%}
9393
{%- assign tag_replacement = '<' | append: libdocSystem.navigationOptions.listElement | append: ' class="d-flex fd-column fg-1 order-1 | m-0 pl-5 o-hidden | ls-none">' -%}
9494
{%- assign eleventyNavigationMenu = eleventyNavigationMenu | replace: tag_to_replace, tag_replacement -%}
95+
96+
{% comment %} header margin {% endcomment %}
97+
{%- assign headerMargin = 'mb-7' -%}
98+
{%- if pageUrlSplit[1] == 'tags' -%}
99+
{%- assign headerMargin = '' -%}
100+
{%- endif -%}
101+
{%- if pageUrlSplit[1] == libdocConfig.blogSlug and pageUrlSplit[2] == null -%}
102+
{%- assign headerMargin = '' -%}
103+
{%- endif -%}
104+
105+
{% comment %} header padding {% endcomment %}
106+
{%- assign headerPadding = '' -%}
107+
{%- if pageUrlSplit[1] != 'tags' and pageUrlSplit[1] != libdocConfig.blogSlug and pageUrlSplit[2] != null -%}
108+
{%- assign headerPadding = 'pb-7' -%}
109+
{%- endif -%}

_includes/libdoc_page.liquid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<main class="pos-relative"
277277
w-100-minus-sidebar="md"
278278
w-100="xs,sm">
279-
<header class="d-flex fd-column | pt-5 {% if pageUrlSplit[1] != 'tags' and pageUrlSplit[1] != libdocConfig.blogSlug %}pb-7{% endif %}">
279+
<header class="d-flex fd-column | pt-5 {{ headerPadding }} {{ headerMargin }}">
280280
<nav class="d-flex jc-space-between | pos-relative">
281281
{% include 'libdoc_breadcrumb' %}
282282
<details id="user_preferences">

core/assets/css/ds__defaults.css

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,8 @@ main > aside > iframe {
708708
main .alert {
709709
font-variation-settings: "wght" 400, "slnt" 0, "CASL" 0, "CRSV" 0;
710710
padding: var(--ita-spacings-3) var(--ita-spacings-5);
711-
border-left-style: solid;
712-
border-left-width: 3px;
711+
border-left-style: dashed;
712+
border-left-width: 1px;
713713
font-size: var(--ita-fontSizes-4);
714714
letter-spacing: -0.01em;
715715
line-height: 1.6em;
@@ -722,7 +722,7 @@ main .alert[data-title]::before {
722722
text-transform: uppercase;
723723
font-size: var(--ita-fontSizes-3);
724724
padding-bottom: var(--ita-spacings-1);
725-
border-bottom-style: solid;
725+
border-bottom-style: dashed;
726726
border-bottom-width: 1px;
727727
}
728728
/* SEARCH OCCURRENCES */
@@ -796,6 +796,9 @@ main .__search-occurrence {
796796
#toc_main li {
797797
break-inside: avoid;
798798
}
799+
#toc_main li a {
800+
text-decoration-color: var(--ita-colors-primary-300);
801+
}
799802

800803
/* SANDBOX */
801804
.sandbox {
@@ -1039,6 +1042,7 @@ input[type="radio"] ~ label::before {
10391042
#floating_toc_container,
10401043
#toc_main,
10411044
#sidebar,
1045+
#user_preferences,
10421046
main h1 a,
10431047
main h2 a,
10441048
main h3 a,

core/assets/js/ui.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ const libdocUi = {
497497
floatingTocMarkup += `
498498
<li>
499499
<a href="${headingReference}"
500-
class="d-flex | pl-5 pr-5 | fs-4 lsp-3 lh-5 fvs-wght-500 | c-primary-500 blwidth-1 blstyle-dashed bcolor-primary-300"
500+
class="d-flex | pl-5 pr-5 | fs-3 lsp-3 lh-5 fvs-wght-400 td-none | c-primary-500 blwidth-1 blstyle-dashed bcolor-primary-300"
501501
pt-2="md"
502502
pb-2="md"
503503
pt-1="xs,sm"

core/libdoc_tags.liquid

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ date: false
1818
{% for tag in collections.myTags %}
1919
{% assign tagName = tag[0] %}
2020
{% assign tagCount = tag[1] %}
21-
<li class="d-flex jc-space-between"
22-
ai-center="sm,md"
23-
ai-end="xs"
21+
<li class="d-flex jc-space-between ai-center"
2422
gap-5="sm,md"
2523
gap-3="xs">
2624
<a href="/tags/{{ tagName }}/"
@@ -34,8 +32,9 @@ date: false
3432
<span class="icon-tag-simple"></span>
3533
<span class="o-hidden | to-ellipsis">{{ tagName }}</span>
3634
</a>
37-
<p class="d-flex | m-0 | lh-1"
35+
<p class="d-flex | m-0 | lh-1"
3836
fd-column="xs"
37+
ai-center="sm,md"
3938
gap-5="sm,md">
4039
<span class="fs-2 ws-nowrap"
4140
fs-1="xs">
@@ -46,7 +45,18 @@ date: false
4645
{{ libdocMessages.pages[libdocConfig.lang] | downcase }}
4746
{% endif %}
4847
</span>
49-
<span class="d-flex gap-1"
48+
<span class="pl-10 pr-10 pt-2 | brad-3 bwidth-1 bstyle-solid bcolor-primary-500"
49+
pl-7="xs"
50+
pr-7="xs"
51+
pt-1="xs"
52+
style="
53+
background: linear-gradient(
54+
90deg,
55+
var(--ita-colors-primary-500) 0%,
56+
var(--ita-colors-primary-500) calc(100% * {{ tagCount }} / {{ highestBound }}),
57+
var(--ita-colors-primary-200) calc(100% * {{ tagCount }} / {{ highestBound }})">
58+
</span>
59+
{% comment %} <span class="d-flex gap-1"
5060
style="background: text linear-gradient(
5161
90deg,
5262
var(--ita-colors-primary-500) 0%,
@@ -57,7 +67,7 @@ date: false
5767
<span class="icon-star-fill" style="color:transparent"></span>
5868
<span class="icon-star-fill" style="color:transparent"></span>
5969
<span class="icon-star-fill" style="color:transparent"></span>
60-
</span>
70+
</span> {% endcomment %}
6171
</p>
6272
</li>
6373
{% endfor %}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eleventy-libdoc",
3-
"version": "0.10.0",
3+
"version": "0.11.0",
44
"description": "An Eleventy starter project to craft slick and responsive documentation",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)