diff options
| author | Henri Sara <hesara@vaadin.com> | 2013-02-14 14:31:58 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2013-02-14 14:31:58 +0200 |
| commit | 50e53f0734042b2daebe99d6f1476fca0fa72151 (patch) | |
| tree | 9e4e90876028f5820a23e6fde8b8570685fb25e6 /client | |
| parent | 9185ce0a26db5574079e6a196dd121af9c3286ae (diff) | |
| parent | b72934473733b543498ba3a3c1082a332f539961 (diff) | |
| download | vaadin-framework-50e53f0734042b2daebe99d6f1476fca0fa72151.tar.gz vaadin-framework-50e53f0734042b2daebe99d6f1476fca0fa72151.zip | |
Merge remote-tracking branch 'origin/7.0'
Change-Id: I7428e1c57836f055a39b39425a3bcb6bada38d1e
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VLabel.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/VLabel.java b/client/src/com/vaadin/client/ui/VLabel.java index 83fc8e207e..8acd653778 100644 --- a/client/src/com/vaadin/client/ui/VLabel.java +++ b/client/src/com/vaadin/client/ui/VLabel.java @@ -16,7 +16,6 @@ package com.vaadin.client.ui; -import com.google.gwt.dom.client.Style.Display; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.HTML; import com.vaadin.client.ApplicationConnection; @@ -57,10 +56,8 @@ public class VLabel extends HTML { super.setWidth(width); if (width == null || width.equals("")) { setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, true); - getElement().getStyle().setDisplay(Display.INLINE_BLOCK); } else { setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, false); - getElement().getStyle().clearDisplay(); } } |