Skip to content

Commit 49e89fb

Browse files
twogeetwogee
committed
use Unicode glyphs or SVG data URLs instead of bitmaps
1 parent b691f81 commit 49e89fb

File tree

9 files changed

+60
-76
lines changed

9 files changed

+60
-76
lines changed

‎asciidoc/images/bullet.gif

-193 Bytes
Binary file not shown.

‎asciidoc/images/closed.gif

-141 Bytes
Binary file not shown.

‎asciidoc/images/discovery.gif

-362 Bytes
Binary file not shown.

‎asciidoc/images/grippie.png

-162 Bytes
Binary file not shown.

‎asciidoc/images/open.gif

-151 Bytes
Binary file not shown.

‎asciidoc/images/warning.png

-762 Bytes
Binary file not shown.

‎asciidoc/images/warning.svg

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎asciidoc/style/style.css

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ body {
2626
margin: 8px auto;
2727
padding: 0;
2828
width: 98%;
29-
color: #000;
30-
background-color: #fff;
29+
color: black;
30+
background-color: white;
3131
border-radius: 5px;
3232
padding-top: 5px;
3333
padding-bottom: 5px;
@@ -37,15 +37,16 @@ body, p, td, li, ul, ol {
3737
font-size: small;
3838
}
3939
h1, h2, h3, h4, h5, h6 {
40-
color: #7a9438;font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
40+
color: #7a9438;
41+
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
4142
}
4243
h1 {
4344
color: #7a9438;
44-
background-color: #fff;
45+
background-color: white;
4546
background: none;
4647
}
4748
h2 {
48-
color: #fff;
49+
color: white;
4950
background-color: #7a9438;
5051
padding-left: 10px;
5152
font-size: 1.6em;
@@ -85,7 +86,7 @@ blockquote {
8586
font-size: 1.2em;
8687
line-height: 1.3em;
8788
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
88-
color: #696969;
89+
color: dimgray;
8990
}
9091
pre {
9192
padding: 0.75em 1.5em;
@@ -94,7 +95,7 @@ pre {
9495
border: 1px solid #ddd;
9596
}
9697
code {
97-
background-color: #EEE;
98+
background-color: #eee;
9899
}
99100
dt {
100101
font-weight: bold;
@@ -122,35 +123,35 @@ li p {
122123
#navcontainer {
123124
color: white;
124125
margin-left: 20px;
125-
background-color:#7a9438;
126+
background-color: #7a9438;
126127
}
127128
#navcontainer a {
128129
color: white;
129130
text-decoration: none;
130131
}
131132
#nav {
132-
background-color:#7a9438;
133+
background-color: #7a9438;
133134
}
134135
#nav ul {
135-
background-color:#7a9438;
136+
background-color: #7a9438;
136137
border-top: 1px solid #7a9438;
137138
border-right: 1px solid #7a9438;
138139
border-bottom: 1px solid #7a9438;
139140
border-left: 0.75em solid #7a9438;
140141
}
141142
#nav li a {
142-
color: #fff;
143+
color: white;
143144
}
144145
#nav .title {
145-
color: #fff;
146+
color: white;
146147
background: #7a9438;
147148
border-top: 0;
148149
border-right: 0;
149150
border-bottom: 1px solid #7a9438;
150151
border-left: 0;
151152
}
152153
#nav li li a {
153-
background: #fff;
154+
background: white;
154155
color: #7a9438;
155156
border-top: 0;
156157
border-right: 0;
@@ -161,7 +162,7 @@ li p {
161162
background: #9ebf47;
162163
}
163164
#top-menu {
164-
background-color:#7a9438;
165+
background-color: #7a9438;
165166
border-top: 3px solid #9ebf47;
166167
border-bottom: 3px solid #9ebf47;
167168
}
@@ -207,26 +208,28 @@ li p {
207208
font-weight: 700;
208209
border-top-left-radius: 5px;
209210
border-top-right-radius: 5px;
210-
color: #000;
211+
color: black;
211212
background-color: #eee;
212213
font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
213214
}
214215
#content {
215-
table-layout:fixed;
216+
table-layout: fixed;
216217
}
217218
.block h2 {
218219
margin: 5px 0px 0px 0px;
219220
padding: 1px 5px 1px 30px;
220221
font-size: 1.2em;
221222
font-weight: 700;
222223
border-top-left-radius: 5px;
223-
border-top-right-radius: 5px;color: #000;
224+
border-top-right-radius: 5px;
225+
color: black;
224226
background-color: #eee;
225227
}
226228
.block .content {
227229
border-bottom-right-radius: 5px;
228230
border-bottom-left-radius: 5px;
229-
margin-bottom: 10px;background-color: #fff;
231+
margin-bottom: 10px;
232+
background-color: white;
230233
border: 1px solid #eee;
231234
}
232235
#main {
@@ -254,20 +257,20 @@ table.tableblock {
254257
margin-bottom: 10px;
255258
}
256259
table.tableblock thead {
257-
background-color: #DEE4CD;
258-
border: 1px solid #7A9437;
260+
background-color: #dee4cd;
261+
border: 1px solid #7a9437;
259262
}
260263
table.tableblock th {
261264
font-family: monospace;
262-
border: 1px solid #7A9437;
265+
border: 1px solid #7a9437;
263266
padding: 5px;
264267
}
265268
table.tableblock tbody {
266-
background-color: #FFFFFF;
267-
border: 1px solid #7A9437;
269+
background-color: white;
270+
border: 1px solid #7a9437;
268271
}
269272
table.tableblock td {
270-
border: 1px dotted #7A9437;
273+
border: 1px dotted #7a9437;
271274
padding: 5px;
272275
}
273276
table.tableblock td p:last-child {
@@ -281,49 +284,52 @@ table.tableblock .valign-middle {
281284
}
282285
.note {
283286
padding: 15px;
284-
border-style:solid;
285-
border-width:1px;
286-
border-color: #F0D88D;
287-
background-color: #FCFCCA;
287+
border-style: solid;
288+
border-width: 1px;
289+
border-color: #f0d88d;
290+
background-color: #fcfcca;
288291
margin: 10px;
289292
}
290293
.note .title {
291-
display:none;
294+
display: none;
292295
}
293296
.warning:before {
294-
content: url(../images/warning.svg)
297+
font-size: 1.25rem;
298+
color: red;
299+
margin: 10px;
300+
content: '\0026A0';
295301
}
296302
.warning {
297-
border-style:solid;
298-
border-width:1px;
299-
border-color: #F0D88D;
300-
background-color: #FCFCCA;
303+
border-style: solid;
304+
border-width: 1px;
305+
border-color: #f0d88d;
306+
background-color: #fcfcca;
301307
margin: 10px;
302308
}
303309
.warning .title {
304-
display:none;
310+
display: none;
305311
}
306312
#treemenu {
307313
padding-left: 10px;
308314
}
315+
.treeview .hitarea {
316+
cursor: pointer;
317+
}
309318
.treeview ul {
310319
margin: 0;
311320
padding: 0;
312321
}
313322
.treeview li {
314-
background: white url(../images/bullet.gif) no-repeat left center;
323+
background: white url('data:image/svg+xml;utf-8,<svg version="1.1" width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="6" fill="%237a9438"/></svg>') no-repeat left center;
315324
list-style-type: none;
316325
padding-left: 22px;
317326
margin-bottom: 3px;
318327
}
319328
.treeview li.submenu {
320-
background: white url(../images/closed.gif) no-repeat left 1px;
321-
}
322-
.treeview .hitarea {
323-
cursor: pointer;
329+
background: white url('data:image/svg+xml;utf-8,<svg version="1.1" width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><polygon points="2,2 14,2 8,14" fill="%237a9438"/></svg>') no-repeat left 1px;
324330
}
325331
.treeview li.collapsable, .treeview li.open {
326-
background: white url(../images/open.gif) no-repeat left 1px;
332+
background: white url('data:image/svg+xml;utf-8,<svg version="1.1" width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><polygon points="2,2 2,14 14,8" fill="%237a9438"/></svg>') no-repeat left 1px;
327333
}
328334
.treeview ul.closed {
329335
display: none;
@@ -342,5 +348,5 @@ table.tableblock .valign-middle {
342348
color: #7a9438;
343349
}
344350
#book {
345-
background-color: #FFFFFF;
351+
background-color: white;
346352
}

‎build-release.xml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
<echo file="${output.dir}/myrepository-content.txt">[ivy@apache:/]$ find ${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace -type f -print${line.separator}</echo>
122122
<echo file="${output.dir}/myrepository-content.txt" append="true">${myrepository.content}</echo>
123123
<delete dir="${tutorial.build.dir}"/>
124+
<echo>NB! This tutorial fails deliberately!</echo>
124125
<run-tutorial antfile="${tutorial.src.dir}/build-a-ivy-repository/build.xml" target="maven2-deps" output="${output.dir}/install-deps.txt" failonerror="false"/>
125126
<pathconvert property="myrepository.content.deps" pathsep="${line.separator}">
126127
<fileset dir="${tutorial.src.dir}/build-a-ivy-repository/myrepository/no-namespace/org.hibernate/hibernate"/>
@@ -167,7 +168,7 @@
167168
</target>
168169

169170
<target name="init-asciidoctor-extensions" depends="init-ivy" unless="skip.doc">
170-
<ivy:cachepath pathid="asciidoctorj.path" organisation="org.asciidoctor" module="asciidoctorj" revision="1.5.5" inline="true"/>
171+
<ivy:cachepath pathid="asciidoctorj.path" organisation="org.asciidoctor" module="asciidoctorj" revision="1.5.6" conf="default" inline="true"/>
171172
<mkdir dir="${build.dir}/asciidoc-extensions/classes"/>
172173
<javac srcdir="${doc.src.dir}/templates/extensions/src" destdir="${build.dir}/asciidoc-extensions/classes"
173174
debug="true" includeantruntime="no" classpathref="asciidoctorj.path"/>
@@ -179,11 +180,11 @@
179180
</target>
180181

181182
<target name="init-asciidoctor" depends="init-asciidoctor-extensions" unless="skip.doc">
182-
<ivy:cachepath pathid="asciidoctor.path" organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.4" inline="true"/>
183+
<ivy:cachepath pathid="asciidoctor.path" organisation="org.asciidoctor" module="asciidoctor-ant" revision="1.5.3" conf="default" inline="true"/>
183184
<taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path">
184185
<classpath>
185-
<pathelement location="${build.dir}/asciidoc-extensions/classes" />
186-
<path refid="asciidoctor.path" />
186+
<pathelement location="${build.dir}/asciidoc-extensions/classes"/>
187+
<path refid="asciidoctor.path"/>
187188
</classpath>
188189
</taskdef>
189190
</target>
@@ -202,14 +203,14 @@
202203
<attribute key="basedir" value="${doc.src.dir}"/>
203204
<attribute key="imagesdir" value=""/>
204205
<attribute key="version" value="${build.version}"/>
205-
<inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro" />
206+
<inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro"/>
206207
</asciidoctor:convert>
207208
</target>
208209

209210
<target name="generate-book-adoc" depends="default-version,copy-doc-files" unless="skip.doc">
210211
<scriptdef name="generate-book-adoc" language="javascript">
211-
<attribute name="jsontocfile" />
212-
<attribute name="destFile" />
212+
<attribute name="jsontocfile"/>
213+
<attribute name="destFile"/>
213214
<![CDATA[
214215
var tocfile = self.getProject().resolveFile(attributes.get("jsontocfile"))
215216
r = new java.io.BufferedReader(new java.io.FileReader(tocfile));
@@ -247,15 +248,15 @@
247248
out.close();
248249
]]>
249250
</scriptdef>
250-
<mkdir dir="${build.dir}/book" />
251-
<generate-book-adoc jsontocfile="${doc.src.dir}/toc.json" destFile="${build.dir}/book/book.adoc" />
251+
<mkdir dir="${build.dir}/book"/>
252+
<generate-book-adoc jsontocfile="${doc.src.dir}/toc.json" destFile="${build.dir}/book/book.adoc"/>
252253
</target>
253254

254255
<target name="generate-book" depends="generate-book-adoc,init-asciidoctor">
255256
<asciidoctor:convert sourceDirectory="${build.dir}/book" outputDirectory="${doc.build.dir}" backend="xhtml5"
256257
templateDir="${doc.src.dir}/templates/book" sourceHighlighter="highlightjs" doctype="book">
257-
<attribute key="version" value="${build.version}" />
258-
<inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro" />
258+
<attribute key="version" value="${build.version}"/>
259+
<inlineMacroProcessor blockName="jira" className="org.apache.ivy.asciidoc.JiraMacro"/>
259260
</asciidoctor:convert>
260261
</target>
261262

0 commit comments

Comments
 (0)