Include Vaadin-Icons into the valo theme in the project, make vaadin-icons dependency 'provided' Fixes #8471tags/8.0.0.rc1
@@ -285,6 +285,7 @@ | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-icons</artifactId> | |||
<version>${vaadin.icons.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
</dependencies> | |||
</dependencyManagement> |
@@ -116,6 +116,49 @@ | |||
<build> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-dependency-plugin</artifactId> | |||
<version>3.0.0</version> | |||
<executions> | |||
<execution> | |||
<id>copy-font-icons</id> | |||
<phase>generate-sources</phase> | |||
<goals> | |||
<goal>unpack-dependencies</goal> | |||
</goals> | |||
<!-- VaadinIcons.java file --> | |||
<configuration> | |||
<includeGroupIds>com.vaadin</includeGroupIds> | |||
<includeArtifactIds>vaadin-icons</includeArtifactIds> | |||
<excludeTransitive>true</excludeTransitive> | |||
<includes>com/vaadin/icons/VaadinIcons.java</includes> | |||
<overWrite>true</overWrite> | |||
<outputDirectory>${project.build.directory}/vaadin-icons</outputDirectory> | |||
</configuration> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.codehaus.mojo</groupId> | |||
<artifactId>build-helper-maven-plugin</artifactId> | |||
<version>3.0.0</version> | |||
<executions> | |||
<execution> | |||
<id>add-source</id> | |||
<phase>generate-sources</phase> | |||
<goals> | |||
<goal>add-source</goal> | |||
</goals> | |||
<configuration> | |||
<sources> | |||
<source>${project.build.directory}/vaadin-icons</source> | |||
</sources> | |||
</configuration> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-resources-plugin</artifactId> | |||
<executions> | |||
<!-- Copy .java files to package --> | |||
@@ -137,6 +180,10 @@ | |||
<directory>src/main/java</directory> | |||
<filtering>false</filtering> | |||
</resource> | |||
<resource> | |||
<directory>${project.build.directory}/vaadin-icons</directory> | |||
<filtering>false</filtering> | |||
</resource> | |||
</resources> | |||
</configuration> | |||
</execution> |
@@ -68,10 +68,6 @@ | |||
<exclude org="javax.servlet"></exclude> | |||
<exclude type="pom" /> | |||
</dependency> | |||
<dependency org="com.vaadin" name="vaadin-icons" rev="3.0.0" | |||
conf="build->default"> | |||
<exclude type="pom" /> | |||
</dependency> | |||
<!-- For compiling TestingWidgetSet --> | |||
<dependency org="com.vaadin" name="vaadin-client-compiler" |
@@ -71,8 +71,6 @@ | |||
resolver="vaadin-maven" /> | |||
<module organisation="com.vaadin" name="vaadin-uitest-common" | |||
resolver="vaadin-maven" /> | |||
<module organisation="com.vaadin" name="vaadin-icons" | |||
resolver="vaadin-maven" /> | |||
</modules> | |||
@@ -72,9 +72,8 @@ | |||
<includeGroupIds>com.vaadin</includeGroupIds> | |||
<includeArtifactIds>vaadin-icons</includeArtifactIds> | |||
<excludeTransitive>true</excludeTransitive> | |||
<includes>VAADIN\/addons\/vaadin-icons\/**</includes> | |||
<includes>VAADIN/addons/vaadin-icons/fonts/*</includes> | |||
<overWrite>true</overWrite> | |||
<outputDirectory>${project.basedir}/src/main/themes/</outputDirectory> | |||
</configuration> | |||
</execution> | |||
</executions> | |||
@@ -108,6 +107,25 @@ | |||
</resources> | |||
</configuration> | |||
</execution> | |||
<execution> | |||
<id>copy-font-files</id> | |||
<phase>prepare-package</phase> | |||
<goals> | |||
<goal>copy-resources</goal> | |||
</goals> | |||
<configuration> | |||
<outputDirectory>${project.build.outputDirectory}/VAADIN/themes/valo/fonts/vaadin-icons</outputDirectory> | |||
<resources> | |||
<resource> | |||
<directory>${project.build.directory}/dependency-unpack/VAADIN/addons/vaadin-icons/fonts/</directory> | |||
<filtering>false</filtering> | |||
<includes> | |||
<include>Vaadin-Icons.*</include> | |||
</includes> | |||
</resource> | |||
</resources> | |||
</configuration> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
@@ -4,7 +4,7 @@ | |||
@import "roboto/roboto"; | |||
@import "lato/lato"; | |||
@import "lora/lora"; | |||
@import "../../../VAADIN/addons/vaadin-icons/vaadin-icons.scss"; | |||
@import "vaadin-icons/vaadin-icons.scss"; | |||
/// Include VaadinIcons. They are included in Valo | |||
/// since Vaadin Framework version 8.0 (#7979) |
@@ -0,0 +1,20 @@ | |||
$vaadin-icons-pathPrefix: null; | |||
@if $v-relative-paths == false { | |||
$vaadin-icons-pathPrefix: "../valo/fonts/vaadin-icons/"; | |||
} | |||
@font-face { | |||
font-family: 'Vaadin-Icons'; | |||
src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot'); | |||
src: url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.eot?#iefix') format('embedded-opentype'), | |||
url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.woff') format('woff'), | |||
url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.ttf') format('truetype'), | |||
url('#{$vaadin-icons-pathPrefix}Vaadin-Icons.svg#icomoon') format('svg'); | |||
} | |||
.Vaadin-Icons { | |||
font-family: 'Vaadin-Icons'; | |||
} | |||
@mixin vaadin-icons { | |||
} |