-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from GwtMaterialDesign/release_2.4.0
Release 2.4.0
- Loading branch information
Showing
36 changed files
with
1,073 additions
and
345 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#!/bin/bash | ||
set -ev | ||
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.3" ]; then | ||
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; then | ||
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml | ||
mvn deploy --settings ~/settings.xml | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,13 +4,13 @@ | |
<parent> | ||
<artifactId>gwt-material-parent</artifactId> | ||
<groupId>com.github.gwtmaterialdesign</groupId> | ||
<version>2.3.0</version> | ||
<version>2.4.0-rc1</version> | ||
</parent> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<artifactId>gwt-material-themes</artifactId> | ||
<packaging>gwt-lib</packaging> | ||
<version>2.3.0</version> | ||
<version>2.4.0-rc1</version> | ||
|
||
<name>Gwt Material Themes</name> | ||
<description>Themes for gwt-material</description> | ||
|
@@ -27,7 +27,7 @@ | |
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-themes.git</connection> | ||
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-themes.git</developerConnection> | ||
<url>http://github.com/GwtMaterialDesign/gwt-material-themes</url> | ||
<tag>v2.3.0</tag> | ||
<tag>v2.4.0-rc1</tag> | ||
|
||
</scm> | ||
|
||
|
@@ -290,6 +290,19 @@ | |
<generateSourceMap>false</generateSourceMap> | ||
</configuration> | ||
</execution> | ||
<!-- Custom Theme --> | ||
<execution> | ||
<id>custom-theme</id> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>compile</goal> | ||
</goals> | ||
<configuration> | ||
<inputPath>${sass.source}/custom</inputPath> | ||
<outputPath>${sass.target}/custom/css</outputPath> | ||
<generateSourceMap>false</generateSourceMap> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/resources/gwt/material/design/themes/amber/css/materialize.amber.min.css
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.