7028815: Missing styles for some bulleted items in the new stylesheet
Reviewed-by: jjg
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Apr 27 17:03:24 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Apr 27 17:13:54 2011 -0700
@@ -2,17 +2,10 @@
/*
Overall document style
*/
-* {
- margin:0;
- padding:0;
-}
body {
font-family:Helvetica, Arial, sans-serif;
color:#000000;
}
-p {
- margin:20px 0;
-}
pre {
font-size:1.0em;
}
@@ -30,35 +23,18 @@
}
ul {
margin:10px 0 10px 20px;
-}
-li {
- list-style:disc;
-}
-dl dt {
- font-size:0.95em;
- font-weight:bold;
- margin:10px 0 0 0;
-}
-dl dd {
- margin:10px 0 10px 20px;
-}
-dl dd ul {
- margin-left:0;
-}
-dl dd ul li {
- list-style:none;
- margin:10px 0 10px 0;
+ list-style-type:disc;
}
caption {
background: #CCCCFF;
color:#000000;
- text-align: left;
- font-size: 150%;
- font-weight: bold;
- border-left: 2px ridge;
- border-right: 2px ridge;
- border-top: 2px ridge;
- padding-left: 5px;
+ text-align:left;
+ font-size:150%;
+ font-weight:bold;
+ border-left:2px ridge;
+ border-right:2px ridge;
+ border-top:2px ridge;
+ padding-left:5px;
width:auto;
}
/*
@@ -70,11 +46,11 @@
color:#000000;
}
.legalCopy {
- margin:7px;
+ margin:7px 0;
}
.bar {
font-size:1em;
- margin:10px 0 0 10px;
+ margin:10px 0 0 2px;
}
.bar a {
font-weight:normal;
@@ -84,24 +60,21 @@
*/
.topNav {
border-top:2px solid #C0C0C0;
- margin:7px;
padding:7px 0;
height:2.8em;
- width:99%;
+ width:100%;
min-width:600px;
}
.bottomNav {
border-top:2px solid #C0C0C0;
- margin:7px;
padding:7px 0;
height:2.8em;
- width:99%;
+ width:100%;
}
.subNav {
border-bottom:2px solid #C0C0C0;
float:left;
- width:99%;
- margin:7px;
+ width:100%;
min-width:600px;
}
.subNav div {
@@ -120,7 +93,7 @@
/* Navigation bar list styles */
.topNav ul.navList, .bottomNav ul.navList {
background-color:#EEEEFF;
- padding:7px 5px;
+ padding:4px 4px;
margin:0;
float:left;
width:80%;
@@ -128,7 +101,7 @@
ul.navList li{
list-style:none;
float:left;
- padding:3px 4px;
+ padding:0 4px;
color:#000000;
font-size:0.98em;
}
@@ -142,14 +115,16 @@
.subNav ul.navList {
float:left;
margin:0;
+ padding:0;
font-size:0.8em;
width:350px;
}
ul.subNavList {
float:left;
- margin:0;
font-size:0.8em;
width:350px;
+ margin:0;
+ padding:0;
}
ul.subNavList li{
list-style:none;
@@ -161,16 +136,16 @@
*/
.header, .footer {
clear:both;
- margin:0 7px;
+ padding:10px 0;
}
.indexHeader {
font-size:0.9em;
- margin:10px 0 7px 10px;
+ margin:10px 0 0 2px;
}
.header ul {
padding-left:20px;
}
-/* Header and footer title styles */
+/* Header and footer title styles */
.header h1.title {
font-size:1.4em;
text-align:center;
@@ -181,7 +156,6 @@
margin:0;
}
.subTitle {
- margin:0;
padding-top:10px;
}
/*
@@ -190,11 +164,11 @@
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer,
.constantValuesContainer {
clear:both;
- padding:10px 10px;
position:relative;
+ padding-bottom:20px;
}
.indexContainer {
- padding:0 0 10px 10px;
+ padding:0 0 0 2px;
font-size:0.9em;
}
/*
@@ -221,7 +195,8 @@
.indexContainer h2 {
font-weight:normal;
font-size:1.0em;
- padding:10px 0 0 0;
+ padding:5px 0 0 0;
+ margin:10px 0 0 0;
}
.contentContainer h2 {
margin:10px 0;
@@ -263,7 +238,7 @@
background:#CCCCFF;
border:0;
border:2px ridge;
- padding-left:5px;
+ margin:0;
}
div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 {
background:#EEEEFF;
@@ -274,23 +249,22 @@
div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
font-size:1.15em;
font-weight:bold;
- padding:0 0 10px 0;
+ padding:0 0 5px 0;
+ margin:0;
}
/*
Table styles
*/
.contentContainer table {
- border-collapse: collapse ;
+ border-collapse:collapse ;
width:100%;
}
.contentContainer table td, .contentContainer table th {
border:2px ridge;
- padding:3px;
}
/* Constant values page table styles */
.constantValuesContainer table {
- border-collapse: collapse ;
- margin:0 0 10px 0;
+ border-collapse:collapse;
}
.constantValuesContainer table caption{
font-size:0.95em;
@@ -303,12 +277,9 @@
}
/* Class-use/Package-use page table styles */
.classUseContainer table {
- border-collapse: collapse ;
+ border-collapse:collapse ;
width:100%;
- margin:0 0 15px 0;
-}
-.classUseContainer ul li ul li table {
- margin-bottom:30px;
+ margin:0 0 10px 0;
}
.classUseContainer ul li ul li table caption{
font-size:0.95em;
@@ -365,6 +336,7 @@
/* Container specific list styles */
.indexContainer ul {
margin:0;
+ padding:0;
}
.indexContainer ul li {
list-style:none;
@@ -376,6 +348,7 @@
list-style:none;
border:0;
border-bottom:2px ridge;
+ height:1%;
}
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast {
list-style:none;
@@ -395,6 +368,7 @@
div.details ul.blockList ul.blockList ul.blockList li.blockList {
border:0;
border-bottom:2px ridge;
+ height:1%;
}
/* Definition list styles */
ul.blockList li.blockList dl{
@@ -413,9 +387,17 @@
ul.blockList li.blockList pre{
margin:0 0 15px 0;
}
+.description dl dt {
+ font-size:0.95em;
+ font-weight:bold;
+ margin:5px 0 0 0;
+}
+.description dl dd {
+ margin:10px 0 10px 20px;
+}
/* List content styles */
ul.blockList li.blockList ul.blockList li.blockList pre{
- margin:10px 0 15px 0;
+ margin:10px 0 10px 0;
}
ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre,
ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Wed Apr 27 17:03:24 2011 -0700
+++ b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Wed Apr 27 17:13:54 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,18 @@
/*
* @test
- * @bug 4494033
+ * @bug 4494033 7028815
* @summary Run tests on doclet stylesheet.
* @author jamieh
* @library ../lib/
- * @build JavadocTester
- * @build TestStylesheet
+ * @build JavadocTester TestStylesheet
* @run main TestStylesheet
*/
public class TestStylesheet extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4494033";
+ private static final String BUG_ID = "4494033-7028815";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -56,15 +55,18 @@
"body {" + NL + " font-family:Helvetica, Arial, sans-serif;" + NL +
" color:#000000;" + NL + "}"},
{BUG_ID + FS + "stylesheet.css",
- "dl dd ul li {" + NL + " list-style:none;" + NL +
- " margin:10px 0 10px 0;" + NL + "}"},
+ "ul {" + NL + " margin:10px 0 10px 20px;" + NL +
+ " list-style-type:disc;" + NL + "}"},
// Test whether a link to the stylesheet file is inserted properly
// in the class documentation.
{BUG_ID + FS + "pkg" + FS + "A.html",
"<link rel=\"stylesheet\" type=\"text/css\" " +
"href=\"../stylesheet.css\" title=\"Style\">"}
};
- private static final String[][] NEGATED_TEST = NO_TEST;
+ private static final String[][] NEGATED_TEST = {
+ {BUG_ID + FS + "stylesheet.css",
+ "* {" + NL + " margin:0;" + NL + " padding:0;" + NL + "}"}
+ };
/**
* The entry point of the test.