Skip to content

Commit 0e569b8

Browse files
lfranckemojavelinuxnintendoeatsDmitriy RazmakhovNabil Maynard
authored
chore: Sync the vendored UI with upstream antora-ui-default, part 1: clean ports (#906)
Co-authored-by: Dan Allen <dan@opendevise.com> Co-authored-by: Adrian Hall <adrian@hallmonitor.ca> Co-authored-by: Dmitriy Razmakhov <4627811-cpkio@users.noreply.github.com> Co-authored-by: Nabil Maynard <nabil.maynard@pingidentity.com> Co-authored-by: Nabil Maynard <nadreck@gmail.com>
1 parent 3127ed5 commit 0e569b8

20 files changed

Lines changed: 255 additions & 84 deletions

ui/NOTICE

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ This UI is a fork of the Antora Default UI
33
Mozilla Public License 2.0 (see LICENSE). Modifications are
44
(c) Stackable GmbH and remain under MPL-2.0.
55

6+
Upstream commits are periodically ported into this fork with their
7+
original authorship preserved in the git history. The upstream authors
8+
are not signatories of the Stackable CLA; their code is included solely
9+
under the terms of the MPL-2.0. See README.adoc, section "Provenance
10+
and the Stackable CLA".
11+
612
This directory ships with (and its build output bundles) the following
713
third-party components. Build-time minification strips embedded license
814
header comments; this file preserves the attributions and is included

ui/README.adoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,23 @@ Copyright (C) 2017-present OpenDevise Inc. and the Antora Project.
105105
Use of this software is granted under the terms of the https://www.mozilla.org/en-US/MPL/2.0/[Mozilla Public License Version 2.0] (MPL-2.0).
106106
See link:LICENSE[] to find the full license text.
107107

108+
=== Provenance and the Stackable CLA
109+
110+
This directory is a fork of the MPL-2.0-licensed https://gitlab.com/antora/antora-ui-default[Antora Default UI], and upstream commits are periodically ported into it (see link:UPSTREAM[]).
111+
Ported commits keep their original upstream authorship in the git history.
112+
113+
The upstream authors have not signed the Stackable CLA and are not expected to.
114+
Their code is included solely under the terms of the MPL-2.0 (see link:LICENSE[]), not under the CLA.
115+
This is intentional and applies only to the contents of this directory.
116+
As a practical consequence, the CLA check fails on pull requests that port upstream commits; such PRs are merged with an administrative override after review.
117+
118+
To list the authors of ported code:
119+
120+
[source,bash]
121+
----
122+
git log --format='%an <%ae>' -- ui/ | sort -u
123+
----
124+
108125
== Authors
109126

110127
Development of Antora is led and sponsored by {url-opendevise}[OpenDevise Inc].

ui/src/css/admonition.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111

1212
/* Don't use uppercase for captions */
13-
& .icon {
13+
& td.icon i::after {
1414
text-transform: none;
1515
}
1616
}
@@ -31,7 +31,7 @@
3131
/* Adjust styles for the "wrong" code style rule usage */
3232
.doc .admonitionblock.code-rule.warning {
3333
/* Change the color of the "important" admonition back to the default red */
34-
& .icon {
34+
& td.icon i {
3535
background-color: #e40046;
3636
}
3737

ui/src/css/base.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ html {
88
box-sizing: border-box;
99
font-size: var(--body-font-size);
1010
height: 100%;
11+
scroll-behavior: smooth;
1112
}
1213

1314
@media screen and (min-width: 1024px) {
@@ -22,6 +23,7 @@ body {
2223
font-family: var(--body-font-family);
2324
line-height: var(--body-line-height);
2425
margin: 0;
26+
tab-size: 4;
2527
word-wrap: anywhere; /* aka overflow-wrap; used when hyphens are disabled or aren't sufficient */
2628
}
2729

@@ -98,6 +100,15 @@ object[type="image/svg+xml"]:not([width]) {
98100
width: fit-content;
99101
}
100102

103+
.hide,
104+
.is-hidden {
105+
display: none !important;
106+
}
107+
108+
::placeholder {
109+
opacity: 0.5;
110+
}
111+
101112
@supports (scrollbar-width: thin) {
102113
body * {
103114
scrollbar-width: thin;

ui/src/css/breadcrumbs.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
display: none;
33
flex: 1 1;
44
padding: 0 0.5rem 0 0.75rem;
5-
line-height: var(--nav-line-height);
5+
line-height: 1.25;
66
}
77

88
@media screen and (min-width: 1024px) {

0 commit comments

Comments
 (0)