Works around some layout related issues in Safari & IE

svn changeset:5751/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/sampler/sampler/styles.css b/WebContent/ITMILL/themes/sampler/sampler/styles.css
index a2d48d959be0231c7684cc65a8865c038d56bc55..0449d79f041fa546c721db5d79d795e3e720bacc 100644 (file)
--- a/WebContent/ITMILL/themes/sampler/sampler/styles.css
+++ b/WebContent/ITMILL/themes/sampler/sampler/styles.css
@@ -36,8 +36,7 @@
 .i-customcomponent-ModeSwitch .i-button {
        height: 28px;
        border: none;
-       border-right: 1px solid #736a60;
-       margin: 0px;
+       font-size: 6px;
 }
 .i-customcomponent-ModeSwitch .i-button-first-on {
        background: transparent url(left-on.gif) no-repeat;

diff --git a/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java b/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java
index 100679e73e6d295663110bf1976350e1ea276416..a42ca620646bae590e6d8530e99ca34e620bed23 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java
+++ b/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java
@@ -6,13 +6,12 @@ import java.util.Iterator;
 import com.itmill.toolkit.terminal.Resource;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.GridLayout;
 import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class ModeSwitch extends CustomComponent {
 
-    OrderedLayout layout = new OrderedLayout(
-            OrderedLayout.ORIENTATION_HORIZONTAL);
+    GridLayout layout = new GridLayout(3, 1);
 
     HashMap idToButton = new HashMap();
     Object mode = null;