From c6ef3aa139dae091fd3a27809361fe631041e3d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Thu, 9 Feb 2012 20:13:40 +0200 Subject: [PATCH] Use box-sizing: border-box for all paintables (#8313) --- WebContent/VAADIN/themes/base/paintable/paintable.css | 4 ++++ .../terminal/gwt/client/ui/VAbstractPaintableWidget.java | 1 + .../vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java | 5 ----- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 WebContent/VAADIN/themes/base/paintable/paintable.css diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css new file mode 100644 index 0000000000..1de0b70c38 --- /dev/null +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -0,0 +1,4 @@ +.v-paintable { + box-sizing: border-box; + -moz-box-sizing: border-box; +} \ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java index dcb95103d5..e02e3f4a44 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java @@ -318,6 +318,7 @@ public abstract class VAbstractPaintableWidget implements VPaintableWidget { StringBuffer styleBuf = new StringBuffer(); styleBuf.append(primaryStyleName); + styleBuf.append(" v-paintable"); // first disabling and read-only status if (!enabled) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java b/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java index 9cb2a3aa63..8581fade8d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java +++ b/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java @@ -24,11 +24,6 @@ public abstract class VLayoutSlot { this.widget = widget; wrapper.getStyle().setPosition(Position.ABSOLUTE); - - // TODO set box sizing in CSS - Style widgetStyle = widget.getElement().getStyle(); - widgetStyle.setProperty("MozBoxSizing", "border-box"); - widgetStyle.setProperty("boxSizing", "border-box"); } public VCaption getCaption() { -- 2.39.5