You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/10/14 08:52:10 UTC

[isis] branch master updated: ISIS-2448 ChicagoFLF.ttf in kroviz hinders bumping maven-resources-plugin to 3.2.0

This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b55ed6  ISIS-2448 ChicagoFLF.ttf in kroviz hinders bumping maven-resources-plugin to 3.2.0
0b55ed6 is described below

commit 0b55ed6daaa2aae0c5a9b3ad3ec5e66c2236a52f
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Wed Oct 14 10:51:28 2020 +0200

    ISIS-2448 ChicagoFLF.ttf in kroviz hinders bumping maven-resources-plugin to 3.2.0
---
 incubator/clients/kroviz/docs/UsersGuide.md             |   6 +++---
 .../clients/kroviz/src/main/resources/css/kroviz.css    |   9 ---------
 .../kroviz/src/main/resources/fonts/ChicagoFLF.ttf      | Bin 31256 -> 0 bytes
 isis-parent/pom.xml                                     |  10 +++++-----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/incubator/clients/kroviz/docs/UsersGuide.md b/incubator/clients/kroviz/docs/UsersGuide.md
index 65583b9..c7d26df 100644
--- a/incubator/clients/kroviz/docs/UsersGuide.md
+++ b/incubator/clients/kroviz/docs/UsersGuide.md
@@ -9,7 +9,7 @@ This is about explaining what can be done on the client side in order to customi
 ## Branding
 See kroviz.css
 
-Colours and dimensions can be influenced here, as well as images:
+Colours, dimensions, and fonts can be influenced here, as well as images:
 
 ```css
 .text-danger {
@@ -27,10 +27,10 @@ Colours and dimensions can be influenced here, as well as images:
 .text-normal {
     color: black;
 }
-[...]
+/*...*/
 @font-face {
     font-family: Chicago;
-    src: url('/fonts/ChicagoFLF.ttf');
+    src: url('../fonts/ChicagoFLF.ttf');
 }
 
 div {
diff --git a/incubator/clients/kroviz/src/main/resources/css/kroviz.css b/incubator/clients/kroviz/src/main/resources/css/kroviz.css
index 0035168..c8a04ec 100644
--- a/incubator/clients/kroviz/src/main/resources/css/kroviz.css
+++ b/incubator/clients/kroviz/src/main/resources/css/kroviz.css
@@ -128,15 +128,6 @@ textarea {
     margin-bottom: 12px;
 }
 
-@font-face {
-    font-family: Chicago;
-    src: url('../fonts/ChicagoFLF.ttf');
-}
-
-div {
-    /* font-family: Chicago, sans-serif;*/
-}
-
 .logo-button-image:before {
     content: "";
     width: 75px;
diff --git a/incubator/clients/kroviz/src/main/resources/fonts/ChicagoFLF.ttf b/incubator/clients/kroviz/src/main/resources/fonts/ChicagoFLF.ttf
deleted file mode 100644
index 60691e1..0000000
Binary files a/incubator/clients/kroviz/src/main/resources/fonts/ChicagoFLF.ttf and /dev/null differ
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 08a6463..dbb89fa 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -479,7 +479,7 @@ under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -739,14 +739,14 @@ under the License.
 							<goal>process</goal>
 						</goals>
 						<configuration>
-						
+
 						    <!-- Reference the supplemental-model artifact from module supplemental-model -->
 				            <supplementalModelArtifacts>
 				            	<supplementalModelArtifact>org.apache.isis:supplemental-model:1.0</supplementalModelArtifact>
 				            </supplementalModelArtifacts>
-						
+
 							<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-							
+
 							 <!-- Specify the path, relative to the JAR root, where the supplemental model file is located -->
 							<supplementalModels>
 								<supplementalModel>supplemental-models.xml</supplementalModel>
@@ -774,7 +774,7 @@ under the License.
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>