Skip to content

Commit 4eb1eaf

Browse files
committedMay 17, 2024
8329617: Update stylesheet for specs and tool documentation
Reviewed-by: jjg
1 parent d4c2edf commit 4eb1eaf

File tree

1 file changed

+54
-46
lines changed

1 file changed

+54
-46
lines changed
 

‎make/data/docs-resources/resources/jdk-default.css

+54-46
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -23,56 +23,62 @@
2323
* questions.
2424
*/
2525

26+
@import url('../api/resource-files/fonts/dejavu.css');
27+
2628
body {
27-
margin: 2em 2em;
2829
font-family: DejaVu Sans, Bitstream Vera Sans, Luxi Sans, Verdana, Arial, Helvetica, sans-serif;
2930
font-size: 10pt;
31+
margin: 0;
32+
padding: 0;
33+
height: 100%;
34+
width: 100%;
35+
min-width: 100%;
3036
line-height: 1.4;
3137
}
3238

3339
pre, code, tt {
34-
font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono,
35-
Courier New, monospace;
40+
font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono, Courier New, monospace;
41+
}
42+
43+
main, footer {
44+
margin: 16px 27px;
45+
}
46+
47+
/* Adjust horizontal margin for content elements outside of main element */
48+
:is(body, header) > :is(nav, h1, h2, h3, h4, h5, h6, p, .sub-title) {
49+
margin-left: 27px;
50+
margin-right: 27px;
3651
}
3752

3853
blockquote {
39-
margin: 1.5ex 0em 1.5ex 2em;
54+
margin: 1.5ex 0 1.5ex 2em;
4055
}
4156

4257
p {
43-
padding: 0pt;
44-
margin: 1ex 0em;
58+
margin-top: 1ex;
59+
margin-bottom: 1ex;
4560
}
4661

47-
p:first-child, pre:first-child { margin-top: 0pt; }
48-
49-
h1 {
50-
font-weight: bold;
51-
padding: 0pt;
52-
margin: 2ex .5ex 1ex 0pt;
62+
dd > p:first-child, pre:first-child {
63+
margin-top: 0;
5364
}
5465

5566
h1:first-child, h2:first-child {
56-
margin-top: 0ex;
67+
margin-top: 0;
5768
}
5869

59-
h2 {
60-
font-weight: bold;
61-
padding: 0pt;
62-
margin: 2ex 0pt 1ex 0pt;
70+
h1, h2 {
71+
margin-top: 2ex;
72+
margin-bottom: 1ex;
6373
}
6474

65-
h3 {
66-
font-weight: bold;
67-
padding: 0pt;
68-
margin: 1.5ex 0pt 1ex 0pt;
75+
h3, h4, h5 {
76+
margin-top: 1.5ex;
77+
margin-bottom: 1ex;
6978
}
7079

7180
h4, h5 {
7281
font-size: 100%;
73-
font-weight: bold;
74-
padding: 0pt;
75-
margin: 1.5ex 0pt 1ex 0pt;
7682
}
7783

7884
.subtitle {
@@ -100,7 +106,7 @@ a[href]:hover {
100106
}
101107

102108
a img {
103-
border-width: 0px;
109+
border-width: 0;
104110
}
105111

106112
img {
@@ -154,9 +160,9 @@ table.centered td {
154160

155161
.draft-header {
156162
text-align: center;
157-
font-size: 80%;
163+
font-size: 11.2px;
158164
padding: 6px;
159-
margin: -2.5em -2.5em 2.5em -2.5em;
165+
line-height: initial;
160166
}
161167

162168
.legal-footer {
@@ -183,29 +189,31 @@ nav#TOC ul ul li::before {
183189
content: " \2022 "
184190
}
185191

186-
header#title-block-header {
187-
margin-top:-2em;
192+
/* Rules below replicate sizing of navigation bar in API docs */
193+
header#title-block-header div.navbar {
194+
padding: 0 20px 0 26px;
195+
margin-bottom: 30px;
196+
background-color: #4D7A97;
197+
color: #FFFFFF;
198+
height: 44px;
199+
overflow: hidden;
200+
font-size: 0.857em;
201+
line-height: initial;
202+
display: flex;
203+
flex-direction: row-reverse;
204+
align-items: center;
188205
}
189206

190-
header#title-block-header div.navbar {
191-
margin: 0 -2.5em 2.5em -2.5em;
192-
padding: 0 2.5em;
193-
background-color:#4D7A97;
194-
color:#FFFFFF;
195-
float:left;
196-
width:100%;
197-
clear:right;
198-
min-height:2.8em;
199-
padding-top:10px;
200-
overflow:hidden;
201-
font-size:12px;
207+
header#title-block-header div.navbar nav {
208+
flex: 1 1 auto;
209+
font-size: 12px;
210+
white-space: nowrap;
202211
}
203212

204213
header#title-block-header div.navbar div {
205-
float:right;
206-
font-size:11px;
207-
height:2.9em;
208-
margin: auto 0;
214+
flex: 0 0 auto;
215+
font-size: 10.978px;
216+
white-space: nowrap;
209217
}
210218

211219
header#title-block-header ul {

0 commit comments

Comments
 (0)