This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new aa75ab54b04 SOLR-18399: Ship ui-grid icon fonts with the Admin UI
(#4802)
aa75ab54b04 is described below
commit aa75ab54b04470e719cc7ede4a06672e7a5720c4
Author: Jan Høydahl <[email protected]>
AuthorDate: Tue Sep 1 00:25:36 2026 +0200
SOLR-18399: Ship ui-grid icon fonts with the Admin UI (#4802)
---
.../test/org/apache/solr/webapp/AdminUiTestBase.java | 3 ---
solr/webapp/web/css/angular/fonts/ui-grid.eot | Bin 0 -> 10319 bytes
solr/webapp/web/css/angular/fonts/ui-grid.svg | Bin 0 -> 9087 bytes
solr/webapp/web/css/angular/fonts/ui-grid.ttf | Bin 0 -> 10155 bytes
solr/webapp/web/css/angular/fonts/ui-grid.woff | Bin 0 -> 5728 bytes
5 files changed, 3 deletions(-)
diff --git a/solr/webapp/src/test/org/apache/solr/webapp/AdminUiTestBase.java
b/solr/webapp/src/test/org/apache/solr/webapp/AdminUiTestBase.java
index 5d0ea91fe9f..54e1a79d424 100644
--- a/solr/webapp/src/test/org/apache/solr/webapp/AdminUiTestBase.java
+++ b/solr/webapp/src/test/org/apache/solr/webapp/AdminUiTestBase.java
@@ -534,9 +534,6 @@ public abstract class AdminUiTestBase extends
SolrCloudTestCase {
Arrays.stream(allowedSubstrings)
.noneMatch(allowed ->
entry.getMessage().contains(allowed)))
.filter(entry -> !entry.getMessage().contains("favicon.ico"))
- // the ui-grid icon font referenced from ui-grid.min.css is not
shipped with
- // the webapp at all, so it 404s in production too
- .filter(entry -> !entry.getMessage().contains("fonts/ui-grid"))
// benign race in the shared menu code: showCore() fires with a
null core
// while the per-collection menu resolves after navigation
.filter(
diff --git a/solr/webapp/web/css/angular/fonts/ui-grid.eot
b/solr/webapp/web/css/angular/fonts/ui-grid.eot
new file mode 100644
index 00000000000..59cf0aed25b
Binary files /dev/null and b/solr/webapp/web/css/angular/fonts/ui-grid.eot
differ
diff --git a/solr/webapp/web/css/angular/fonts/ui-grid.svg
b/solr/webapp/web/css/angular/fonts/ui-grid.svg
new file mode 100644
index 00000000000..9d2e03c0e3a
Binary files /dev/null and b/solr/webapp/web/css/angular/fonts/ui-grid.svg
differ
diff --git a/solr/webapp/web/css/angular/fonts/ui-grid.ttf
b/solr/webapp/web/css/angular/fonts/ui-grid.ttf
new file mode 100644
index 00000000000..b1a4b061164
Binary files /dev/null and b/solr/webapp/web/css/angular/fonts/ui-grid.ttf
differ
diff --git a/solr/webapp/web/css/angular/fonts/ui-grid.woff
b/solr/webapp/web/css/angular/fonts/ui-grid.woff
new file mode 100644
index 00000000000..426c611501c
Binary files /dev/null and b/solr/webapp/web/css/angular/fonts/ui-grid.woff
differ