stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7028815: Missing styles for some bulleted items in the new stylesheet

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Bhavesh Patel 2011-04-27 17:13:54 -07:00
parent 90c0a645c2
commit ff31734237
2 changed files with 54 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
View File

@ -2,17 +2,10 @@
/* /*
Overall document style Overall document style
*/ */
* {
margin:0;
padding:0;
}
body { body {
font-family:Helvetica, Arial, sans-serif; font-family:Helvetica, Arial, sans-serif;
color:#000000; color:#000000;
} }
p {
margin:20px 0;
}
pre { pre {
font-size:1.0em; font-size:1.0em;
} }
@ -30,35 +23,18 @@ h4 {
} }
ul { ul {
margin:10px 0 10px 20px; margin:10px 0 10px 20px;
} list-style-type:disc;
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;
} }
caption { caption {
background: #CCCCFF; background: #CCCCFF;
color:#000000; color:#000000;
text-align: left; text-align:left;
font-size: 150%; font-size:150%;
font-weight: bold; font-weight:bold;
border-left: 2px ridge; border-left:2px ridge;
border-right: 2px ridge; border-right:2px ridge;
border-top: 2px ridge; border-top:2px ridge;
padding-left: 5px; padding-left:5px;
width:auto; width:auto;
} }
/* /*
@ -70,11 +46,11 @@ Document title and Copyright styles
color:#000000; color:#000000;
} }
.legalCopy { .legalCopy {
margin:7px; margin:7px 0;
} }
.bar { .bar {
font-size:1em; font-size:1em;
margin:10px 0 0 10px; margin:10px 0 0 2px;
} }
.bar a { .bar a {
font-weight:normal; font-weight:normal;
@ -84,24 +60,21 @@ Navigation bar styles
*/ */
.topNav { .topNav {
border-top:2px solid #C0C0C0; border-top:2px solid #C0C0C0;
margin:7px;
padding:7px 0; padding:7px 0;
height:2.8em; height:2.8em;
width:99%; width:100%;
min-width:600px; min-width:600px;
} }
.bottomNav { .bottomNav {
border-top:2px solid #C0C0C0; border-top:2px solid #C0C0C0;
margin:7px;
padding:7px 0; padding:7px 0;
height:2.8em; height:2.8em;
width:99%; width:100%;
} }
.subNav { .subNav {
border-bottom:2px solid #C0C0C0; border-bottom:2px solid #C0C0C0;
float:left; float:left;
width:99%; width:100%;
margin:7px;
min-width:600px; min-width:600px;
} }
.subNav div { .subNav div {
@ -120,7 +93,7 @@ Navigation bar styles
/* Navigation bar list styles */ /* Navigation bar list styles */
.topNav ul.navList, .bottomNav ul.navList { .topNav ul.navList, .bottomNav ul.navList {
background-color:#EEEEFF; background-color:#EEEEFF;
padding:7px 5px; padding:4px 4px;
margin:0; margin:0;
float:left; float:left;
width:80%; width:80%;
@ -128,7 +101,7 @@ Navigation bar styles
ul.navList li{ ul.navList li{
list-style:none; list-style:none;
float:left; float:left;
padding:3px 4px; padding:0 4px;
color:#000000; color:#000000;
font-size:0.98em; font-size:0.98em;
} }
@ -142,14 +115,16 @@ ul.navList li.navBarCell1Rev {
.subNav ul.navList { .subNav ul.navList {
float:left; float:left;
margin:0; margin:0;
padding:0;
font-size:0.8em; font-size:0.8em;
width:350px; width:350px;
} }
ul.subNavList { ul.subNavList {
float:left; float:left;
margin:0;
font-size:0.8em; font-size:0.8em;
width:350px; width:350px;
margin:0;
padding:0;
} }
ul.subNavList li{ ul.subNavList li{
list-style:none; list-style:none;
@ -161,16 +136,16 @@ Page header and footer styles
*/ */
.header, .footer { .header, .footer {
clear:both; clear:both;
margin:0 7px; padding:10px 0;
} }
.indexHeader { .indexHeader {
font-size:0.9em; font-size:0.9em;
margin:10px 0 7px 10px; margin:10px 0 0 2px;
} }
.header ul { .header ul {
padding-left:20px; padding-left:20px;
} }
/* Header and footer title styles */ /* Header and footer title styles */
.header h1.title { .header h1.title {
font-size:1.4em; font-size:1.4em;
text-align:center; text-align:center;
@ -181,7 +156,6 @@ Page header and footer styles
margin:0; margin:0;
} }
.subTitle { .subTitle {
margin:0;
padding-top:10px; padding-top:10px;
} }
/* /*
@ -190,11 +164,11 @@ Page layout container styles
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer,
.constantValuesContainer { .constantValuesContainer {
clear:both; clear:both;
padding:10px 10px;
position:relative; position:relative;
padding-bottom:20px;
} }
.indexContainer { .indexContainer {
padding:0 0 10px 10px; padding:0 0 0 2px;
font-size:0.9em; font-size:0.9em;
} }
/* /*
@ -221,7 +195,8 @@ Heading styles
.indexContainer h2 { .indexContainer h2 {
font-weight:normal; font-weight:normal;
font-size:1.0em; font-size:1.0em;
padding:10px 0 0 0; padding:5px 0 0 0;
margin:10px 0 0 0;
} }
.contentContainer h2 { .contentContainer h2 {
margin:10px 0; margin:10px 0;
@ -263,7 +238,7 @@ div.summary ul.blockList ul.blockList li.blockList h3 {
background:#CCCCFF; background:#CCCCFF;
border:0; border:0;
border:2px ridge; border:2px ridge;
padding-left:5px; margin:0;
} }
div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 { div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 {
background:#EEEEFF; background:#EEEEFF;
@ -274,23 +249,22 @@ div.details ul.blockList ul.blockList ul.blockList li.blockList h4,
div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
font-size:1.15em; font-size:1.15em;
font-weight:bold; font-weight:bold;
padding:0 0 10px 0; padding:0 0 5px 0;
margin:0;
} }
/* /*
Table styles Table styles
*/ */
.contentContainer table { .contentContainer table {
border-collapse: collapse ; border-collapse:collapse ;
width:100%; width:100%;
} }
.contentContainer table td, .contentContainer table th { .contentContainer table td, .contentContainer table th {
border:2px ridge; border:2px ridge;
padding:3px;
} }
/* Constant values page table styles */ /* Constant values page table styles */
.constantValuesContainer table { .constantValuesContainer table {
border-collapse: collapse ; border-collapse:collapse;
margin:0 0 10px 0;
} }
.constantValuesContainer table caption{ .constantValuesContainer table caption{
font-size:0.95em; font-size:0.95em;
@ -303,12 +277,9 @@ Table styles
} }
/* Class-use/Package-use page table styles */ /* Class-use/Package-use page table styles */
.classUseContainer table { .classUseContainer table {
border-collapse: collapse ; border-collapse:collapse ;
width:100%; width:100%;
margin:0 0 15px 0; margin:0 0 10px 0;
}
.classUseContainer ul li ul li table {
margin-bottom:30px;
} }
.classUseContainer ul li ul li table caption{ .classUseContainer ul li ul li table caption{
font-size:0.95em; font-size:0.95em;
@ -365,6 +336,7 @@ ul.horizontal li {
/* Container specific list styles */ /* Container specific list styles */
.indexContainer ul { .indexContainer ul {
margin:0; margin:0;
padding:0;
} }
.indexContainer ul li { .indexContainer ul li {
list-style:none; list-style:none;
@ -376,6 +348,7 @@ ul.horizontal li {
list-style:none; list-style:none;
border:0; border:0;
border-bottom:2px ridge; border-bottom:2px ridge;
height:1%;
} }
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast { .serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast {
list-style:none; list-style:none;
@ -395,6 +368,7 @@ ul.blockList ul.blockList ul.blockList li.blockList {
div.details ul.blockList ul.blockList ul.blockList li.blockList { div.details ul.blockList ul.blockList ul.blockList li.blockList {
border:0; border:0;
border-bottom:2px ridge; border-bottom:2px ridge;
height:1%;
} }
/* Definition list styles */ /* Definition list styles */
ul.blockList li.blockList dl{ ul.blockList li.blockList dl{
@ -413,9 +387,17 @@ dl.nameValue dt, dl.nameValue dd{
ul.blockList li.blockList pre{ ul.blockList li.blockList pre{
margin:0 0 15px 0; 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 */ /* List content styles */
ul.blockList li.blockList ul.blockList li.blockList pre{ 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.blockList li.blockList pre,
ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{ ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{

18
langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,19 +23,18 @@
/* /*
* @test * @test
* @bug 4494033 * @bug 4494033 7028815
* @summary Run tests on doclet stylesheet. * @summary Run tests on doclet stylesheet.
* @author jamieh * @author jamieh
* @library ../lib/ * @library ../lib/
* @build JavadocTester * @build JavadocTester TestStylesheet
* @build TestStylesheet
* @run main TestStylesheet * @run main TestStylesheet
*/ */
public class TestStylesheet extends JavadocTester { public class TestStylesheet extends JavadocTester {
//Test information. //Test information.
private static final String BUG_ID = "4494033"; private static final String BUG_ID = "4494033-7028815";
//Javadoc arguments. //Javadoc arguments.
private static final String[] ARGS = new String[] { private static final String[] ARGS = new String[] {
@ -56,15 +55,18 @@ public class TestStylesheet extends JavadocTester {
"body {" + NL + " font-family:Helvetica, Arial, sans-serif;" + NL + "body {" + NL + " font-family:Helvetica, Arial, sans-serif;" + NL +
" color:#000000;" + NL + "}"}, " color:#000000;" + NL + "}"},
{BUG_ID + FS + "stylesheet.css", {BUG_ID + FS + "stylesheet.css",
"dl dd ul li {" + NL + " list-style:none;" + NL + "ul {" + NL + " margin:10px 0 10px 20px;" + NL +
" margin:10px 0 10px 0;" + NL + "}"}, " list-style-type:disc;" + NL + "}"},
// Test whether a link to the stylesheet file is inserted properly // Test whether a link to the stylesheet file is inserted properly
// in the class documentation. // in the class documentation.
{BUG_ID + FS + "pkg" + FS + "A.html", {BUG_ID + FS + "pkg" + FS + "A.html",
"<link rel=\"stylesheet\" type=\"text/css\" " + "<link rel=\"stylesheet\" type=\"text/css\" " +
"href=\"../stylesheet.css\" title=\"Style\">"} "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. * The entry point of the test.