summaryrefslogtreecommitdiffstats
path: root/WebContent/ITMILL
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2009-02-13 14:45:55 +0000
committerMarc Englund <marc.englund@itmill.com>2009-02-13 14:45:55 +0000
commit65ef36ddd98f142a7fc3c0a12b42cc52eb084dda (patch)
treeb93bd29da5d7bcb21ce888c513e4e74a6034a5b7 /WebContent/ITMILL
parente1730af509e5e60688af74ccff2ab219aa61e3d4 (diff)
downloadvaadin-framework-65ef36ddd98f142a7fc3c0a12b42cc52eb084dda.tar.gz
vaadin-framework-65ef36ddd98f142a7fc3c0a12b42cc52eb084dda.zip
Sampler Layouts -section changes. Not complete yet.
svn changeset:6837/svn branch:trunk
Diffstat (limited to 'WebContent/ITMILL')
-rw-r--r--WebContent/ITMILL/themes/sampler/layouts/gridexample.css13
-rw-r--r--WebContent/ITMILL/themes/sampler/layouts/marginexample.css9
-rw-r--r--WebContent/ITMILL/themes/sampler/layouts/spacingexample.css4
-rw-r--r--WebContent/ITMILL/themes/sampler/layouts/styles.css23
-rw-r--r--WebContent/ITMILL/themes/sampler/styles.css8
5 files changed, 32 insertions, 25 deletions
diff --git a/WebContent/ITMILL/themes/sampler/layouts/gridexample.css b/WebContent/ITMILL/themes/sampler/layouts/gridexample.css
new file mode 100644
index 0000000000..5bb9df9ffd
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/layouts/gridexample.css
@@ -0,0 +1,13 @@
+.i-gridlayout-gridexample .i-gridlayout-spacing-on {
+ /* adjust spacing size */
+ padding: 1px;
+}
+
+/* visualize the grid cells */
+.i-gridlayout-gridexample div {
+ background-color: #fff;
+}
+
+.i-gridlayout-gridexample div div div {
+ background-color: #eee;
+} \ No newline at end of file
diff --git a/WebContent/ITMILL/themes/sampler/layouts/marginexample.css b/WebContent/ITMILL/themes/sampler/layouts/marginexample.css
new file mode 100644
index 0000000000..bcf13b5732
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/layouts/marginexample.css
@@ -0,0 +1,9 @@
+.i-verticallayout-marginexample .i-verticallayout-margin-right {
+ /* increase the right margin */
+ padding-right: 100px;
+}
+
+.i-verticallayout-marginexample {
+ /* background for the layout, for clarity */
+ background-color: #ccc;
+} \ No newline at end of file
diff --git a/WebContent/ITMILL/themes/sampler/layouts/spacingexample.css b/WebContent/ITMILL/themes/sampler/layouts/spacingexample.css
new file mode 100644
index 0000000000..8447c89f44
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/layouts/spacingexample.css
@@ -0,0 +1,4 @@
+.i-gridlayout-spacingexample {
+ /* background for the layout, for clarity */
+ background-color: #ccc;
+} \ No newline at end of file
diff --git a/WebContent/ITMILL/themes/sampler/layouts/styles.css b/WebContent/ITMILL/themes/sampler/layouts/styles.css
deleted file mode 100644
index b56cdb9d1e..0000000000
--- a/WebContent/ITMILL/themes/sampler/layouts/styles.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/****************************************************************************
- * sampler/layouts/styles.css
- *
- * Styles for the layout examples in Sampler.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Layout alignment example
- ****************************************************************************/
-
-.i-gridlayout-example-alignment {
- background: blue;
-}
-
-.i-gridlayout-example-alignment .i-gridlayout-margin {
- padding: 3px;
-}
-
-div.i-gridlayout-example-alignment > div.i-gridlayout-margin > div > div {
- padding: 3px;
- background: yellow;
-}
diff --git a/WebContent/ITMILL/themes/sampler/styles.css b/WebContent/ITMILL/themes/sampler/styles.css
index f49de71bda..bcd1cfab44 100644
--- a/WebContent/ITMILL/themes/sampler/styles.css
+++ b/WebContent/ITMILL/themes/sampler/styles.css
@@ -6,6 +6,10 @@
@import url(prominentprimaryaction/styles.css);
-@import url(layouts/styles.css);
+@import url(layouts/marginexample.css);
-@import url(table/styles.css);
+@import url(layouts/spacingexample.css);
+
+@import url(layouts/gridexample.css);
+
+@import url(table/styles.css); \ No newline at end of file