Merge remote-tracking branch 'origin/REL-BRANCH-vaadin-clubhelper-0.0.2-beta'

master
Markus Kreth 7 years ago
commit c0db654a75
  1. 6
      pom.xml
  2. 22
      src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/addons.scss

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.kreth.vaadin.clubhelper</groupId> <groupId>de.kreth.vaadin.clubhelper</groupId>
<artifactId>vaadin-clubhelper</artifactId> <artifactId>vaadin-clubhelper</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.2-beta</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>vaadin-clubhelper</name> <name>vaadin-clubhelper</name>

@ -1,12 +1,12 @@
/* This file is automatically managed and will be overwritten from time to time. */ /* This file is automatically managed and will be overwritten from time to time. */
/* Do not manually edit this file. */ /* Do not manually edit this file. */
/* Provided by calendar-component-2.0-BETA4.jar */ /* Provided by calendar-component-2.0-BETA4.jar */
@import "../../../VAADIN/addons/calendar/calendar-addon.scss"; @import "../../../VAADIN/addons/calendar/calendar-addon.scss";
/* Import and include this mixin into your project theme to include the addon themes */ /* Import and include this mixin into your project theme to include the addon themes */
@mixin addons { @mixin addons {
@include calendar-addon; @include calendar-addon;
} }

Loading…
Cancel
Save