From dev-return-203145-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Thu Nov 7 21:22:13 2019
Return-Path:
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [207.244.88.153])
by mx-eu-01.ponee.io (Postfix) with SMTP id CE5BD180630
for ; Thu, 7 Nov 2019 22:22:12 +0100 (CET)
Received: (qmail 41915 invoked by uid 500); 7 Nov 2019 21:22:09 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help:
List-Unsubscribe:
List-Post:
List-Id:
Reply-To: "Tomcat Developers List"
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 41807 invoked by uid 99); 7 Nov 2019 21:22:09 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Nov 2019 21:22:09 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
id 0299B851DE; Thu, 7 Nov 2019 21:22:09 +0000 (UTC)
Date: Thu, 07 Nov 2019 21:22:09 +0000
To: "dev@tomcat.apache.org"
Subject: [tomcat] 01/01: BZ 63905: Clean up Tomcat CSS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: michaelo@apache.org
In-Reply-To: <157316172888.2036.5053439948265136181@gitbox.apache.org>
References: <157316172888.2036.5053439948265136181@gitbox.apache.org>
X-Git-Host: gitbox.apache.org
X-Git-Repo: tomcat
X-Git-Refname: refs/heads/BZ-63905/9.0.x
X-Git-Reftype: branch
X-Git-Rev: de12b4dac518f3b6a7d0a5c3b6c24eb80d1699e8
X-Git-NotificationType: diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated
Message-Id: <20191107212209.0299B851DE@gitbox.apache.org>
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 de12b4dac518f3b6a7d0a5c3b6c24eb80d1699e8
Author: Michael Osipov
AuthorDate: Thu Nov 7 22:21:27 2019 +0100
BZ 63905: Clean up Tomcat CSS
Remove duplication in Tomcat CSS which applies both ErrorReportValve and
DefaultServlet as well as update incorrect documentation.
---
java/org/apache/catalina/util/TomcatCSS.java | 16 +++++++---------
webapps/docs/config/valve.xml | 5 ++---
2 files changed, 9 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/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.
NOTE: Disabling both showServerInfo and showReport will
- only return the HTTP status code and remove all CSS from the default
- response.
+ only return the HTTP status code.
@@ -1922,7 +1921,7 @@
The location of the UTF-8 encoded HTML file to return for the HTTP
error code represented by nnn
. For example,
errorCode.404
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 $CATALINA_BASE
. The special value of
errorCode.0
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