Fix invisible/barely visible Go button in help webapp

akurtakov · akurtakov · commit c51be7abbcad · 2025-04-16T10:06:36.000+03:00
This is coming from usage of deprecated css colors (https://developer.mozilla.org/en-US/docs/Web/CSS/system-color#deprecated_system_color_keywords ) which Webkit seems to no longer support at all and Firefox has some very basic and no longer good support. Replaced the deprecated colors with their "analogs" as per that page. Fixes #1823
diff --git a/ua/org.eclipse.help.webapp/advanced/advanced.jsp b/ua/org.eclipse.help.webapp/advanced/advanced.jsp
@@ -41,7 +41,7 @@ BODY {
 	font: <%=prefs.getViewFont()%>;
 	font-size: .875rem;
 	background:<%=prefs.getToolbarBackground()%>;
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 	padding:0px;
 	margin:0px;
 }
@@ -72,14 +72,14 @@ FORM {
 }
 
 #searchWord {
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 	width:100%;
 	font:icon;
 	font-size:.875rem;
 }
 
 #booksContainer {
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 	margin:0px 10px;
 	overflow:auto;
 }
@@ -99,7 +99,7 @@ FORM {
 if (data.isMozilla()) {
 %>
 input[type="checkbox"] {
-	border:2px solid ThreeDShadow; 
+	border:2px solid CanvasText; 
 	margin:0xp; 
 	padding:0px;	
 	height:12px;
@@ -225,7 +225,7 @@ for (int i=0; i<tocData.getTocCount(); i++)
   			<table cellspacing=10 cellpading=0 border=0 align=<%=isRTL?"left":"right"%>  style="background:transparent;">
 				<tr>
 					<td>
-						<input id="searchButton" class='button' type="submit" role="button" onclick="doAdvancedSearch()" value="<%=ServletResources.getString("SearchLabel", request)%>"  id="go" alt="<%=ServletResources.getString("SearchLabel", request)%>" title="<%=ServletResources.getString("SearchLabel", request)%>">
+						<input class='button' type="submit" role="button" onclick="doAdvancedSearch()" value="<%=ServletResources.getString("GO", request)%>"  id="go" alt="<%=ServletResources.getString("SearchLabel", request)%>" title="<%=ServletResources.getString("GO", request)%>">
 					</td>
 					<td>
 					  	<input class='button' type="button" onclick="window.close()"  type="button"  value="<%=ServletResources.getString("Cancel", request)%>"  id="cancel" alt="<%=ServletResources.getString("Cancel", request)%>" title="<%=ServletResources.getString("Cancel", request)%>">
diff --git a/ua/org.eclipse.help.webapp/advanced/content.jsp b/ua/org.eclipse.help.webapp/advanced/content.jsp
@@ -30,16 +30,16 @@
 if (data.isMozilla()) {
 %>
 HTML {
-	border-<%=isRTL?"left":"right"%>:1px solid ThreeDShadow;
+	border-<%=isRTL?"left":"right"%>:1px solid CanvasText;
 }
 <% 
 } else {
 %>
 FRAMESET {
-	border-top:1px solid ThreeDShadow;
-	border-left:1px solid ThreeDShadow;
-	border-right:1px solid ThreeDShadow;
-	border-bottom:1px solid ThreeDShadow;
+	border-top:1px solid CanvasText;
+	border-left:1px solid CanvasText;
+	border-right:1px solid CanvasText;
+	border-bottom:1px solid CanvasText;
 }
 <%
 }
diff --git a/ua/org.eclipse.help.webapp/advanced/deferredView.css b/ua/org.eclipse.help.webapp/advanced/deferredView.css
@@ -15,7 +15,7 @@
 body { 
 	font: <%=prefs.getViewFont()%>;
 	font-size: .875rem;
-	color: WindowText;
+	color: CanvasText;
 	margin-top: 8px;
 	margin-left: 10px;
 	margin-right: 10px;
diff --git a/ua/org.eclipse.help.webapp/advanced/indexView.css b/ua/org.eclipse.help.webapp/advanced/indexView.css
@@ -49,7 +49,7 @@ INPUT {
 	font-size:.875rem;
 	margin:0;
 	padding:0;
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 }
 
 INPUT {
@@ -76,8 +76,8 @@ INPUT {
 }
 
 #button {
-	background:ThreeDShadow;
-	color:Window;
+	background:CanvasText;
+	color:Canvas;
 	font-size: 1.0em;
 	font-weight:bold;
 	margin-left:1px;
@@ -162,7 +162,7 @@ IMG.expander, IMG.h {
 A {
 	text-decoration:none; 
 	padding-<%=isRTL?"left":"right"%>:2px;
-	color:WindowText;
+	color:CanvasText;
 	/* this works in ie5.5, but not in ie5.0  */
 	white-space: nowrap;
 }
diff --git a/ua/org.eclipse.help.webapp/advanced/list.css b/ua/org.eclipse.help.webapp/advanced/list.css
@@ -13,7 +13,7 @@
  *******************************************************************************/
 
 BODY {
-	color:WindowText;
+	color:CanvasText;
 	font: <%=prefs.getViewFont()%>;
 	font-size: .875rem;
 	margin-top:5px;
@@ -25,7 +25,7 @@ BODY {
 
 A {
 	text-decoration:none; 
-	color:WindowText; 
+	color:CanvasText; 
 	padding:0px;
 	white-space: nowrap;
 }
@@ -85,7 +85,7 @@ TABLE {
 
 .unselectedMenuItem {
 	background:<%=prefs.getToolbarBackground()%>;
-	color:WindowText;
+	color:CanvasText;
 	padding-left:10px;
 	padding-right:10px;
 }
diff --git a/ua/org.eclipse.help.webapp/advanced/nav.jsp b/ua/org.eclipse.help.webapp/advanced/nav.jsp
@@ -29,9 +29,9 @@
 if (!data.isMozilla()) {
 %>
 FRAMESET {
-	border-top:1px solid ThreeDShadow;
-	border-left:1px solid ThreeDShadow;
-	border-right:1px solid ThreeDShadow;
+	border-top:1px solid CanvasText;
+	border-left:1px solid CanvasText;
+	border-right:1px solid CanvasText;
 }
 <%
 }
diff --git a/ua/org.eclipse.help.webapp/advanced/printAlert.css b/ua/org.eclipse.help.webapp/advanced/printAlert.css
@@ -23,18 +23,18 @@ body{
 
 #titleText {
 	font-weight:bold;
-	color:WindowText;
+	color:CanvasText;
 }
 
 .printAlertDiv {
     width:400px;
-    border:1px solid ThreeDShadow;
+    border:1px solid CanvasText;
     background:button;
 }
 
 .caption {
-	background:ActiveCaption;
-	color:CaptionText;
+	background:Canvas;
+	color:CanvasText;
 	height: 30px;
 }
 
diff --git a/ua/org.eclipse.help.webapp/advanced/quickSearch.jsp b/ua/org.eclipse.help.webapp/advanced/quickSearch.jsp
@@ -39,7 +39,7 @@ BODY {
 	font:<%=prefs.getViewFont()%>;
 	font-size:.875rem;
 	background-color: <%=prefs.getToolbarBackground()%>;
-	color:WindowText; 	
+	color:CanvasText; 	
 }
 
 TABLE {
diff --git a/ua/org.eclipse.help.webapp/advanced/searchList.css b/ua/org.eclipse.help.webapp/advanced/searchList.css
@@ -14,7 +14,7 @@
 
 body {
     <%=prefs.getViewBackgroundStyle()%>
-	color: WindowText;
+	color: CanvasText;
 	font: <%=prefs.getViewFont()%>;
 	font-size: .875rem;
 	padding: 0px;
@@ -84,7 +84,7 @@ a:hover {
 
 .unselectedMenuItem {
 	background:<%=prefs.getToolbarBackground()%>;
-	color:WindowText;
+	color:CanvasText;
 	padding-left:10px;
 	padding-right:10px;
 }
diff --git a/ua/org.eclipse.help.webapp/advanced/searchScoped.jsp b/ua/org.eclipse.help.webapp/advanced/searchScoped.jsp
@@ -65,7 +65,7 @@ INPUT {
 }
 
 A {
-	color:WindowText;
+	color:CanvasText;
 	text-decoration:none;
 }
 
@@ -77,28 +77,18 @@ A {
 #searchWord {
 	margin-left:5px;
 	margin-right:5px;
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 }
 
 #searchLabel {
-	color:WindowText;
+	color:CanvasText;
 }
 
 #go {
-<% 
-    if (data.isMacMozilla()) {
-%>
-    background:GrayText;
-<% 
-    } else {
-%>
-    background:ThreeDShadow;
-<%
-    }
-%>
-	color:Window;
+    background:CanvasText;
+	color:Canvas;
 	font-weight:bold;
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 	margin-left:1px;
 	font-size: 1.0em;
 }
@@ -114,7 +104,7 @@ A {
 	text-align:<%=isRTL?"left":"right"%>;
 	margin-<%=isRTL?"right":"left"%>:5px;
 	border:0px;
-	color:WindowText;
+	color:CanvasText;
 	text-decoration:none;
 }
 
diff --git a/ua/org.eclipse.help.webapp/advanced/searchSimple.jsp b/ua/org.eclipse.help.webapp/advanced/searchSimple.jsp
@@ -71,7 +71,7 @@ INPUT {
 #searchWord {	
 	padding-left:4px;
 	padding-right:4px;
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 }
 
 #go {
@@ -82,13 +82,13 @@ INPUT {
 <% 
     } else {
 %>
-    background:ThreeDShadow;
+    background:CanvasText;
 <%
     }
 %>
-	color:Window;
+	color:Canvas;
 	font-weight:bold;
-	border:1px solid ThreeDShadow;
+	border:1px solid CanvasText;
 }
 
 
diff --git a/ua/org.eclipse.help.webapp/advanced/searchView.jsp b/ua/org.eclipse.help.webapp/advanced/searchView.jsp
@@ -130,7 +130,7 @@ if (!data.isSearchRequest()) {
 <TABLE BORDER='0'>
 	<TR><TD><%=ServletResources.getString("Indexing", request)%></TD></TR>
 	<TR><TD ALIGN='<%=isRTL?"RIGHT":"LEFT"%>'>
-		<DIV STYLE='width:100px;height:16px;border:1px solid ThreeDShadow;'>
+		<DIV STYLE='width:100px;height:16px;border:1px solid CanvasText;'>
 			<DIV ID='divProgress' STYLE='width:<%=data.getIndexedPercentage()%>px;height:100%;background-color:Highlight'></DIV>
 		</DIV>
 	</TD></TR>
diff --git a/ua/org.eclipse.help.webapp/advanced/tabs.jsp b/ua/org.eclipse.help.webapp/advanced/tabs.jsp
@@ -50,8 +50,8 @@ a {
 	font-size:5px;<%-- needed to verticaly center icon image --%>
 	margin:0px;
 	padding:0px;
-	border-top:1px solid ThreeDShadow;
-	border-bottom:1px solid <%=data.isMozilla()?prefs.getToolbarBackground():"ThreeDShadow"%>;
+	border-top:1px solid CanvasText;
+	border-bottom:1px solid <%=data.isMozilla()?prefs.getToolbarBackground():"CanvasText"%>;
 	cursor:default;
 	background:<%=prefs.getToolbarBackground()%>;
 }
@@ -63,18 +63,18 @@ a {
 	cursor:default;
 	<%=prefs.getViewBackgroundStyle()%>
 	border-top:0px solid <%=prefs.getToolbarBackground()%>;
-	border-bottom:1px solid ThreeDShadow;
+	border-bottom:1px solid CanvasText;
 }
 
 .separator {
 	height:100%;
-	background-color:ThreeDShadow;
+	background-color:CanvasText;
 	border-bottom:1px solid <%=prefs.getToolbarBackground()%>;
 }
 
 .separator_pressed {
 	height:100%;
-	background-color:ThreeDShadow;
+	background-color:CanvasText;
 	border-top:0px solid <%=prefs.getToolbarBackground()%>;
 	border-bottom:1px solid <%=prefs.getToolbarBackground()%>;
 }
diff --git a/ua/org.eclipse.help.webapp/advanced/tocTree.css b/ua/org.eclipse.help.webapp/advanced/tocTree.css
@@ -68,7 +68,7 @@ IMG.expander, IMG.h {
 
 A {
 	text-decoration:none; 
-	color:WindowText;
+	color:CanvasText;
 	padding-<%=isRTL?"left":"right"%>:2px;
 	/* this works in ie5.5, but not in ie5.0  */
 	white-space: nowrap;
@@ -99,7 +99,7 @@ A.nolink {
 }
 
 A.nolink:link, A.nolink:visited {
-	color:WindowText;
+	color:CanvasText;
 }
 
 A.nolink:hover {
diff --git a/ua/org.eclipse.help.webapp/advanced/toolbar.jsp b/ua/org.eclipse.help.webapp/advanced/toolbar.jsp
@@ -39,7 +39,7 @@ BODY {
 
 #titleText {
 	font-weight:bold;
-	color:WindowText;
+	color:CanvasText;
 }
 
 a {
@@ -117,7 +117,7 @@ if (data.isIE()){
 <%}%>
 
 .separator {
-	background-color: ThreeDShadow;
+	background-color: CanvasText;
 	height:100%;
 	width: 1px;
 	border-top:2px solid <%=prefs.getToolbarBackground()%>;
@@ -128,14 +128,14 @@ if (data.isIE()){
 }
 
 #container {
-	border-bottom:1px solid ThreeDShadow;
+	border-bottom:1px solid CanvasText;
 <%
 if (data.isIE()) {
 %> 
 <%
 }else if (data.isMozilla()){
 %>
-	border-top:1px solid ThreeDShadow;
+	border-top:1px solid CanvasText;
 	height:24px;
 <%
 }
@@ -325,8 +325,8 @@ function menu(button, param) {
 		menu.style.background = "<%=prefs.getToolbarBackground()%>";
 		menu.style.font = "<%=prefs.getToolbarFont()%>";
 		menu.style.fontSize = ".875rem";
-		menu.style.border<%=isRTL ? "Right" : "Left"%> = "1px solid ThreeDShadow";
-		menu.style.borderBottom = "1px solid ThreeDShadow";
+		menu.style.border<%=isRTL ? "Right" : "Left"%> = "1px solid CanvasText";
+		menu.style.borderBottom = "1px solid CanvasText";
 
 		var entries = param.split(",");
 		for (var i=0;i<entries.length;++i) {
@@ -346,7 +346,7 @@ function menu(button, param) {
 			anchor.style.textDecoration = "none";
 			anchor.style.padding = "4px 4px 4px 4px";
 			anchor.style.background = "transparent";
-			anchor.style.color = "WindowText";
+			anchor.style.color = "CanvasText";
 			menu.appendChild(anchor);
 		}
 
@@ -408,7 +408,7 @@ function itemEnter(e) {
 
 function itemExit(e) {
     this.style.background = "transparent";
-    this.style.color = "WindowText";
+    this.style.color = "CanvasText";
     parent.frames[parent.frames.length - 1].window.status = "";
     return true;
 }
diff --git a/ua/org.eclipse.help.webapp/advanced/workingSet.jsp b/ua/org.eclipse.help.webapp/advanced/workingSet.jsp
diff --git a/ua/org.eclipse.help.webapp/advanced/workingSetManager.jsp b/ua/org.eclipse.help.webapp/advanced/workingSetManager.jsp

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@`
`29`	`29`	`if (!data.isMozilla()) {`
`30`	`30`	`%>`
`31`	`31`	`FRAMESET {`
`32`		`- border-top:1px solid ThreeDShadow;`
`33`		`- border-left:1px solid ThreeDShadow;`
`34`		`- border-right:1px solid ThreeDShadow;`
	`32`	`+ border-top:1px solid CanvasText;`
	`33`	`+ border-left:1px solid CanvasText;`
	`34`	`+ border-right:1px solid CanvasText;`
`35`	`35`	`}`
`36`	`36`	`<%`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,18 +23,18 @@ body{`
`23`	`23`
`24`	`24`	`#titleText {`
`25`	`25`	`font-weight:bold;`
`26`		`- color:WindowText;`
	`26`	`+ color:CanvasText;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`.printAlertDiv {`
`30`	`30`	`width:400px;`
`31`		`- border:1px solid ThreeDShadow;`
	`31`	`+ border:1px solid CanvasText;`
`32`	`32`	`background:button;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`.caption {`
`36`		`- background:ActiveCaption;`
`37`		`- color:CaptionText;`
	`36`	`+ background:Canvas;`
	`37`	`+ color:CanvasText;`
`38`	`38`	`height: 30px;`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ BODY {`
`39`	`39`	`font:<%=prefs.getViewFont()%>;`
`40`	`40`	`font-size:.875rem;`
`41`	`41`	`background-color: <%=prefs.getToolbarBackground()%>;`
`42`		`- color:WindowText;`
	`42`	`+ color:CanvasText;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`TABLE {`