Sampler theme fixes and additions. Unnecessary layouts and panels removed.

svn changeset:6733/svn branch:trunk

7 files changed, 31 insertions, 14 deletions

diff --git a/WebContent/ITMILL/themes/sampler/sampler/grid.png b/WebContent/ITMILL/themes/sampler/sampler/grid.png
new file mode 100644
index 0000000000..5a24c8f188
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/sampler/grid.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/list.png b/WebContent/ITMILL/themes/sampler/sampler/list.png
new file mode 100644
index 0000000000..97bcdeb2f6
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/sampler/list.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/styles.css b/WebContent/ITMILL/themes/sampler/sampler/styles.css
index 9dbfc76917..2008704faa 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/styles.css
+++ b/WebContent/ITMILL/themes/sampler/sampler/styles.css
@@ -10,8 +10,8 @@
 	background: #5c5d60 url(top-bg.png) repeat-x;
 }
 
-.i-app-SamplerApplication .main-split {
-	background: transparent url(main-bg.png) repeat-x;
+.i-app-SamplerApplication .i-horizontallayout-sample-view {
+	background: #fff url(main-bg.png) repeat-x;
 }
 
 .i-app-SamplerApplication .topbar .logo {
@@ -142,12 +142,32 @@
 	border: none;
 }
 
+.i-app-SamplerApplication .main-split .i-splitpanel-first-container {
+	background: #eaebec url(tree-bg.png) repeat-x fixed;
+}
+
+.i-app-SamplerApplication .main-split .i-splitpanel-hsplitter {
+	width: 1px;
+	background: #aeb0b5;
+}
+.i-app-SamplerApplication .main-split .i-splitpanel-hsplitter div {
+	width: 3px;
+	background: transparent;
+	border: none;
+	margin: 0 -1px;
+	padding: 0;
+}
+
 .i-app-SamplerApplication .i-tree-menu {
 	font-family: helvetica, arial, verdana, sans-serif;
 	font-size: 12px;
 	line-height: 17px;
 	padding: 13px 0;
 }
+.i-app-SamplerApplication .i-tree-menu .i-tree-node-selected span {
+	background: #7d8490;
+	padding: 1px;
+}
 
 .i-app-SamplerApplication .i-label-section {
 	font-family: "Helvetica Neue", helvetica, arial, verdana, sans-serif;
diff --git a/WebContent/ITMILL/themes/sampler/sampler/tree-bg.png b/WebContent/ITMILL/themes/sampler/sampler/tree-bg.png
new file mode 100644
index 0000000000..ebca8ef5f6
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/sampler/tree-bg.png
diff --git a/WebContent/ITMILL/themes/sampler/sampler/tree.png b/WebContent/ITMILL/themes/sampler/sampler/tree.png
index 6e7ce5122c..f82f1fadbd 100644
--- a/WebContent/ITMILL/themes/sampler/sampler/tree.png
+++ b/WebContent/ITMILL/themes/sampler/sampler/tree.png
diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureView.java b/src/com/itmill/toolkit/demo/sampler/FeatureView.java
index 2827af1ec0..699f1b1c4b 100644
--- a/src/com/itmill/toolkit/demo/sampler/FeatureView.java
+++ b/src/com/itmill/toolkit/demo/sampler/FeatureView.java
@@ -21,7 +21,7 @@ public class FeatureView extends HorizontalLayout {
     private static final String MSG_HIDE_SRC = "Hide Java™ source";
 
     private Panel right;
-    private Panel left;
+    private VerticalLayout left;
 
     private VerticalLayout controls;
 
@@ -34,18 +34,16 @@ public class FeatureView extends HorizontalLayout {
     private Feature currentFeature;
 
     public FeatureView() {
-        setSizeFull();
+
         setWidth("100%");
         setMargin(true);
         setSpacing(true);
         setStyleName("sample-view");
 
-        left = new Panel();
-        left.setStyleName(Panel.STYLE_LIGHT);
-        left.addStyleName("feature-main");
-
-        ((VerticalLayout) left.getLayout()).setSpacing(true);
-        ((VerticalLayout) left.getLayout()).setMargin(false);
+        left = new VerticalLayout();
+        left.setWidth("100%");
+        left.setSpacing(true);
+        left.setMargin(false);
         addComponent(left);
         setExpandRatio(left, 1);
 
@@ -53,7 +51,6 @@ public class FeatureView extends HorizontalLayout {
         right.setStyleName(Panel.STYLE_LIGHT);
         right.addStyleName("feature-info");
         right.setWidth("369px");
-        right.setHeight("100%");
         addComponent(right);
 
         controls = new VerticalLayout();
diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
index 7bc9ff3d53..01d19397cf 100644
--- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
+++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
@@ -408,13 +408,13 @@ public class SamplerApplication extends Application {
         private ModeSwitch createModeSwitch() {
             ModeSwitch m = new ModeSwitch();
             m.addMode(currentList, "", "View as Icons", new ThemeResource(
-                    "sampler/grid.gif"));
+                    "sampler/grid.png"));
             /*- no CoverFlow yet
             m.addMode(coverFlow, "", "View as Icons", new ThemeResource(
                     "sampler/flow.gif"));
              */
             m.addMode(new FeatureTable(), "", "View as List",
-                    new ThemeResource("sampler/list.gif"));
+                    new ThemeResource("sampler/list.png"));
             m.addListener(new ModeSwitch.ModeSwitchListener() {
                 public void componentEvent(Event event) {
                     if (event instanceof ModeSwitchEvent) {
@@ -483,7 +483,7 @@ public class SamplerApplication extends Application {
      */
     private class MainArea extends CustomComponent {
         MainArea() {
-            setSizeFull();
+            setWidth("100%");
             setCompositionRoot(new Label());
         }