summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-03-16 16:41:17 +0200
committerLeif Åstrand <leif@vaadin.com>2012-03-16 16:42:18 +0200
commitc0f52b82b43735e888be9889a9fe95c68cf806b2 (patch)
treeac46bb9a98d256230c7e941387b24e1e7e3964b4 /src
parentce24fb4f0289cf8bb8841d397ccb214189530905 (diff)
downloadvaadin-framework-c0f52b82b43735e888be9889a9fe95c68cf806b2.tar.gz
vaadin-framework-c0f52b82b43735e888be9889a9fe95c68cf806b2.zip
Only prevent margin collapse if embedded
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/RootConnector.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
index 45a010a0f1..086ded1743 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
@@ -64,6 +64,9 @@ public class RootConnector extends AbstractComponentContainerConnector
styles += style + " ";
}
}
+ if (!client.getConfiguration().isStandalone()) {
+ styles += getWidget().getStylePrimaryName() + "-embedded";
+ }
getWidget().setStyleName(styles.trim());
clickEventHandler.handleEventHandlerRegistration(client);