tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject [tomcat] 01/01: BZ 63905: Clean up Tomcat CSS
Date Fri, 08 Nov 2019 21:33:04 GMT
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch BZ-63905/9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0346831b2abacc706a75f6e9807a449c89964ae4
Author: Michael Osipov <michaelo@apache.org>
AuthorDate: Thu Nov 7 22:21:27 2019 +0100

    BZ 63905: Clean up Tomcat CSS
    
    Remove duplication in Tomcat CSS which applies to ErrorReportValve,
    DefaultServlet and ManagerServlet as well as update incorrect documentation.
---
 java/org/apache/catalina/util/TomcatCSS.java | 16 +++++++---------
 webapps/docs/changelog.xml                   |  3 +++
 webapps/docs/config/valve.xml                |  5 ++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/util/TomcatCSS.java b/java/org/apache/catalina/util/TomcatCSS.java
index c4f6da3..93f15a9 100644
--- a/java/org/apache/catalina/util/TomcatCSS.java
+++ b/java/org/apache/catalina/util/TomcatCSS.java
@@ -22,15 +22,13 @@ package org.apache.catalina.util;
 public class TomcatCSS {
 
     public static final String TOMCAT_CSS =
-        "h1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
" +
-        "h2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;}
" +
-        "h3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;}
" +
-        "body {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} "
+
-        "b {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} "
+
-        "p {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}
" +
+        "body {font-family:Tahoma,Arial,sans-serif;} " +
+        "h1, h2, h3, b {color:white;background-color:#525D76;} " +
+        "h1 {font-size:22px;} " +
+        "h2 {font-size:16px;} " +
+        "h3 {font-size:14px;} " +
+        "p {font-size:12px;} " +
         "a {color:black;} " +
-        "a.name {color:black;} " +
         ".line {height:1px;background-color:#525D76;border:none;}";
 
-
-}
\ No newline at end of file
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c910d17..0e701f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,9 @@
         to this change it was possible to see an updated last modified time but
         the content would be that prior to the modification. (markt)
       </fix>
+      <update>
+        <bug>63905</bug> Clean up Tomcat CSS. (michaelo)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Coyote">
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 5e05287..72f0584 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -1900,8 +1900,7 @@
     status codes and/or exception types.</p>
 
     <p><strong>NOTE:</strong> Disabling both showServerInfo and showReport
will
-    only return the HTTP status code and remove all CSS from the default
-    response.</p>
+    only return the HTTP status code.</p>
 
   </subsection>
 
@@ -1922,7 +1921,7 @@
         <p>The location of the UTF-8 encoded HTML file to return for the HTTP
         error code represented by <code>nnn</code>. For example,
         <code>errorCode.404</code> specifies the file to return for an HTTP 404
-        error. The location may be relative or absolule. If relative, it must be
+        error. The location may be relative or absolute. If relative, it must be
         relative to <code>$CATALINA_BASE</code>. The special value of
         <code>errorCode.0</code> may be used to define a default error page to
         be used if no error page is defined for a status code. If no matching


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message