8289334: Use CSS variables to define fonts and colors

Reviewed-by: jjg
openjdk · Aug 18, 2022 · d543564 · d543564 · openjdk-notifier · Aug 18, 2022
1 parent 2ee9491
commit d543564
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 194 deletions.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -302,9 +302,6 @@ protected void generateOtherFiles(ClassTree classTree)
             f = DocFile.createFileForOutput(configuration, DocPaths.RESOURCES.resolve(DocPaths.X_IMG));
             f.copyResource(DOCLET_RESOURCES.resolve(DocPaths.X_IMG), true, false);
             copyJqueryFiles();
-
-            f = DocFile.createFileForOutput(configuration, DocPaths.JQUERY_OVERRIDES_CSS);
-            f.copyResource(DOCLET_RESOURCES.resolve(DocPaths.JQUERY_OVERRIDES_CSS), true, true);
         }
 
         copyLegalFiles(options.createIndex());

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -328,9 +328,7 @@ private void addStylesheets(HtmlTree head) {
         }
 
         if (index) {
-            // The order of the addStylesheet(...) calls is important
             addStylesheet(head, DocPaths.SCRIPT_DIR.resolve(DocPaths.JQUERY_UI_CSS));
-            addStylesheet(head, DocPaths.JQUERY_OVERRIDES_CSS);
         }
     }
 

diff --git a/...share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery-ui.overrides.css b/...share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery-ui.overrides.css