summaryrefslogtreecommitdiffstats
path: root/WebContent
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 /WebContent
parentce24fb4f0289cf8bb8841d397ccb214189530905 (diff)
downloadvaadin-framework-c0f52b82b43735e888be9889a9fe95c68cf806b2.tar.gz
vaadin-framework-c0f52b82b43735e888be9889a9fe95c68cf806b2.zip
Only prevent margin collapse if embedded
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/common/common.css7
1 files changed, 4 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css
index 41184f579c..a95f33afcd 100644
--- a/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@ -32,11 +32,12 @@ div.v-app-loading {
overflow: auto;
/* avoid scrollbars with margins in root layout */
outline: none;
+ position: relative;
+}
+/* Prevent margin collapse */
+.v-view.v-view-embedded {
margin-top: -1px;
border-top: 1px solid transparent;
- position: relative;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
}
/**
* Try to handle printing somehow. Reasonable printing support