From eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Wed, 12 Jun 2013 15:14:09 +0300 Subject: Add support for rem units (#11279) Change-Id: Id6b6402b22956cd96b86cef86f11088e959dc05d --- server/src/com/vaadin/server/Sizeable.java | 4 ++++ server/src/com/vaadin/ui/AbstractComponent.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'server/src/com') diff --git a/server/src/com/vaadin/server/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java index 38e998c04b..decace3d10 100644 --- a/server/src/com/vaadin/server/Sizeable.java +++ b/server/src/com/vaadin/server/Sizeable.java @@ -100,6 +100,10 @@ public interface Sizeable extends Serializable { * Unit code representing the font-size of the relevant font. */ EM("em"), + /** + * Unit code representing the font-size of the root font. + */ + REM("rem"), /** * Unit code representing the x-height of the relevant font. */ diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java index 0bf27435fb..772a26bda2 100644 --- a/server/src/com/vaadin/ui/AbstractComponent.java +++ b/server/src/com/vaadin/ui/AbstractComponent.java @@ -81,7 +81,7 @@ public abstract class AbstractComponent extends AbstractClientConnector private Unit widthUnit = Unit.PIXELS; private Unit heightUnit = Unit.PIXELS; private static final Pattern sizePattern = Pattern - .compile("^(-?\\d+(\\.\\d+)?)(%|px|em|ex|in|cm|mm|pt|pc)?$"); + .compile("^(-?\\d+(\\.\\d+)?)(%|px|em|rem|ex|in|cm|mm|pt|pc)?$"); private ErrorHandler errorHandler = null; -- cgit v1.2.3