Skip to content

Commit 4b4b462

Browse files
committed
Merge pull request #292 from GwtMaterialDesign/release_1.5
Release 1.5.0
2 parents 69fe804 + fdbc3ac commit 4b4b462

File tree

74 files changed

+6389
-3645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+6389
-3645
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,12 @@ Please follow the [contribution document](https://github.com/GwtMaterialDesign/g
5252

5353
##Follow Us
5454
<a href="https://plus.google.com/u/0/communities/108005250093449814286"> Google Plus</a>
55+
56+
## R</li>elated Projects
57+
<ul>
58+
<li><a href="https://github.com/GwtMaterialDesign/gwt-material-addins" >Addins 1.5.0</a></li>
59+
<li><a href="https://github.com/GwtMaterialDesign/gwt-material-themes" >Themes 1.5.0</a></li>
60+
<li><a href="https://github.com/GwtMaterialDesign/gwt-material-demo" >Demo 1.5.0</a></li>
61+
<li><a href="https://github.com/GwtMaterialDesign/gwt-material-template" >Starter 1.0</a></li>
62+
<li><a href="https://github.com/GwtMaterialDesign/gwt-material-patterns" >Patterns 1.0</a></li>
63+
</ul>

gwt-material/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>gwt-material-parent</artifactId>
55
<groupId>com.github.gwtmaterialdesign</groupId>
6-
<version>1.5.0-SNAPSHOT</version>
6+
<version>1.5.0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

gwt-material/src/main/java/gwt/material/design/client/MaterialDesignBase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ public class MaterialDesignBase {
2828

2929
public void load() {
3030
inject(MaterialResources.INSTANCE.materializeJs());
31-
inject(MaterialResources.INSTANCE.timepickerJs());
3231
inject(MaterialResources.INSTANCE.animationJs());
33-
inject(MaterialResources.INSTANCE.scriptJs());
32+
inject(MaterialResources.INSTANCE.shrinkJs());
3433
}
3534

3635
protected void inject(TextResource resource) {

gwt-material/src/main/java/gwt/material/design/client/MaterialDesignDebugBase.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public class MaterialDesignDebugBase extends MaterialDesignBase {
2828
@Override
2929
public void load() {
3030
injectDebug(MaterialDebugResources.INSTANCE.materializeJsDebug());
31-
injectDebug(MaterialDebugResources.INSTANCE.timepickerJsDebug());
32-
injectDebug(MaterialResources.INSTANCE.animationJs());
33-
injectDebug(MaterialResources.INSTANCE.scriptJs());
31+
injectDebug(MaterialDebugResources.INSTANCE.animationJsDebug());
32+
injectDebug(MaterialDebugResources.INSTANCE.shrinkJsDebug());
3433
}
3534
}

gwt-material/src/main/java/gwt/material/design/client/base/AbstractTextWidget.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@
2020
* #L%
2121
*/
2222

23+
import gwt.material.design.client.base.mixin.FontSizeMixin;
24+
import gwt.material.design.client.base.mixin.IdMixin;
25+
import gwt.material.design.client.constants.Display;
26+
2327
import com.google.gwt.dom.client.Element;
2428
import com.google.gwt.dom.client.Style;
2529
import com.google.gwt.editor.client.IsEditor;
2630
import com.google.gwt.editor.client.LeafValueEditor;
2731
import com.google.gwt.editor.ui.client.adapters.HasTextEditor;
2832
import com.google.gwt.user.client.ui.HasHTML;
2933
import com.google.gwt.user.client.ui.Widget;
30-
import gwt.material.design.client.base.mixin.FontSizeMixin;
31-
import gwt.material.design.client.base.mixin.IdMixin;
3234

3335
/**
3436
* @author Ben Dol
@@ -171,8 +173,8 @@ public double getOpacity() {
171173
}
172174

173175
@Override
174-
public void setDisplay(Style.Display display) {
175-
getElement().getStyle().setDisplay(display);
176+
public void setDisplay(Display display) {
177+
getElement().getStyle().setProperty("display", display.getCssName());
176178
}
177179

178180
@Override

0 commit comments

Comments
 (0)