1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Tue Dec 17 23:32:58 2013 -0800
1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Dec 18 19:48:47 2013 -0800
1.3 @@ -2,16 +2,19 @@
1.4 /*
1.5 Overall document style
1.6 */
1.7 +
1.8 +@import url('resources/fonts/dejavu.css');
1.9 +
1.10 body {
1.11 background-color:#ffffff;
1.12 color:#353833;
1.13 - font-family:Arial, Helvetica, sans-serif;
1.14 - font-size:76%;
1.15 + font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
1.16 + font-size:14px;
1.17 margin:0;
1.18 }
1.19 a:link, a:visited {
1.20 text-decoration:none;
1.21 - color:#4c6b87;
1.22 + color:#4A6782;
1.23 }
1.24 a:hover, a:focus {
1.25 text-decoration:none;
1.26 @@ -19,7 +22,7 @@
1.27 }
1.28 a:active {
1.29 text-decoration:none;
1.30 - color:#4c6b87;
1.31 + color:#4A6782;
1.32 }
1.33 a[name] {
1.34 color:#353833;
1.35 @@ -29,41 +32,51 @@
1.36 color:#353833;
1.37 }
1.38 pre {
1.39 - font-size:1.3em;
1.40 + font-family:'DejaVu Sans Mono', monospace;
1.41 + font-size:14px;
1.42 }
1.43 h1 {
1.44 - font-size:1.8em;
1.45 + font-size:20px;
1.46 }
1.47 h2 {
1.48 - font-size:1.5em;
1.49 + font-size:18px;
1.50 }
1.51 h3 {
1.52 - font-size:1.4em;
1.53 + font-size:16px;
1.54 + font-style:italic;
1.55 }
1.56 h4 {
1.57 - font-size:1.3em;
1.58 + font-size:13px;
1.59 }
1.60 h5 {
1.61 - font-size:1.2em;
1.62 + font-size:12px;
1.63 }
1.64 h6 {
1.65 - font-size:1.1em;
1.66 + font-size:11px;
1.67 }
1.68 ul {
1.69 list-style-type:disc;
1.70 }
1.71 code, tt {
1.72 - font-size:1.2em;
1.73 + font-family:'DejaVu Sans Mono', monospace;
1.74 + font-size:14px;
1.75 + padding-top:4px;
1.76 + margin-top:8px;
1.77 + line-height:1.4em;
1.78 }
1.79 dt code {
1.80 - font-size:1.2em;
1.81 + font-family:'DejaVu Sans Mono', monospace;
1.82 + font-size:14px;
1.83 + padding-top:4px;
1.84 }
1.85 table tr td dt code {
1.86 - font-size:1.2em;
1.87 + font-family:'DejaVu Sans Mono', monospace;
1.88 + font-size:14px;
1.89 vertical-align:top;
1.90 + padding-top:4px;
1.91 }
1.92 sup {
1.93 - font-size:.6em;
1.94 + font-size:8px;
1.95 }
1.96 /*
1.97 Document title and Copyright styles
1.98 @@ -76,10 +89,9 @@
1.99 .aboutLanguage {
1.100 float:right;
1.101 padding:0px 21px;
1.102 - font-size:.8em;
1.103 - font-style:italic;
1.104 + font-size:11px;
1.105 z-index:200;
1.106 - margin-top:-7px;
1.107 + margin-top:-9px;
1.108 }
1.109 .legalCopy {
1.110 margin-left:.5em;
1.111 @@ -93,9 +105,6 @@
1.112 }
1.113 .tab {
1.114 background-color:#0066FF;
1.115 - background-image:url(resources/titlebar.gif);
1.116 - background-position:left top;
1.117 - background-repeat:no-repeat;
1.118 color:#ffffff;
1.119 padding:8px;
1.120 width:5em;
1.121 @@ -105,17 +114,15 @@
1.122 Navigation bar styles
1.123 */
1.124 .bar {
1.125 - background-image:url(resources/background.gif);
1.126 - background-repeat:repeat-x;
1.127 + background-color:#4D7A97;
1.128 color:#FFFFFF;
1.129 padding:.8em .5em .4em .8em;
1.130 height:auto;/*height:1.8em;*/
1.131 - font-size:1em;
1.132 + font-size:11px;
1.133 margin:0;
1.134 }
1.135 .topNav {
1.136 - background-image:url(resources/background.gif);
1.137 - background-repeat:repeat-x;
1.138 + background-color:#4D7A97;
1.139 color:#FFFFFF;
1.140 float:left;
1.141 padding:0;
1.142 @@ -124,11 +131,11 @@
1.143 height:2.8em;
1.144 padding-top:10px;
1.145 overflow:hidden;
1.146 + font-size:12px;
1.147 }
1.148 .bottomNav {
1.149 margin-top:10px;
1.150 - background-image:url(resources/background.gif);
1.151 - background-repeat:repeat-x;
1.152 + background-color:#4D7A97;
1.153 color:#FFFFFF;
1.154 float:left;
1.155 padding:0;
1.156 @@ -137,18 +144,20 @@
1.157 height:2.8em;
1.158 padding-top:10px;
1.159 overflow:hidden;
1.160 + font-size:12px;
1.161 }
1.162 .subNav {
1.163 background-color:#dee3e9;
1.164 - border-bottom:1px solid #9eadc0;
1.165 float:left;
1.166 width:100%;
1.167 overflow:hidden;
1.168 + font-size:12px;
1.169 }
1.170 .subNav div {
1.171 clear:left;
1.172 float:left;
1.173 padding:0 0 5px 6px;
1.174 + text-transform:uppercase;
1.175 }
1.176 ul.navList, ul.subNavList {
1.177 float:left;
1.178 @@ -158,34 +167,34 @@
1.179 ul.navList li{
1.180 list-style:none;
1.181 float:left;
1.182 - padding:3px 6px;
1.183 + padding: 5px 6px;
1.184 + text-transform:uppercase;
1.185 }
1.186 ul.subNavList li{
1.187 list-style:none;
1.188 float:left;
1.189 - font-size:90%;
1.190 }
1.191 .topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
1.192 color:#FFFFFF;
1.193 text-decoration:none;
1.194 + text-transform:uppercase;
1.195 }
1.196 .topNav a:hover, .bottomNav a:hover {
1.197 text-decoration:none;
1.198 color:#bb7a2a;
1.199 + text-transform:uppercase;
1.200 }
1.201 .navBarCell1Rev {
1.202 - background-image:url(resources/tab.gif);
1.203 - background-color:#a88834;
1.204 - color:#FFFFFF;
1.205 + background-color:#F8981D;
1.206 + color:#253441;
1.207 margin: auto 5px;
1.208 - border:1px solid #c9aa44;
1.209 }
1.210 .skipNav {
1.211 position:absolute;
1.212 top:auto;
1.213 left:-9999px;
1.214 overflow:hidden;
1.215 - }
1.216 +}
1.217 /*
1.218 Page header and footer styles
1.219 */
1.220 @@ -202,7 +211,7 @@
1.221 margin-right:15px;
1.222 }
1.223 .indexHeader h1 {
1.224 - font-size:1.3em;
1.225 + font-size:13px;
1.226 }
1.227 .title {
1.228 color:#2c4557;
1.229 @@ -212,7 +221,7 @@
1.230 margin:5px 0 0 0;
1.231 }
1.232 .header ul {
1.233 - margin:0 0 25px 0;
1.234 + margin:0 0 15px 0;
1.235 padding:0;
1.236 }
1.237 .footer ul {
1.238 @@ -220,24 +229,22 @@
1.239 }
1.240 .header ul li, .footer ul li {
1.241 list-style:none;
1.242 - font-size:1.2em;
1.243 + font-size:13px;
1.244 }
1.245 /*
1.246 Heading styles
1.247 */
1.248 div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
1.249 background-color:#dee3e9;
1.250 - border-top:1px solid #9eadc0;
1.251 - border-bottom:1px solid #9eadc0;
1.252 + border:1px solid #d0d9e0;
1.253 margin:0 0 6px -8px;
1.254 - padding:2px 5px;
1.255 + padding:7px 5px;
1.256 }
1.257 ul.blockList ul.blockList ul.blockList li.blockList h3 {
1.258 background-color:#dee3e9;
1.259 - border-top:1px solid #9eadc0;
1.260 - border-bottom:1px solid #9eadc0;
1.261 + border:1px solid #d0d9e0;
1.262 margin:0 0 6px -8px;
1.263 - padding:2px 5px;
1.264 + padding:7px 5px;
1.265 }
1.266 ul.blockList ul.blockList li.blockList h3 {
1.267 padding:0;
1.268 @@ -257,10 +264,10 @@
1.269 .indexContainer {
1.270 margin:10px;
1.271 position:relative;
1.272 - font-size:1.0em;
1.273 + font-size:12px;
1.274 }
1.275 .indexContainer h2 {
1.276 - font-size:1.1em;
1.277 + font-size:13px;
1.278 padding:0 0 3px 0;
1.279 }
1.280 .indexContainer ul {
1.281 @@ -269,15 +276,18 @@
1.282 }
1.283 .indexContainer ul li {
1.284 list-style:none;
1.285 + padding-top:2px;
1.286 }
1.287 .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
1.288 - font-size:1.1em;
1.289 + font-size:12px;
1.290 font-weight:bold;
1.291 margin:10px 0 0 0;
1.292 color:#4E4E4E;
1.293 }
1.294 .contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
1.295 - margin:10px 0 10px 20px;
1.296 + margin:5px 0 10px 0px;
1.297 + font-size:14px;
1.298 + font-family:'DejaVu Sans Mono',monospace;
1.299 }
1.300 .serializedFormContainer dl.nameValue dt {
1.301 margin-left:1px;
1.302 @@ -316,25 +326,24 @@
1.303 }
1.304 ul.blockList li.blockList, ul.blockListLast li.blockList {
1.305 list-style:none;
1.306 - margin-bottom:25px;
1.307 + margin-bottom:15px;
1.308 + line-height:1.4;
1.309 }
1.310 ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
1.311 padding:0px 20px 5px 10px;
1.312 - border:1px solid #9eadc0;
1.313 - background-color:#f9f9f9;
1.314 + border:1px solid #ededed;
1.315 + background-color:#f8f8f8;
1.316 }
1.317 ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
1.318 padding:0 0 5px 8px;
1.319 background-color:#ffffff;
1.320 - border:1px solid #9eadc0;
1.321 - border-top:none;
1.322 + border:none;
1.323 }
1.324 ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
1.325 margin-left:0;
1.326 padding-left:0;
1.327 padding-bottom:15px;
1.328 border:none;
1.329 - border-bottom:1px solid #9eadc0;
1.330 }
1.331 ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
1.332 list-style:none;
1.333 @@ -349,9 +358,10 @@
1.334 Table styles
1.335 */
1.336 .overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
1.337 - border-bottom:1px solid #9eadc0;
1.338 - margin:0 0 12px 0px;
1.339 width:100%;
1.340 + border-left:1px solid #EEE;
1.341 + border-right:1px solid #EEE;
1.342 + border-bottom:1px solid #EEE;
1.343 }
1.344 .overviewSummary, .memberSummary {
1.345 padding:0px;
1.346 @@ -361,12 +371,15 @@
1.347 position:relative;
1.348 text-align:left;
1.349 background-repeat:no-repeat;
1.350 - color:#FFFFFF;
1.351 + color:#253441;
1.352 font-weight:bold;
1.353 clear:none;
1.354 overflow:hidden;
1.355 padding:0px;
1.356 + padding-top:10px;
1.357 + padding-left:1px;
1.358 margin:0px;
1.359 + white-space:pre;
1.360 }
1.361 .overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
1.362 .useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
1.363 @@ -381,89 +394,98 @@
1.364 .overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
1.365 .useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
1.366 white-space:nowrap;
1.367 - padding-top:8px;
1.368 - padding-left:8px;
1.369 + padding-top:5px;
1.370 + padding-left:12px;
1.371 + padding-right:12px;
1.372 + padding-bottom:7px;
1.373 display:inline-block;
1.374 float:left;
1.375 - background-image:url(resources/titlebar.gif);
1.376 + background-color:#F8981D;
1.377 + border: none;
1.378 + height:16px;
1.379 }
1.380 .memberSummary caption span.activeTableTab span {
1.381 white-space:nowrap;
1.382 - padding-top:8px;
1.383 - padding-left:8px;
1.384 + padding-top:5px;
1.385 + padding-left:12px;
1.386 + padding-right:12px;
1.387 + margin-right:3px;
1.388 display:inline-block;
1.389 float:left;
1.390 - background-image:url(resources/activetitlebar.gif);
1.391 + background-color:#F8981D;
1.392 + height:16px;
1.393 }
1.394 .memberSummary caption span.tableTab span {
1.395 white-space:nowrap;
1.396 - padding-top:8px;
1.397 - padding-left:8px;
1.398 + padding-top:5px;
1.399 + padding-left:12px;
1.400 + padding-right:12px;
1.401 + margin-right:3px;
1.402 display:inline-block;
1.403 float:left;
1.404 - background-image:url(resources/titlebar.gif);
1.405 + background-color:#4D7A97;
1.406 + height:16px;
1.407 }
1.408 .memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
1.409 padding-top:0px;
1.410 padding-left:0px;
1.411 + padding-right:0px;
1.412 background-image:none;
1.413 float:none;
1.414 - display:inline-block;
1.415 + display:inline;
1.416 }
1.417 .overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
1.418 .useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
1.419 - width:10px;
1.420 - background-image:url(resources/titlebar_end.gif);
1.421 - background-repeat:no-repeat;
1.422 - background-position:top right;
1.423 + display:none;
1.424 + width:5px;
1.425 position:relative;
1.426 float:left;
1.427 + background-color:#F8981D;
1.428 }
1.429 .memberSummary .activeTableTab .tabEnd {
1.430 - width:10px;
1.431 - margin-right:5px;
1.432 - background-image:url(resources/activetitlebar_end.gif);
1.433 - background-repeat:no-repeat;
1.434 - background-position:top right;
1.435 - position:relative;
1.436 + display:none;
1.437 + width:5px;
1.438 + margin-right:3px;
1.439 + position:relative;
1.440 float:left;
1.441 + background-color:#F8981D;
1.442 }
1.443 .memberSummary .tableTab .tabEnd {
1.444 - width:10px;
1.445 - margin-right:5px;
1.446 - background-image:url(resources/titlebar_end.gif);
1.447 - background-repeat:no-repeat;
1.448 - background-position:top right;
1.449 + display:none;
1.450 + width:5px;
1.451 + margin-right:3px;
1.452 position:relative;
1.453 + background-color:#4D7A97;
1.454 float:left;
1.455 +
1.456 }
1.457 .overviewSummary td, .memberSummary td, .typeSummary td,
1.458 .useSummary td, .constantsSummary td, .deprecatedSummary td {
1.459 text-align:left;
1.460 - padding:3px 3px 3px 7px;
1.461 + padding:0px 0px 12px 10px;
1.462 + width:100%;
1.463 }
1.464 th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
1.465 td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
1.466 vertical-align:top;
1.467 - padding-right:3px;
1.468 + padding-right:0px;
1.469 + padding-top:8px;
1.470 + padding-bottom:3px;
1.471 }
1.472 th.colFirst, th.colLast, th.colOne, .constantsSummary th {
1.473 background:#dee3e9;
1.474 - border-top:1px solid #9eadc0;
1.475 - border-bottom:1px solid #9eadc0;
1.476 text-align:left;
1.477 - padding:3px 3px 3px 7px;
1.478 + padding:8px 3px 3px 7px;
1.479 }
1.480 td.colFirst, th.colFirst {
1.481 - border-left:1px solid #9eadc0;
1.482 white-space:nowrap;
1.483 + font-size:13px;
1.484 }
1.485 td.colLast, th.colLast {
1.486 - border-right:1px solid #9eadc0;
1.487 + font-size:13px;
1.488 }
1.489 td.colOne, th.colOne {
1.490 - border-right:1px solid #9eadc0;
1.491 - border-left:1px solid #9eadc0;
1.492 + font-size:13px;
1.493 }
1.494 .overviewSummary td.colFirst, .overviewSummary th.colFirst,
1.495 .overviewSummary td.colOne, .overviewSummary th.colOne,
1.496 @@ -471,19 +493,19 @@
1.497 .memberSummary td.colOne, .memberSummary th.colOne,
1.498 .typeSummary td.colFirst{
1.499 width:25%;
1.500 - vertical-align:middle;
1.501 + vertical-align:top;
1.502 }
1.503 td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
1.504 font-weight:bold;
1.505 }
1.506 .tableSubHeadingColor {
1.507 - background-color: #EEEEFF;
1.508 + background-color:#EEEEFF;
1.509 }
1.510 .altColor {
1.511 - background-color:#eeeeef;
1.512 + background-color:#FFFFFF;
1.513 }
1.514 .rowColor {
1.515 - background-color:#ffffff;
1.516 + background-color:#EEEEEF;
1.517 }
1.518 /*
1.519 Content styles
1.520 @@ -498,6 +520,24 @@
1.521 .docSummary {
1.522 padding:0;
1.523 }
1.524 +
1.525 +ul.blockList ul.blockList ul.blockList li.blockList h3 {
1.526 + font-style:normal;
1.527 +}
1.528 +
1.529 +div.block {
1.530 + font-size:14px;
1.531 + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
1.532 +}
1.533 +
1.534 +td.colLast div {
1.535 + padding-top:0px;
1.536 +}
1.537 +
1.538 +
1.539 +td.colLast a {
1.540 + padding-bottom:3px;
1.541 +}
1.542 /*
1.543 Formatting effect styles
1.544 */
1.545 @@ -508,11 +548,12 @@
1.546 h1.hidden {
1.547 visibility:hidden;
1.548 overflow:hidden;
1.549 - font-size:.9em;
1.550 + font-size:10px;
1.551 }
1.552 .block {
1.553 display:block;
1.554 - margin:3px 0 0 0;
1.555 + margin:3px 10px 2px 0px;
1.556 + color:#474747;
1.557 }
1.558 .deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
1.559 .overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
1.560 @@ -522,3 +563,12 @@
1.561 .deprecationComment, .emphasizedPhrase, .interfaceName {
1.562 font-style:italic;
1.563 }
1.564 +
1.565 +div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
1.566 +div.block div.block span.interfaceName {
1.567 + font-style:normal;
1.568 +}
1.569 +
1.570 +div.contentContainer ul.blockList li.blockList h2{
1.571 + padding-bottom:0px;
1.572 +}
