From cf29b84b7962b8de7a33608ef6e93beba22fabce Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Tue, 24 Mar 2015 12:01:19 +0000 Subject: [PATCH] FieldGroup has incorrect size in IE11 #PL-5109 --- .../web/toolkit/ui/client/groupbox/CubaGroupBoxWidget.java | 2 ++ modules/web/themes/halo/components/groupbox/groupbox.scss | 6 ++++++ modules/web/themes/havana/components/groupbox/groupbox.scss | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/groupbox/CubaGroupBoxWidget.java b/modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/groupbox/CubaGroupBoxWidget.java index 59cb6fe4c2..e101b99e23 100644 --- a/modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/groupbox/CubaGroupBoxWidget.java +++ b/modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/groupbox/CubaGroupBoxWidget.java @@ -44,6 +44,8 @@ public class CubaGroupBoxWidget extends VPanel { bottomDecoration.setClassName(primaryStyleName + "-deco"); expander.setClassName(primaryStyleName + "-expander"); + contentNode.getStyle().clearPosition(); + setExpanded(true); captionStartDeco.appendChild(DOM.createDiv()); diff --git a/modules/web/themes/halo/components/groupbox/groupbox.scss b/modules/web/themes/halo/components/groupbox/groupbox.scss index a0eb90e30f..ce88d1d035 100644 --- a/modules/web/themes/halo/components/groupbox/groupbox.scss +++ b/modules/web/themes/halo/components/groupbox/groupbox.scss @@ -9,6 +9,11 @@ @include valo-panel($primary-stylename); @include halo-panel($primary-stylename); + .#{$primary-stylename} { + font-size: 0; + overflow: hidden !important; + } + .#{$primary-stylename}-content { outline: none; border-left: valo-border(); @@ -17,6 +22,7 @@ border-bottom-left-radius: $v-border-radius; border-bottom-right-radius: $v-border-radius; padding: 0 round($v-unit-size/3) round($v-unit-size/3) round($v-unit-size/3); + overflow: visible; } .#{$primary-stylename}.collapsed > .#{$primary-stylename}-content, diff --git a/modules/web/themes/havana/components/groupbox/groupbox.scss b/modules/web/themes/havana/components/groupbox/groupbox.scss index 2a4dd84c73..d06d221540 100644 --- a/modules/web/themes/havana/components/groupbox/groupbox.scss +++ b/modules/web/themes/havana/components/groupbox/groupbox.scss @@ -8,6 +8,10 @@ @mixin havana-cuba-groupbox($primary-stylename : cuba-groupbox) { @include base-panel($primary-stylename); + .#{$primary-stylename} { + font-size: 0; + } + .#{$primary-stylename}-content { outline: none; border-left: 1px solid $cuba-groupbox-border-color; @@ -15,6 +19,7 @@ border-bottom: 1px solid $cuba-groupbox-border-color; padding: 0 5px; padding-bottom: 5px; + overflow: visible; } .#{$primary-stylename}.collapsed > .#{$primary-stylename}-content, @@ -106,6 +111,7 @@ .#{$primary-stylename}-deco { line-height: 0; height: 0; + font-size: 0; width: 0; display: none; }