Fixed some typos in Sampler features and edited the CssLayout example styles, now...

svn changeset:8653/svn branch:6.1

diff --git a/WebContent/VAADIN/themes/sampler/layouts/cssexample.css b/WebContent/VAADIN/themes/sampler/layouts/cssexample.css
index 12a90edf0fec89e8108b1d12011e53148c195d85..d282a3994dd17bcda09938f02b6922abaf6fb68a 100644 (file)
--- a/WebContent/VAADIN/themes/sampler/layouts/cssexample.css
+++ b/WebContent/VAADIN/themes/sampler/layouts/cssexample.css
@@ -1,26 +1,30 @@
 .floatedpanel {
-       float:right;
+       float: right;
 }
 
 .footer {
        width: 3in; 
        padding: 3px;
-       margin-left:auto;
-       margin-right:auto;
-       clear:both; 
-       height:40px; 
-       background-color: grey; 
-       white-space:normal;
+       margin: 0 auto;
+       clear: both; 
+       height: 40px; 
+       background: #efefef; 
+       white-space: normal;
+       padding: 10px;
+       -webkit-border-radius: 6px;
+       -moz-border-radius: 6px;
 }
 
 .brick {
-       text-align:center;
+       font-size: 14px;
+       font-weight: bold;
        width: 100px; 
        height: 100px; 
        margin: 10px;
-       padding:10px;
-       background-color:#1E2123; 
-       color:white;
-       float:left; 
-       border: 3px solid black;
+       padding: 10px;
+       background: #1E2123; 
+       color: #fff;
+       float: left;
+       -webkit-border-radius: 6px;
+       -moz-border-radius: 6px;
 } 
\ No newline at end of file

diff --git a/src/com/vaadin/demo/sampler/features/layouts/CssLayouts.java b/src/com/vaadin/demo/sampler/features/layouts/CssLayouts.java
index 65ba2dab33c29b962c9bfec64e6bea10c17e55de..d7a716575273abe7e8c3b7c5ec2032c947c3496c 100644 (file)
--- a/src/com/vaadin/demo/sampler/features/layouts/CssLayouts.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/CssLayouts.java
@@ -16,18 +16,17 @@ public class CssLayouts extends Feature {
 \r
     @Override\r
     public String getDescription() {\r
-        // TODO\r
-        return "Most commonly developers usign Vaadin don't want to think "\r
+        return "Most commonly developers using Vaadin don't want to think "\r
                 + "of the browser environment at all. With the flexible "\r
-                + "layout API found from grid, horizontal and vertical "\r
-                + "layout developers can build almost anything with plain "\r
-                + "Java. But sometimes experienced web developers miss "\r
-                + "flexibility of CSS and HTML. CssLayout is a simple "\r
-                + "layout that puts contained componets into div element. "\r
-                + "It has a simple DOM structure and it leaves all the power "\r
-                + "to CSS designer hands. Having a very narrow feature set"\r
-                + ", CssLayout is also the fastest layout to render in "\r
-                + "Vaadin.";\r
+                + "layout API found from Grid, Horizontal and Vertical "\r
+                + "layouts, developers can build almost anything with plain "\r
+                + "Java. But sometimes experienced web developers miss the "\r
+                + "flexibility that pure CSS and HTML can offer.<br /><br />"\r
+                + "CssLayout is a simple layout that places its contained "\r
+                + "components into a <code>DIV</code> element. It has a "\r
+                + "simple DOM structure and it leaves all the power to the "\r
+                + "CSS designer's hands. While having a very narrow feature "\r
+                + "set, CssLayout is the fastest layout to render in Vaadin.";\r
     }\r
 \r
     @Override\r

diff --git a/src/com/vaadin/demo/sampler/features/layouts/CssLayoutsExample.java b/src/com/vaadin/demo/sampler/features/layouts/CssLayoutsExample.java
index 1e1bffbedc41b32365eb189c943a190e6edbfe4f..1184357ab52412f9eda7bd3a7e76f92cae083ec9 100644 (file)
--- a/src/com/vaadin/demo/sampler/features/layouts/CssLayoutsExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/CssLayoutsExample.java
@@ -34,7 +34,6 @@ public class CssLayoutsExample extends VerticalLayout {
                         + "of the layout (and centered unless I'm in IE6)");\r
         bottomCenter.setSizeUndefined(); // disable 100% default width\r
         bottomCenter.setStyleName("footer");\r
-        // bottomCenter.setWidth("50px");\r
 \r
         CssLayout cssLayout = new CssLayout() {\r
             int brickCounter = 0;\r
@@ -45,8 +44,8 @@ public class CssLayoutsExample extends VerticalLayout {
                 if (c instanceof Brick) {\r
                     brickCounter++;\r
                     if (brickCounter % 3 == 0) {\r
-                        // make every third brick colored and bold\r
-                        return "color: #ff6611; font-weight:bold;";\r
+                        // make every third brick colored and italic\r
+                        return "color: #ff6611; font-style: italic;";\r
                     }\r
                 }\r
                 return null;\r
@@ -71,7 +70,7 @@ public class CssLayoutsExample extends VerticalLayout {
     static class Brick extends Label {\r
         public Brick() {\r
             super("Brick");\r
-            // disable 100% that label has by default\r
+            // disable 100% width that label has by default\r
             setSizeUndefined();\r
             setStyleName("brick");\r
         }\r

diff --git a/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
index 2c28c887eaf5ec095cc1d5bac60173a822628fa3..337134f45712530b43e05708b86c591320704dd6 100644 (file)
--- a/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
@@ -12,7 +12,7 @@ public class LayoutAlignment extends Feature {
 
     @Override
     public String getName() {
-        return "Component Alignment";
+        return "Component alignment";
     }
 
     @Override

diff --git a/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
index 422a861add8fc72f16fdcf83d7877af726c45d0b..ced7dde671613d7816502b3f129db66ae5ea98be 100644 (file)
--- a/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
@@ -12,7 +12,7 @@ public class LayoutSpacing extends Feature {
 
     @Override
     public String getName() {
-        return "Layout Spacing";
+        return "Layout spacing";
     }
 
     @Override