Skip to content

Commit 6836155

Browse files
committed
fix: search links scroll to section
- also search results are now unified - concordance view does no longer center search term - less markup
1 parent e9f8139 commit 6836155

File tree

6 files changed

+177
-201
lines changed

6 files changed

+177
-201
lines changed
Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
:root {
2-
--primary: #3B86C6;
2+
/* black and white */
3+
--white: #f3f3f3;
4+
--black: #232528;
5+
6+
/* brand colors */
7+
--primary: #0088cc;
38
--grey: #737577;
49
--darkgrey: #4D4C4E;
510

6-
--lighterprimary: #d3e1ec;
7-
8-
--secondary: color-mix(in oklab, var(--primary) 80%, var(--black));
9-
--darktext: #47453f;
11+
/* shades */
12+
--lighterprimary: color-mix(in oklab, var(--primary) 50%, var(--white));
13+
--lightprimary: color-mix(in oklab, var(--primary) 25%, var(--white));
14+
--darkerprimary: color-mix(in oklab, var(--primary) 85%, var(--black));
15+
--darkprimary: color-mix(in oklab, var(--primary) 50%, var(--black));
1016
--lightgrey: #dfdfe0;
1117

12-
--white: #f3f3f3;
13-
--black: #232528;
18+
/* text */
19+
--darktext: #383426;
20+
21+
/* secondary color + shade */
22+
--secondary: #ffcb05;
23+
--lightersecondary: #fef8c4;
24+
}
1425

15-
--yell: #ffcb05;
16-
--whisper: #fef8c4;
26+
::selection {
27+
background: var(--lightprimary);
1728
}

src/main/frontend/sass/_doc.scss

Lines changed: 38 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
@charset "utf-8";
22

3-
table a {
4-
padding-left: 3px;
5-
padding-right: 3px;
3+
/* toc */
4+
#sidebar h3 {
5+
margin-block: 1.21rem .96rem;
66
}
77

8-
span.score {
9-
color: var(--lightgrey);
10-
}
118

12-
.section {
13-
margin-block-end: 1rem;
9+
/* search results rendering */
10+
11+
/* hit row */
12+
article.hit {
13+
border-block-start: thin solid var(--lighterprimary);
1414
color: var(--darktext);
15+
margin-block-end: 1rem;
1516
}
1617

17-
div.headings, td.headings {
18-
background: var(--lightgrey);
18+
/* hit headline (breadcrumb) */
19+
header.hit-heading {
1920
font-size: 1.5rem;
2021
color: var(--grey);
22+
margin-block-start: .5rem;
23+
margin-block-end: .25rem;
2124
}
2225

23-
td.previous {
24-
text-align: right;
26+
header .separator {
27+
margin-inline: .2rem;
2528
}
2629

27-
.kwic .hi {
28-
margin: 0 .5em 0 .5em;
30+
.hit mark, .hit .hi {
31+
background: var(--lightersecondary);
2932
text-align: center;
3033
}
3134

32-
table[class="kwic"] {
33-
border-collapse: separate;
34-
border-spacing: 0 .5em;
35+
/*
36+
p.previous {
37+
text-align: right;
3538
}
39+
*/
3640

3741
section dl.dl-horizontal {
3842
dt {
@@ -50,35 +54,22 @@ section dl.dl-horizontal {
5054
padding: 6px 4px;
5155
}
5256

53-
#content .content dt {
54-
font-weight: bold;
55-
word-wrap: break-word;
57+
/* note blocks */
58+
59+
.alert-success h4 {
60+
color: var(--bs-success-text-emphasis);
61+
}
62+
63+
.alert-danger h4 {
64+
color: var(--bs-danger-text-emphasis);
5665
}
5766

5867
.content {
59-
font: 16px/24px Georgia, "Times New Roman", Times, serif;
60-
color: #555;
68+
color: var(--darktext);
69+
6170
section {
6271
clear: both;
6372
}
64-
h1 {
65-
font-family: "QuicksandBook", "Arial", Helvetica, sans-serif;
66-
font-size: 1.75em;
67-
font-weight: bold;
68-
margin: .8em 0 0 0;
69-
}
70-
h2 {
71-
color: var(--primary);
72-
font-family: "QuicksandBook", "Arial", Helvetica, sans-serif;
73-
font-size: 1.33em;
74-
font-weight: bold;
75-
margin: .3em 0 0;
76-
padding: 10px 0 5px;
77-
}
78-
h3 {
79-
font-size: 1em;
80-
font-weight: bold;
81-
}
8273
table {
8374
margin: .5em 1em;
8475
}
@@ -140,8 +131,8 @@ section dl.dl-horizontal {
140131
}
141132
dl.wide {
142133
dt {
143-
width: 35em;
144134
word-wrap: break-word;
135+
font-weight: bold;
145136
}
146137
dd {
147138
margin-left: 1.5em;
@@ -181,11 +172,15 @@ section dl.dl-horizontal {
181172
margin-bottom: .85em;
182173
}
183174
.guimenuitem {
184-
background: var(--whisper);
175+
background: var(--lightersecondary);
185176
}
186177
.example {
187178
margin: .25em 0 .25em 1em;
188179
padding: 10px 10px;
189-
border: 1px solid #707070;
180+
border: 1px solid var(--grey);
181+
}
182+
183+
a[name] {
184+
scroll-margin-top: 1rem;
190185
}
191186
}

src/main/frontend/sass/_general.scss

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,51 @@
66
font-style: normal;
77
}
88

9-
h1, h2 {
9+
body {
10+
min-height: 100vh;
11+
background-color: var(--white);
12+
position: relative;
13+
}
14+
15+
h1, h2, h3 {
1016
font-family: "QuicksandBook", "Arial", Helvetica, sans-serif;
11-
font-weight: bold;
1217
}
1318

1419
h1 {
15-
font-size: 1.75rem;
16-
padding: 0px 0 5px;
17-
margin: 0;
1820
color: var(--primary);
21+
font-weight: bold;
22+
font-size: 3.25rem;
23+
letter-spacing: -.05em;
1924
}
2025

2126
h2 {
22-
font-size: 1.25rem;
23-
padding: 10px 0;
24-
letter-spacing: 1px;
27+
color: var(--darkerprimary);
28+
font-weight: bold;
29+
font-size: 2.25rem;
30+
letter-spacing: -.05em;
2531
}
2632

2733
h3 {
28-
font-size: 1.125rem;
29-
padding: 10px 0 5px;
30-
margin: 0 0 5px;
31-
font-weight: bold;
34+
color: var(--darkprimary);
35+
font-size: 1.85rem;
3236
}
3337

3438
h4 {
35-
font-size: 1rem;
36-
padding: 10px 0;
39+
font-size: 1.2rem;
3740
font-style: italic;
3841
font-weight: normal;
3942
}
4043

4144
h5 {
4245
font-size: 1rem;
43-
padding: 10px 0;
4446
font-weight: normal;
4547
}
4648

4749
a {
48-
color: var(--primary);
50+
color: var(--darkerprimary);
4951
text-decoration: none;
5052
&:hover {
51-
color: var(--secondary);
53+
color: var(--darkprimary);
5254
text-decoration: underline;
5355
}
5456
}
@@ -112,10 +114,6 @@ input:required:valid {
112114
margin: 10px 0;
113115
}
114116

115-
.hi {
116-
background: #FFED3D;
117-
}
118-
119117
.hidden {
120118
display: none;
121119
}
@@ -156,34 +154,34 @@ input:required:valid {
156154

157155
.btn-info {
158156
--bs-btn-color: var(--black);
159-
--bs-btn-bg: var(--yell);
160-
--bs-btn-border-color: var(--yell);
157+
--bs-btn-bg: var(--secondary);
158+
--bs-btn-border-color: var(--secondary);
161159
--bs-btn-hover-color: var(--black);
162-
--bs-btn-hover-bg: var(--yell);
163-
--bs-btn-hover-border-color: var(--yell);
160+
--bs-btn-hover-bg: var(--secondary);
161+
--bs-btn-hover-border-color: var(--secondary);
164162
--bs-btn-focus-shadow-rgb: 11,172,204;
165163
--bs-btn-active-color: var(--black);
166-
--bs-btn-active-bg: var(--yell);
167-
--bs-btn-active-border-color: var(--yell);
164+
--bs-btn-active-bg: var(--secondary);
165+
--bs-btn-active-border-color: var(--secondary);
168166
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
169167
--bs-btn-disabled-color: var(--black);
170-
--bs-btn-disabled-bg: var(--yell);
171-
--bs-btn-disabled-border-color: var(--yell);
168+
--bs-btn-disabled-bg: var(--secondary);
169+
--bs-btn-disabled-border-color: var(--secondary);
172170
}
173171

174172
.btn-outline-info {
175-
--bs-btn-color: var(--yell);
176-
--bs-btn-border-color: var(--yell);
173+
--bs-btn-color: var(--secondary);
174+
--bs-btn-border-color: var(--secondary);
177175
--bs-btn-hover-color: var(--black);
178-
--bs-btn-hover-bg: var(--yell);
179-
--bs-btn-hover-border-color: var(--yell);
176+
--bs-btn-hover-bg: var(--secondary);
177+
--bs-btn-hover-border-color: var(--secondary);
180178
--bs-btn-focus-shadow-rgb: 13,202,240;
181179
--bs-btn-active-color: var(--black);
182-
--bs-btn-active-bg: var(--yell);
183-
--bs-btn-active-border-color: var(--yell);
180+
--bs-btn-active-bg: var(--secondary);
181+
--bs-btn-active-border-color: var(--secondary);
184182
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
185-
--bs-btn-disabled-color: var(--yell);
186-
--bs-btn-disabled-border-color: var(--yell);
183+
--bs-btn-disabled-color: var(--secondary);
184+
--bs-btn-disabled-border-color: var(--secondary);
187185
}
188186

189187
.toc {

0 commit comments

Comments
 (0)