Skip to content

Commit df953f1

Browse files
authored
Merge pull request #1058 from line-o/doc/tables
Additional layout fixes
2 parents 6836155 + 74b3ebd commit df953f1

File tree

6 files changed

+35
-18
lines changed

6 files changed

+35
-18
lines changed

src/main/frontend/sass/_doc.scss

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,31 +64,32 @@ section dl.dl-horizontal {
6464
color: var(--bs-danger-text-emphasis);
6565
}
6666

67+
/* content */
68+
6769
.content {
6870
color: var(--darktext);
6971

7072
section {
7173
clear: both;
7274
}
73-
table {
74-
margin: .5em 1em;
75-
}
76-
td {
77-
padding: 6px 4px;
78-
}
7975
.strong {
8076
font-weight: bold;
8177
}
8278
em {
8379
font-style: italic;
8480
}
8581

82+
/* code listings (syntax highlighted) */
8683
pre > code {
8784
background-color: var(--black);
8885
color: var(--white);
8986
font-size: .92em;
87+
border-radius: .375rem; /* var(--bs-alert-border-radius) */
88+
padding: 1rem; /* var(--bs-alert-padding-y) var(--bs-alert-padding-x) */
89+
border: thin solid var(--lightgrey);
9090
}
9191

92+
/* inline code */
9293
code {
9394
background-color: inherit;
9495
color: inherit;
@@ -180,6 +181,7 @@ section dl.dl-horizontal {
180181
border: 1px solid var(--grey);
181182
}
182183

184+
/* nicer scroll targets */
183185
a[name] {
184186
scroll-margin-top: 1rem;
185187
}

src/main/frontend/sass/_layout.scss

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@
4343

4444
#poweredby {
4545
float: right;
46-
width: 120px;
47-
height: 56px;
46+
width: 7.5rem;
47+
height: 3.5rem;
4848
margin-bottom: 1rem;
4949
background: url(../images/powered-by.svg) no-repeat center;
50+
background-size: contain;
5051
}
5152

5253

@@ -73,10 +74,6 @@
7374
}
7475
}
7576

76-
#copyright {
77-
width: 15rem;
78-
text-align: right;
79-
p {
80-
padding: 0;
81-
}
77+
#copyright p {
78+
padding: 0;
8279
}

src/main/xar-resources/data/devguide_indexes/devguide_indexes.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,13 +686,15 @@
686686
<title/>
687687

688688
<tgroup cols="4">
689-
<tbody>
689+
<thead>
690690
<row>
691691
<entry> <para>Field name</para> </entry>
692692
<entry> <para>Field type</para> </entry>
693693
<entry> <para>Description</para> </entry>
694694
<entry> <para>Comments</para> </entry>
695695
</row>
696+
</thead>
697+
<tbody>
696698
<row>
697699
<entry> <para>DOCUMENT_URI</para> </entry>
698700
<entry> <para>VARCHAR</para> </entry>

src/main/xar-resources/data/exist-building/exist-building.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@
104104
<table>
105105
<title>Useful Maven targets</title>
106106
<tgroup cols="2">
107+
<thead>
108+
<row>
109+
<entry><para>Command</para></entry>
110+
<entry><para>Description</para></entry>
111+
</row>
112+
</thead>
107113
<tbody>
108114
<row>
109115
<entry>
@@ -159,6 +165,12 @@
159165
<table>
160166
<title>Useful Maven properties and arguments</title>
161167
<tgroup cols="2">
168+
<thead>
169+
<row>
170+
<entry><para>Argument</para></entry>
171+
<entry><para>Description</para></entry>
172+
</row>
173+
</thead>
162174
<tbody>
163175
<row>
164176
<entry>

src/main/xar-resources/data/scheduler/scheduler.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,15 @@
196196
<colspec colwidth="25%"/>
197197
<colspec colwidth="30%"/>
198198
<colspec colwidth="20%"/>
199-
<tbody>
199+
<thead>
200200
<row>
201201
<entry> <para>Field Name</para> </entry>
202202
<entry> <para>Mandatory?</para> </entry>
203203
<entry> <para>Allowed Values</para> </entry>
204204
<entry> <para>Allowed Special Characters</para> </entry>
205205
</row>
206+
</thead>
207+
<tbody>
206208
<row>
207209
<entry> <para>Seconds</para> </entry>
208210
<entry> <para>YES</para> </entry>
@@ -336,11 +338,13 @@
336338
<tgroup cols="2">
337339
<colspec colwidth="30%"/>
338340
<colspec colwidth="70%"/>
339-
<tbody>
341+
<thead>
340342
<row>
341343
<entry> <para>Expression</para> </entry>
342344
<entry> <para>Meaning</para> </entry>
343345
</row>
346+
</thead>
347+
<tbody>
344348
<row>
345349
<entry> <para> <code>0 0 12 * * ? </code> </para> </entry>
346350
<entry> <para> Fire at 12pm (noon) every day </para> </entry>

src/main/xar-resources/modules/xsl/convert-db5.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
<xsl:variable name="spacing" as="xs:string" select="normalize-space((@spacing, 'normal')[1])"/>
134134
<xsl:call-template name="do-anchor"/>
135-
<dl class="row {if ($spacing = 'normal') then 'wide' else ''}">
135+
<dl class="{if ($spacing = 'normal') then 'wide' else ''}">
136136

137137
<xsl:for-each select="db5:varlistentry">
138138
<dt>

0 commit comments

Comments
 (0)