This is an automated email from the ASF dual-hosted git repository.
larsfrancke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-training.git
The following commit(s) were added to refs/heads/master by this push:
new be833a3 - Changed the background to white and the foreground to black
(#12)
be833a3 is described below
commit be833a30a29f4d1dbc16643af22d9dc5fe79440e
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu May 16 21:23:23 2019 +0200
- Changed the background to white and the foreground to black (#12)
- Replaced the yoda image with a photo I took
- Fine-tuned the installation script to work better on macs (renamed the
script to reflect being designed for macs)
- Made the build output an index.html instead of an index.revealjs
- Fixed some paths in the pom
- Added the third-party libs to the rat exclusions
---
.../{install-deps.sh => install-deps-mac.sh} | 3 ++-
tools/maven-revealjs-asciidoctor-templte/pom.xml | 5 +++--
.../src/main/asciidoc/index.adoc | 4 ++--
.../src/main/resources/images/Yoda.png | Bin 305264 -> 0 bytes
.../src/main/resources/images/toddy.jpg | Bin 0 -> 459871 bytes
.../src/main/theme/apache.css | 10 +++++-----
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/tools/maven-revealjs-asciidoctor-templte/install-deps.sh
b/tools/maven-revealjs-asciidoctor-templte/install-deps-mac.sh
similarity index 97%
rename from tools/maven-revealjs-asciidoctor-templte/install-deps.sh
rename to tools/maven-revealjs-asciidoctor-templte/install-deps-mac.sh
index c8702c6..0e4839b 100755
--- a/tools/maven-revealjs-asciidoctor-templte/install-deps.sh
+++ b/tools/maven-revealjs-asciidoctor-templte/install-deps-mac.sh
@@ -27,6 +27,7 @@ git clone git://github.com/BurntSushi/erd
cd erd
stack init
stack build --system-ghc
+cd ..
# Install Mermaid
npm install mermaid.cli
@@ -36,7 +37,7 @@ wget
https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip
unzip phantomjs-2.1.1-macosx.zip
# SVGBob
-#cargo install svgbob_cli
+cargo install svgbob_cli --path ./svgbob
# Syntrax
pip install --upgrade syntrax
diff --git a/tools/maven-revealjs-asciidoctor-templte/pom.xml
b/tools/maven-revealjs-asciidoctor-templte/pom.xml
index db1bbfe..939b28b 100644
--- a/tools/maven-revealjs-asciidoctor-templte/pom.xml
+++ b/tools/maven-revealjs-asciidoctor-templte/pom.xml
@@ -66,7 +66,8 @@
<excludes>
<!-- TODO: This is a mofified version of an
asciidoctor file ... nor sure we can stick an Apache Header on it -->
<exclude>libs/docinfo-hack/document.html.slim</exclude>
-
+ <!-- Exclude everything downloaded by the install-deps
scripts -->
+ <exclude>libs/third-party/**</exclude>
<!-- Maven related files -->
<exclude>**/target/**</exclude>
@@ -244,7 +245,7 @@
<identify>${basedir}/libs/third-party/ImageMagick-7.0.8/bin/identify</identify-->
<mermaid>${basedir}/libs/third-party/node_modules/.bin/mmdc</mermaid>
<phantomjs>${basedir}/libs/third-party/phantomjs-2.1.1-macosx/bin/phantomjs</phantomjs>
-
<svgbob>/Users/christofer.dutz/.cargo/bin/svgbob</svgbob>
+
<svgbob>${basedir}/libs/third-party/svgbob/bin/svgbob</svgbob>
<vg2svg>${basedir}/libs/third-party/node_modules/.bin/vg2svg</vg2svg>
</attributes>
</configuration>
diff --git
a/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc
b/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc
index 012fcb8..3e5138a 100644
--- a/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc
+++ b/tools/maven-revealjs-asciidoctor-templte/src/main/asciidoc/index.adoc
@@ -80,7 +80,7 @@ include::subdir/_b.adoc[]
== Images
[.thumb]
-image::logo-and-name-white.png[scaledwidth=75%]
+image::logo-apache.png[scaledwidth=75%]
== Videos
@@ -298,7 +298,7 @@ digraph g {
=== Meme Diagram
-meme::../resources/images/Yoda.png[May the Source,Be With You]
+meme::../resources/images/toddy.jpg[May the Source,Be With You]
=== Entity Relation Diagram
diff --git
a/tools/maven-revealjs-asciidoctor-templte/src/main/resources/images/Yoda.png
b/tools/maven-revealjs-asciidoctor-templte/src/main/resources/images/Yoda.png
deleted file mode 100644
index a2298d7..0000000
Binary files
a/tools/maven-revealjs-asciidoctor-templte/src/main/resources/images/Yoda.png
and /dev/null differ
diff --git
a/tools/maven-revealjs-asciidoctor-templte/src/main/resources/images/toddy.jpg
b/tools/maven-revealjs-asciidoctor-templte/src/main/resources/images/toddy.jpg
new file mode 100644
index 0000000..9db0e72
Binary files /dev/null and
b/tools/maven-revealjs-asciidoctor-templte/src/main/resources/images/toddy.jpg
differ
diff --git a/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
b/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
index 65ab331..079a53f 100644
--- a/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
+++ b/tools/maven-revealjs-asciidoctor-templte/src/main/theme/apache.css
@@ -18,7 +18,7 @@
*/
section.has-light-background, section.has-light-background h1,
section.has-light-background h2, section.has-light-background h3,
section.has-light-background h4, section.has-light-background h5,
section.has-light-background h6 {
- color: #222; }
+ color: #fff; }
/*********************************************
* GLOBAL STYLES
@@ -27,16 +27,16 @@ body {
background-image: url("../../../images/background.jpg");
background-repeat: no-repeat;
background-size: cover;
- background-color: #222; }
+ background-color: #fff; }
.reveal {
font-family: Panton-Regular, Helvetica, sans-serif;
font-size: 34px;
font-weight: normal;
- color: #fff; }
+ color: #000; }
::selection {
- color: #fff;
+ color: #000;
background: #bee4fd;
text-shadow: none; }
@@ -49,7 +49,7 @@ body {
*********************************************/
.reveal h1, .reveal h2, .reveal h3, .reveal h4, .reveal h5, .reveal h6 {
margin: 0 0 20px 0;
- color: #fff;
+ color: #000;
font-family: Panton-Regular, Helvetica, sans-serif;
font-weight: 600;
line-height: 1.2;
