You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/08/15 11:46:40 UTC
[incubator-plc4x] branch master updated: Fixed the fontawesome icon
support
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push:
new 0d718a2 Fixed the fontawesome icon support
0d718a2 is described below
commit 0d718a26aed85a3ab7227cb28df77605b3bdb6db
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Aug 15 13:46:27 2018 +0200
Fixed the fontawesome icon support
---
pom.xml | 25 +++++++++++++++++++++----
src/site/asciidoc/index.adoc | 2 +-
src/site/template/maven-site.vm | 2 ++
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8fee49..fde4daa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,11 +454,22 @@
</goals>
<configuration>
<url>http://netdna.bootstrapcdn.com/bootswatch/2.3.2/flatly/bootstrap.min.css</url>
- <outputDirectory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2/css/
- </outputDirectory>
+ <outputDirectory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2/css/</outputDirectory>
<outputFileName>bootstrap.min.css</outputFileName>
</configuration>
</execution>
+ <execution>
+ <id>get-fontawesome</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>https://use.fontawesome.com/releases/v5.2.0/fontawesome-free-5.2.0-web.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}/dependency/fontawesome</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -476,8 +487,14 @@
<outputDirectory>${project.build.directory}/site</outputDirectory>
<resources>
<resource>
- <directory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2
- </directory>
+ <directory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/dependency/fontawesome/fontawesome-free-5.2.0-web</directory>
+ <includes>
+ <include>css/all.min.css</include>
+ <include>webfonts/**</include>
+ </includes>
</resource>
<resource>
<directory>${project.build.directory}/dependency/META-INF/resources/webjars/jquery/1.9.1</directory>
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 9325d4b..471f544 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -67,7 +67,7 @@ Beyond implementing the pure adapters we have already implemented some of the pl
[width=100%]
|===
a|image::apache_edgent_logo.png[width=80%,link=https://edgent.apache.org] a|image::apache_camel_logo.png[width=80%,link=https://camel.apache.org] a|image::apache_kafka_logo.png[width=80%,link=https://kafka.apache.org]
-|icon:check[role=green] https://edgent.apache.org[Apache Edgent (Incubating)] |icon:check[role=green] https://camel.apache.org[Apache Camel] |icon:times[role=red] https://kafka.apache.org[Apache Kafka]
+|icon:check[role=green] https://edgent.apache.org[Apache Edgent (Incubating)] |icon:check[role=green] https://camel.apache.org[Apache Camel] |icon:wrench[role=yellow] https://kafka.apache.org[Apache Kafka]
a|image::apache_mynewt_logo.png[width=80%,link=https://mynewt.apache.org] a|image::apache_nifi_logo.svg[width=80%,link=https://nifi.apache.org] a|image::apache_brooklyn_logo.png[width=80%,link=https://brooklyn.apache.org]
|icon:times[role=red] https://mynewt.apache.org[Apache Mynewt] |icon:times[role=red] https://nifi.apache.org[Apache Nifi] |icon:times[role=red] https://brooklyn.apache.org[Apache Brooklyn]
diff --git a/src/site/template/maven-site.vm b/src/site/template/maven-site.vm
index ef3b5a4..f6d5f51 100644
--- a/src/site/template/maven-site.vm
+++ b/src/site/template/maven-site.vm
@@ -1426,6 +1426,8 @@
<link href="$resourcePath/css/docs.css" rel="stylesheet" />
#* *##end##
<link href="$resourcePath/css/reflow-skin.css" rel="stylesheet" />
+ <!-- Fontawesome -->
+ <link href="$resourcePath/css/all.min.css" rel="stylesheet" />
#*
// disable CDN-loaded highlightJs altogether if `localResources` is selected.