1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Apr 27 17:03:24 2011 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Apr 27 17:13:54 2011 -0700 1.3 @@ -2,17 +2,10 @@ 1.4 /* 1.5 Overall document style 1.6 */ 1.7 -* { 1.8 - margin:0; 1.9 - padding:0; 1.10 -} 1.11 body { 1.12 font-family:Helvetica, Arial, sans-serif; 1.13 color:#000000; 1.14 } 1.15 -p { 1.16 - margin:20px 0; 1.17 -} 1.18 pre { 1.19 font-size:1.0em; 1.20 } 1.21 @@ -30,35 +23,18 @@ 1.22 } 1.23 ul { 1.24 margin:10px 0 10px 20px; 1.25 -} 1.26 -li { 1.27 - list-style:disc; 1.28 -} 1.29 -dl dt { 1.30 - font-size:0.95em; 1.31 - font-weight:bold; 1.32 - margin:10px 0 0 0; 1.33 -} 1.34 -dl dd { 1.35 - margin:10px 0 10px 20px; 1.36 -} 1.37 -dl dd ul { 1.38 - margin-left:0; 1.39 -} 1.40 -dl dd ul li { 1.41 - list-style:none; 1.42 - margin:10px 0 10px 0; 1.43 + list-style-type:disc; 1.44 } 1.45 caption { 1.46 background: #CCCCFF; 1.47 color:#000000; 1.48 - text-align: left; 1.49 - font-size: 150%; 1.50 - font-weight: bold; 1.51 - border-left: 2px ridge; 1.52 - border-right: 2px ridge; 1.53 - border-top: 2px ridge; 1.54 - padding-left: 5px; 1.55 + text-align:left; 1.56 + font-size:150%; 1.57 + font-weight:bold; 1.58 + border-left:2px ridge; 1.59 + border-right:2px ridge; 1.60 + border-top:2px ridge; 1.61 + padding-left:5px; 1.62 width:auto; 1.63 } 1.64 /* 1.65 @@ -70,11 +46,11 @@ 1.66 color:#000000; 1.67 } 1.68 .legalCopy { 1.69 - margin:7px; 1.70 + margin:7px 0; 1.71 } 1.72 .bar { 1.73 font-size:1em; 1.74 - margin:10px 0 0 10px; 1.75 + margin:10px 0 0 2px; 1.76 } 1.77 .bar a { 1.78 font-weight:normal; 1.79 @@ -84,24 +60,21 @@ 1.80 */ 1.81 .topNav { 1.82 border-top:2px solid #C0C0C0; 1.83 - margin:7px; 1.84 padding:7px 0; 1.85 height:2.8em; 1.86 - width:99%; 1.87 + width:100%; 1.88 min-width:600px; 1.89 } 1.90 .bottomNav { 1.91 border-top:2px solid #C0C0C0; 1.92 - margin:7px; 1.93 padding:7px 0; 1.94 height:2.8em; 1.95 - width:99%; 1.96 + width:100%; 1.97 } 1.98 .subNav { 1.99 border-bottom:2px solid #C0C0C0; 1.100 float:left; 1.101 - width:99%; 1.102 - margin:7px; 1.103 + width:100%; 1.104 min-width:600px; 1.105 } 1.106 .subNav div { 1.107 @@ -120,7 +93,7 @@ 1.108 /* Navigation bar list styles */ 1.109 .topNav ul.navList, .bottomNav ul.navList { 1.110 background-color:#EEEEFF; 1.111 - padding:7px 5px; 1.112 + padding:4px 4px; 1.113 margin:0; 1.114 float:left; 1.115 width:80%; 1.116 @@ -128,7 +101,7 @@ 1.117 ul.navList li{ 1.118 list-style:none; 1.119 float:left; 1.120 - padding:3px 4px; 1.121 + padding:0 4px; 1.122 color:#000000; 1.123 font-size:0.98em; 1.124 } 1.125 @@ -142,14 +115,16 @@ 1.126 .subNav ul.navList { 1.127 float:left; 1.128 margin:0; 1.129 + padding:0; 1.130 font-size:0.8em; 1.131 width:350px; 1.132 } 1.133 ul.subNavList { 1.134 float:left; 1.135 - margin:0; 1.136 font-size:0.8em; 1.137 width:350px; 1.138 + margin:0; 1.139 + padding:0; 1.140 } 1.141 ul.subNavList li{ 1.142 list-style:none; 1.143 @@ -161,16 +136,16 @@ 1.144 */ 1.145 .header, .footer { 1.146 clear:both; 1.147 - margin:0 7px; 1.148 + padding:10px 0; 1.149 } 1.150 .indexHeader { 1.151 font-size:0.9em; 1.152 - margin:10px 0 7px 10px; 1.153 + margin:10px 0 0 2px; 1.154 } 1.155 .header ul { 1.156 padding-left:20px; 1.157 } 1.158 -/* Header and footer title styles */ 1.159 +/* Header and footer title styles */ 1.160 .header h1.title { 1.161 font-size:1.4em; 1.162 text-align:center; 1.163 @@ -181,7 +156,6 @@ 1.164 margin:0; 1.165 } 1.166 .subTitle { 1.167 - margin:0; 1.168 padding-top:10px; 1.169 } 1.170 /* 1.171 @@ -190,11 +164,11 @@ 1.172 .contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, 1.173 .constantValuesContainer { 1.174 clear:both; 1.175 - padding:10px 10px; 1.176 position:relative; 1.177 + padding-bottom:20px; 1.178 } 1.179 .indexContainer { 1.180 - padding:0 0 10px 10px; 1.181 + padding:0 0 0 2px; 1.182 font-size:0.9em; 1.183 } 1.184 /* 1.185 @@ -221,7 +195,8 @@ 1.186 .indexContainer h2 { 1.187 font-weight:normal; 1.188 font-size:1.0em; 1.189 - padding:10px 0 0 0; 1.190 + padding:5px 0 0 0; 1.191 + margin:10px 0 0 0; 1.192 } 1.193 .contentContainer h2 { 1.194 margin:10px 0; 1.195 @@ -263,7 +238,7 @@ 1.196 background:#CCCCFF; 1.197 border:0; 1.198 border:2px ridge; 1.199 - padding-left:5px; 1.200 + margin:0; 1.201 } 1.202 div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 { 1.203 background:#EEEEFF; 1.204 @@ -274,23 +249,22 @@ 1.205 div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { 1.206 font-size:1.15em; 1.207 font-weight:bold; 1.208 - padding:0 0 10px 0; 1.209 + padding:0 0 5px 0; 1.210 + margin:0; 1.211 } 1.212 /* 1.213 Table styles 1.214 */ 1.215 .contentContainer table { 1.216 - border-collapse: collapse ; 1.217 + border-collapse:collapse ; 1.218 width:100%; 1.219 } 1.220 .contentContainer table td, .contentContainer table th { 1.221 border:2px ridge; 1.222 - padding:3px; 1.223 } 1.224 /* Constant values page table styles */ 1.225 .constantValuesContainer table { 1.226 - border-collapse: collapse ; 1.227 - margin:0 0 10px 0; 1.228 + border-collapse:collapse; 1.229 } 1.230 .constantValuesContainer table caption{ 1.231 font-size:0.95em; 1.232 @@ -303,12 +277,9 @@ 1.233 } 1.234 /* Class-use/Package-use page table styles */ 1.235 .classUseContainer table { 1.236 - border-collapse: collapse ; 1.237 + border-collapse:collapse ; 1.238 width:100%; 1.239 - margin:0 0 15px 0; 1.240 -} 1.241 -.classUseContainer ul li ul li table { 1.242 - margin-bottom:30px; 1.243 + margin:0 0 10px 0; 1.244 } 1.245 .classUseContainer ul li ul li table caption{ 1.246 font-size:0.95em; 1.247 @@ -365,6 +336,7 @@ 1.248 /* Container specific list styles */ 1.249 .indexContainer ul { 1.250 margin:0; 1.251 + padding:0; 1.252 } 1.253 .indexContainer ul li { 1.254 list-style:none; 1.255 @@ -376,6 +348,7 @@ 1.256 list-style:none; 1.257 border:0; 1.258 border-bottom:2px ridge; 1.259 + height:1%; 1.260 } 1.261 .serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast { 1.262 list-style:none; 1.263 @@ -395,6 +368,7 @@ 1.264 div.details ul.blockList ul.blockList ul.blockList li.blockList { 1.265 border:0; 1.266 border-bottom:2px ridge; 1.267 + height:1%; 1.268 } 1.269 /* Definition list styles */ 1.270 ul.blockList li.blockList dl{ 1.271 @@ -413,9 +387,17 @@ 1.272 ul.blockList li.blockList pre{ 1.273 margin:0 0 15px 0; 1.274 } 1.275 +.description dl dt { 1.276 + font-size:0.95em; 1.277 + font-weight:bold; 1.278 + margin:5px 0 0 0; 1.279 +} 1.280 +.description dl dd { 1.281 + margin:10px 0 10px 20px; 1.282 +} 1.283 /* List content styles */ 1.284 ul.blockList li.blockList ul.blockList li.blockList pre{ 1.285 - margin:10px 0 15px 0; 1.286 + margin:10px 0 10px 0; 1.287 } 1.288 ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre, 1.289 ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{