Skip to content

Commit 79a4c7b

Browse files
committed
Improve aside
1 parent 4bb0f3e commit 79a4c7b

File tree

2 files changed

+101
-23
lines changed

2 files changed

+101
-23
lines changed

themes/opentermsarchive/assets/css/components/aside.css

Lines changed: 96 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,67 @@
1414
}
1515

1616
.aside_nav{
17+
> ul > li > details > ul > li:last-child,
18+
> ul > li > details > ul > li > ul {
19+
margin-bottom:var(--mS);
20+
}
21+
1722
ul{
1823
color:var(--colorBlack600);
1924
display:flex;
2025
flex-direction:column;
2126

22-
li{
27+
li {
28+
position: relative;
2329
border-bottom:1px solid var(--colorBlack200);
2430

25-
a{
31+
a {
2632
padding: var(--mXS) var(--mS);
2733
display:inline-block;
2834
width:100%;
35+
}
2936

30-
&:hover{
31-
background-color:var(--colorBlack200);
37+
.aside_item-current {
38+
color:var(--colorBlack800);
39+
}
40+
41+
.aside_item-current::before {
42+
content: '';
43+
position: absolute;
44+
left: 0px;
45+
top: var(--m2XS);
46+
bottom: var(--m2XS);
47+
right: 0px;
48+
width: 4px;
49+
background-color: var(--colorPrimary);
50+
border-top-right-radius: 10px;
51+
border-bottom-right-radius: 10px;
52+
z-index: 1;
53+
}
54+
55+
.aside_item-current::after {
56+
content: '';
57+
position: absolute;
58+
left: var(--mXS);
59+
right: var(--m2XS);
60+
top: var(--m2XS);
61+
bottom: var(--m2XS);
62+
background-color: var(--colorBlack200);
63+
z-index: -1;
64+
border-radius: 4px;
65+
}
66+
67+
68+
&.aside_item-current-section {
69+
& .aside_item-current::before {
70+
top: 2px;
71+
bottom: 2px;
72+
}
73+
74+
& .aside_item-current::after {
75+
top: 0;
76+
bottom: 0;
77+
right: var(--mXS);
3278
}
3379
}
3480

@@ -44,8 +90,15 @@
4490
list-style: none;
4591
cursor: pointer;
4692

47-
&:hover{
48-
background-color:var(--colorBlack200);
93+
&:hover::after {
94+
content: '';
95+
position: absolute;
96+
left: 0;
97+
right: 0;
98+
top: 0;
99+
bottom: 0;
100+
background-color: var(--colorBlack200);
101+
z-index: -1;
49102
}
50103

51104
&::marker,
@@ -75,38 +128,63 @@
75128
}
76129
}
77130

78-
ul{
79-
padding-left:var(--mS);
80-
padding-top:var(--m2XS);
81-
padding-bottom:var(--m2XS);
131+
ul {
82132

83133
li{
84134
border:none;
85-
padding-top:var(--m3XS);
86-
padding-bottom:var(--m3XS);
135+
87136

88137
a{
89138
padding: 0;
139+
}
90140

91-
&:hover{
92-
background-color: transparent;
93-
}
141+
> span, a {
142+
padding-left: var(--mS);
143+
}
144+
145+
> a {
146+
padding-left:var(--mL);
147+
padding-top:var(--p3XS);
148+
padding-bottom:var(--p3XS);
149+
border-radius:4px;
150+
}
151+
152+
> a {
153+
padding-left:var(--mS);
94154
}
95155

96156
ul{
97157
padding-top:0;
98-
padding-bottom:0;
99158

159+
160+
/* padding-bottom:var(--mS); */
161+
100162
li{
101163
padding:0;
164+
165+
a {
166+
padding-left:var(--mL);
167+
padding-top:var(--p3XS);
168+
padding-bottom:var(--p3XS);
169+
border-radius:4px;
170+
}
171+
102172
}
103173
}
104174
}
105175
}
106176
}
107177
}
108178

109-
.aside_item-current{
110-
border-left:2px solid var(--colorPrimary);
179+
.aside_item-current-section::before {
180+
content: '';
181+
position: absolute;
182+
left: 0;
183+
top: 0;
184+
bottom: 0;
185+
width: 1px;
186+
background-color: var(--colorPrimary);
187+
border-top-right-radius: 0;
188+
border-bottom-right-radius: 0;
111189
}
112190

themes/opentermsarchive/layouts/partials/aside.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
<nav class="aside_nav">
66
<ul>
7-
<li class="{{ if eq $currentPageRelPermalink .Site.Home.RelPermalink }}aside_item-current{{ end }}"><a href="{{ .Site.Home.RelPermalink }}">{{ .Site.Home.LinkTitle }}</a></li>
7+
<li ><b><a class="{{ if eq $currentPageRelPermalink .Site.Home.RelPermalink }}aside_item-current{{ end }}" href="{{ .Site.Home.RelPermalink }}">{{ .Site.Home.LinkTitle }}</a></b></li>
88
{{ range .Site.Sections.ByWeight }}
9-
<li class="{{ if eq $currentPageSection .Section }}aside_item-current{{ end }}">
9+
<li class="{{ if eq $currentPageSection .Section }}aside_item-current-section{{ end }}">
1010
<details {{ if eq $currentPageSection .Section }}open{{ end }}>
1111
<summary><b>{{ .LinkTitle | markdownify }}</b> <i class="icon" data-lucide="chevron-down"></i></summary>
1212
<ul>
@@ -15,14 +15,14 @@
1515
{{ range $allPages }}
1616
<li>
1717
{{ if .Content }}
18-
<a href="{{ .RelPermalink }}">{{ .LinkTitle | markdownify }}</a>
18+
<a class="{{ if eq $currentPageRelPermalink .RelPermalink }}aside_item-current{{ end }}" href="{{ .RelPermalink }}">{{ .LinkTitle | markdownify }}</a>
1919
{{ else }}
20-
<span>{{ .LinkTitle | markdownify }}</span>
20+
<span class="{{ if eq $currentPageRelPermalink .RelPermalink }}aside_item-current{{ end }}">{{ .LinkTitle | markdownify }}</span>
2121
{{ end }}
2222
{{ if .IsSection }}
2323
<ul>
2424
{{ range .RegularPages.ByWeight }}
25-
<li><a href="{{ .RelPermalink }}">{{ .LinkTitle | markdownify }}</a></li>
25+
<li><a class="{{ if eq $currentPageRelPermalink .RelPermalink }}aside_item-current{{ end }}" href="{{ .RelPermalink }}">{{ .LinkTitle | markdownify }}</a></li>
2626
{{ end }}
2727
</ul>
2828
{{ end }}

0 commit comments

Comments
 (0)