From 0fdd84288cf7a6bc65a7a2e363e7f9481d4e85ff Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 26 Aug 2024 13:18:58 +0200 Subject: [PATCH 1/8] update ui --- package-lock.json | 14 ++++++++++++++ ui | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 7ec78f946..eff8b4aef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18588,6 +18588,16 @@ "is-typedarray": "^1.0.0" } }, + "node_modules/typeface-ibm-plex-mono": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/typeface-ibm-plex-mono/-/typeface-ibm-plex-mono-1.1.13.tgz", + "integrity": "sha512-3eKSfAvBOixlrYAMgvCXHN1xxSzxb5fIsfYCgH41gXcYwg2fdhl4d8yCdq2+o74YFFg1Xemkn4/RCVtkyVs6+A==" + }, + "node_modules/typeface-noto-sans": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/typeface-noto-sans/-/typeface-noto-sans-1.1.13.tgz", + "integrity": "sha512-kXh+qmc6lS5VZKyELW0VgtXAFP9C8KC44+hdqpl4bhdNG+Y5u7txrPURUE+5Wo8/mIpUz2A48O866zrcY/L/fw==" + }, "node_modules/typeface-roboto-mono": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz", @@ -19821,6 +19831,10 @@ "ui": { "name": "@antora/ui-default", "license": "MPL-2.0", + "dependencies": { + "typeface-ibm-plex-mono": "^1.1.13", + "typeface-noto-sans": "^1.1.13" + }, "devDependencies": { "@asciidoctor/core": "~2.2", "@asciidoctor/tabs": "^1.0.0-beta.6", diff --git a/ui b/ui index 57c528f49..659f9381b 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 57c528f494cc45c8953006be3ca082b5e699c951 +Subproject commit 659f9381b0765dd1a670365f0312abe6215dbcdb From 2203e905afa839b1c3ef68e93159bd58859557fd Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 26 Aug 2024 13:33:59 +0200 Subject: [PATCH 2/8] update ui --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 659f9381b..180e84140 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 659f9381b0765dd1a670365f0312abe6215dbcdb +Subproject commit 180e84140251d3671c74592992116fc3be82eaea From 5ebca5de51a5867f15d878d5395d8ab60c0e5c4c Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 26 Aug 2024 14:32:15 +0200 Subject: [PATCH 3/8] update ui --- package-lock.json | 49 ++++++++++++++++++++--------------------------- ui | 2 +- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index eff8b4aef..6654a190a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -754,6 +754,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@fontsource/ibm-plex-mono": { + "version": "5.0.14", + "resolved": "https://registry.npmjs.org/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.0.14.tgz", + "integrity": "sha512-727fOjiog6PbVkfLTRaiba5vus9z00RrGuoxif85FIKljXkoLxrSEKmACz0ldzLJy6KuEwnj5JBq2h4SUC0N8w==", + "dev": true + }, + "node_modules/@fontsource/noto-sans": { + "version": "5.0.22", + "resolved": "https://registry.npmjs.org/@fontsource/noto-sans/-/noto-sans-5.0.22.tgz", + "integrity": "sha512-PwjvKPGFbgpwfKjWZj1zeUvd7ExUW2AqHE9PF9ysAJ2gOuzIHWE6mEVIlchYif7WC2pQhn+g0w6xooCObVi+4A==", + "dev": true + }, + "node_modules/@fontsource/roboto-mono": { + "version": "5.0.19", + "resolved": "https://registry.npmjs.org/@fontsource/roboto-mono/-/roboto-mono-5.0.19.tgz", + "integrity": "sha512-v9xg3ewKQoOJVKZWzRvFIT75mtTkrvKbyx52SScre0qRfvEWt9WvOLoR+Wsxfj4l0A4kwGPlOdNs6sy74OJoow==", + "dev": true + }, "node_modules/@humanwhocodes/config-array": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", @@ -18588,28 +18606,6 @@ "is-typedarray": "^1.0.0" } }, - "node_modules/typeface-ibm-plex-mono": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/typeface-ibm-plex-mono/-/typeface-ibm-plex-mono-1.1.13.tgz", - "integrity": "sha512-3eKSfAvBOixlrYAMgvCXHN1xxSzxb5fIsfYCgH41gXcYwg2fdhl4d8yCdq2+o74YFFg1Xemkn4/RCVtkyVs6+A==" - }, - "node_modules/typeface-noto-sans": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/typeface-noto-sans/-/typeface-noto-sans-1.1.13.tgz", - "integrity": "sha512-kXh+qmc6lS5VZKyELW0VgtXAFP9C8KC44+hdqpl4bhdNG+Y5u7txrPURUE+5Wo8/mIpUz2A48O866zrcY/L/fw==" - }, - "node_modules/typeface-roboto-mono": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz", - "integrity": "sha512-pnzDc70b7ywJHin/BUFL7HZX8DyOTBLT2qxlJ92eH1UJOFcENIBXa9IZrxsJX/gEKjbEDKhW5vz/TKRBNk/ufQ==", - "dev": true - }, - "node_modules/typeface-titillium-web": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/typeface-titillium-web/-/typeface-titillium-web-1.1.13.tgz", - "integrity": "sha512-R21mXf9hoqle+dgR7k6C6QUN2XElopQNsTDYI5DoU1buuYayVvzn2jd2ihKJTwM/hJsltLrlJUkyumc3FFgevA==", - "dev": true - }, "node_modules/typescript": { "version": "3.9.10", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", @@ -19831,13 +19827,12 @@ "ui": { "name": "@antora/ui-default", "license": "MPL-2.0", - "dependencies": { - "typeface-ibm-plex-mono": "^1.1.13", - "typeface-noto-sans": "^1.1.13" - }, "devDependencies": { "@asciidoctor/core": "~2.2", "@asciidoctor/tabs": "^1.0.0-beta.6", + "@fontsource/ibm-plex-mono": "^5.0.14", + "@fontsource/noto-sans": "^5.0.22", + "@fontsource/roboto-mono": "^5.0.19", "autoprefixer": "^10.4", "browser-pack-flat": "^3.4", "browserify": "^17.0", @@ -19874,8 +19869,6 @@ "require-from-string": "^2.0", "stylelint": "^13.13", "stylelint-config-standard": "^22", - "typeface-roboto-mono": "1.1.13", - "typeface-titillium-web": "1.1.13", "vinyl-buffer": "^1.0", "vinyl-fs": "^3.0" }, diff --git a/ui b/ui index 180e84140..721d7abc5 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 180e84140251d3671c74592992116fc3be82eaea +Subproject commit 721d7abc54704682e8265196cc25ffeceffbbee0 From 90516e5e09d8ec67d8c03b129e805cac549538a3 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 26 Aug 2024 16:19:44 +0200 Subject: [PATCH 4/8] update ui --- package-lock.json | 13 +++++++------ ui | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6654a190a..581d8292b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -766,11 +766,10 @@ "integrity": "sha512-PwjvKPGFbgpwfKjWZj1zeUvd7ExUW2AqHE9PF9ysAJ2gOuzIHWE6mEVIlchYif7WC2pQhn+g0w6xooCObVi+4A==", "dev": true }, - "node_modules/@fontsource/roboto-mono": { - "version": "5.0.19", - "resolved": "https://registry.npmjs.org/@fontsource/roboto-mono/-/roboto-mono-5.0.19.tgz", - "integrity": "sha512-v9xg3ewKQoOJVKZWzRvFIT75mtTkrvKbyx52SScre0qRfvEWt9WvOLoR+Wsxfj4l0A4kwGPlOdNs6sy74OJoow==", - "dev": true + "node_modules/@fontsource/noto-sans-mono": { + "version": "5.0.20", + "resolved": "https://registry.npmjs.org/@fontsource/noto-sans-mono/-/noto-sans-mono-5.0.20.tgz", + "integrity": "sha512-4+t+dAnKvihf/uxLw7ZTQc6sTzLvz7PR+p6S9+nHWT8ym05QQiYoUj9L8xwaAACf23SyfCifbhc7EN/RdFwxHw==" }, "node_modules/@humanwhocodes/config-array": { "version": "0.5.0", @@ -19827,12 +19826,14 @@ "ui": { "name": "@antora/ui-default", "license": "MPL-2.0", + "dependencies": { + "@fontsource/noto-sans-mono": "^5.0.20" + }, "devDependencies": { "@asciidoctor/core": "~2.2", "@asciidoctor/tabs": "^1.0.0-beta.6", "@fontsource/ibm-plex-mono": "^5.0.14", "@fontsource/noto-sans": "^5.0.22", - "@fontsource/roboto-mono": "^5.0.19", "autoprefixer": "^10.4", "browser-pack-flat": "^3.4", "browserify": "^17.0", diff --git a/ui b/ui index 721d7abc5..3549303e2 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 721d7abc54704682e8265196cc25ffeceffbbee0 +Subproject commit 3549303e2808dc9db6c0f0fd3512afb199aef06f From a28bf2290c41174c18d02abd596e2387d6982ffe Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 26 Aug 2024 16:36:15 +0200 Subject: [PATCH 5/8] update ui --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 3549303e2..4c2186f21 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 3549303e2808dc9db6c0f0fd3512afb199aef06f +Subproject commit 4c2186f219de7360365367d186773aa21188085e From e767ebae51ea4fef4217cf573f17bdc476b66511 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Wed, 28 Aug 2024 15:39:18 +0200 Subject: [PATCH 6/8] Update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 4c2186f21..727d5ec47 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 4c2186f219de7360365367d186773aa21188085e +Subproject commit 727d5ec474c2639228d3f60065124fccbbb0c4fe From f6a215080cb944ab50f19515ff6b3a2211c3ff73 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Thu, 29 Aug 2024 09:35:36 +0200 Subject: [PATCH 7/8] Update UI --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 727d5ec47..45d3e639c 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 727d5ec474c2639228d3f60065124fccbbb0c4fe +Subproject commit 45d3e639cbb5825af00d8439bcf749b1d4037a0b From 6743d0ec353c773c5034b79e6749858b5ea162cf Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Thu, 29 Aug 2024 09:52:36 +0200 Subject: [PATCH 8/8] switch UI branch back to 'stackable' --- ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui b/ui index 45d3e639c..c9a8e3153 160000 --- a/ui +++ b/ui @@ -1 +1 @@ -Subproject commit 45d3e639cbb5825af00d8439bcf749b1d4037a0b +Subproject commit c9a8e3153a9aa05d7338692a41c205890c64420c