diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-12-10 15:16:37 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-12-10 15:16:37 +0000 |
| commit | 6f598308806aba9880908bc9f903958d18aa3e93 (patch) | |
| tree | 006f982dc650d99a33fdc13246230d84d2fe64e5 /src | |
| parent | f4699df58da8897bca972d618931ded4f7d4a04a (diff) | |
| download | vaadin-framework-6f598308806aba9880908bc9f903958d18aa3e93.tar.gz vaadin-framework-6f598308806aba9880908bc9f903958d18aa3e93.zip | |
better workaround for "Joonas, Safari and network with latency rendering bug"
svn changeset:3207/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/public/default/styles.css | 33 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 9 |
2 files changed, 8 insertions, 34 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css b/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css index 49577138d4..3935cf07aa 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css @@ -1,36 +1,3 @@ -/* First rules here are to avoid some bugs with Safari and network latency ~ > 100ms-> - * Size calculations fail without them. Other problems may also appear, but the - * most critical ones can be avoided with these. - * TODO workaround: concatenate style sheets - */ - -#itmill-ajax-window { - background: #e9eced; - font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; - color: #464f52; - font-size: 13px; - line-height: 18px; - height: 100%; -} -/* body tag created by servlet */ -.i-generated-body { - background: #e9eced; - width:100%; - height:100%; - border:0; - margin:0; - overflow:auto; -} - -.i-view { - height: 100%; - width: 100% - overflow: auto; - /* avoid scrollbars with margins in root layout */ - margin-top:-1px; - border-top:1px solid transparent; -} - @import "common/common.css";
@import "button/button.css";
@import "textfield/textfield.css";
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index 6c3957ca5e..e13f00ab21 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -623,7 +623,14 @@ public class ApplicationServlet extends HttpServlet { page .write("<html xmlns=\"http://www.w3.org/1999/xhtml\" style=\"width:100%;" - + "height:100%;border:0;margin:0;\">\n<head>\n<title>IT Mill Toolkit 5</title>\n" + + "height:100%;border:0;margin:0;\">\n<head>\n" + + "<style>" + // Add critical styles due Safari timing issues + // TODO workaround for this hack + + "#itmill-ajax-window {height: 100%;}.i-generated-body " + + "{width:100%;height:100%;border:0;margin:0;}.i-view " + + "{height: 100%;width: 100%;}</style>" + + "<title>IT Mill Toolkit 5</title>\n" + "<script type=\"text/javascript\">\n" + " var itmill = {\n" + " appUri:'"); |