diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-12 15:14:09 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-12 15:49:29 +0300 |
| commit | eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44 (patch) | |
| tree | 3a0cdf74e31470127edc81b989d45b7c0285f32b /server/src/com | |
| parent | 0f107f3ee36cd7be1fb0edda02e40e67e2cae09d (diff) | |
| download | vaadin-framework-eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44.tar.gz vaadin-framework-eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44.zip | |
Add support for rem units (#11279)
Change-Id: Id6b6402b22956cd96b86cef86f11088e959dc05d
Diffstat (limited to 'server/src/com')
| -rw-r--r-- | server/src/com/vaadin/server/Sizeable.java | 4 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractComponent.java | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ -101,6 +101,10 @@ public interface Sizeable extends Serializable { */ EM("em"), /** + * Unit code representing the font-size of the root font. + */ + REM("rem"), + /** * Unit code representing the x-height of the relevant font. */ EX("ex"), 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; |