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

Window actions margin in the dialog #PL-2960

Browse Source
This commit is contained in:
Yuriy Artamonov 2013-10-25 13:33:41 +00:00
parent 319077df78
commit 765669aac4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/web/src/com/haulmont/cuba/web/WebWindowManager.java
View File

@ -23,6 +23,7 @@ import com.vaadin.event.ShortcutListener;
import com.vaadin.server.Page; import com.vaadin.server.Page;
import com.vaadin.server.Sizeable; import com.vaadin.server.Sizeable;
import com.vaadin.shared.ui.BorderStyle; import com.vaadin.shared.ui.BorderStyle;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Button; import com.vaadin.ui.Button;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
@ -511,6 +512,7 @@ public class WebWindowManager extends WindowManager {
outerLayout.setStyleName("cuba-app-dialog-window"); outerLayout.setStyleName("cuba-app-dialog-window");
outerLayout.addComponent(layout); outerLayout.addComponent(layout);
outerLayout.setExpandRatio(layout, 1); outerLayout.setExpandRatio(layout, 1);
outerLayout.setMargin(new MarginInfo(true, false, false, false));
win.setContent(outerLayout); win.setContent(outerLayout);

4
modules/web/themes/havana/components/window/window.scss
View File

@ -83,10 +83,6 @@
border: 1px solid $theme_windowBorderColor; border: 1px solid $theme_windowBorderColor;
} }
.#{$primaryStyleName}-contents > .v-scrollable {
margin-top: 5px;
}
.#{$primaryStyleName}-footer { .#{$primaryStyleName}-footer {
height: 10px; height: 10px;
background: transparent; background: transparent;