test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FieldGroup has incorrect size in IE11 #PL-5109

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-03-24 12:01:19 +00:00
parent a52c743209
commit cf29b84b79
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/groupbox/CubaGroupBoxWidget.java
View File

@ -44,6 +44,8 @@ public class CubaGroupBoxWidget extends VPanel {
bottomDecoration.setClassName(primaryStyleName + "-deco"); bottomDecoration.setClassName(primaryStyleName + "-deco");
expander.setClassName(primaryStyleName + "-expander"); expander.setClassName(primaryStyleName + "-expander");
contentNode.getStyle().clearPosition();
setExpanded(true); setExpanded(true);
captionStartDeco.appendChild(DOM.createDiv()); captionStartDeco.appendChild(DOM.createDiv());

6
modules/web/themes/halo/components/groupbox/groupbox.scss
View File

@ -9,6 +9,11 @@
@include valo-panel($primary-stylename); @include valo-panel($primary-stylename);
@include halo-panel($primary-stylename); @include halo-panel($primary-stylename);
.#{$primary-stylename} {
font-size: 0;
overflow: hidden !important;
}
.#{$primary-stylename}-content { .#{$primary-stylename}-content {
outline: none; outline: none;
border-left: valo-border(); border-left: valo-border();
@ -17,6 +22,7 @@
border-bottom-left-radius: $v-border-radius; border-bottom-left-radius: $v-border-radius;
border-bottom-right-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); 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, .#{$primary-stylename}.collapsed > .#{$primary-stylename}-content,

6
modules/web/themes/havana/components/groupbox/groupbox.scss
View File

@ -8,6 +8,10 @@
@mixin havana-cuba-groupbox($primary-stylename : cuba-groupbox) { @mixin havana-cuba-groupbox($primary-stylename : cuba-groupbox) {
@include base-panel($primary-stylename); @include base-panel($primary-stylename);
.#{$primary-stylename} {
font-size: 0;
}
.#{$primary-stylename}-content { .#{$primary-stylename}-content {
outline: none; outline: none;
border-left: 1px solid $cuba-groupbox-border-color; border-left: 1px solid $cuba-groupbox-border-color;
@ -15,6 +19,7 @@
border-bottom: 1px solid $cuba-groupbox-border-color; border-bottom: 1px solid $cuba-groupbox-border-color;
padding: 0 5px; padding: 0 5px;
padding-bottom: 5px; padding-bottom: 5px;
overflow: visible;
} }
.#{$primary-stylename}.collapsed > .#{$primary-stylename}-content, .#{$primary-stylename}.collapsed > .#{$primary-stylename}-content,
@ -106,6 +111,7 @@
.#{$primary-stylename}-deco { .#{$primary-stylename}-deco {
line-height: 0; line-height: 0;
height: 0; height: 0;
font-size: 0;
width: 0; width: 0;
display: none; display: none;
} }