From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 15 Oct 2008 13:01:37 +0000 (+0000)
Subject: Still moving Sampler theme.
X-Git-Tag: 6.7.0.beta1~3988
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86c772edf37a22b0ed4c9f81ff3d0606821c27e1;p=vaadin-framework.git

Still moving Sampler theme.

svn changeset:5640/svn branch:trunk
---

diff --git a/WebContent/ITMILL/themes/example/layouts/sampler/featureview.html b/WebContent/ITMILL/themes/example/layouts/sampler/featureview.html
deleted file mode 100644
index 31937e0e67..0000000000
--- a/WebContent/ITMILL/themes/example/layouts/sampler/featureview.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<table width="100%" height="100%" cellpadding="0" cellspacing="0">
-	<tbody>
-		<tr valign="top">
-			<td class="feature-main">
-				<div class="feature-controls" location="feature-controls"></div>
-				<div class="feature-example" location="feature-example"></div>
-			</td>
-			<td width="350px" class="feature-info">
-				<div class="feature-name" location="feature-name"></div>
-				<div class="feature-desc" location="feature-desc"></div>
-				<div class="feature-res" location="feature-res"></div>
-				<div class="feature-api" location="feature-api"></div>
-				<div class="feature-rel" location="feature-rel"></div>
-			</td>
-	</tbody>
-</table>
\ No newline at end of file
diff --git a/WebContent/ITMILL/themes/example/styles.css b/WebContent/ITMILL/themes/example/styles.css
index 15bd621044..426cfade50 100644
--- a/WebContent/ITMILL/themes/example/styles.css
+++ b/WebContent/ITMILL/themes/example/styles.css
@@ -43,54 +43,3 @@
     text-align: right;
 }
 
-/******************************************************************************
- * For Sampler
- ******************************************************************************/
-#sampler {
-	background-color: white;
-}
-#sampler .i-expandlayout-topbar {
-	border-bottom: 1px solid #999;
-}
-#sampler .feature-main {
-	padding: 20px;
-}
-#sampler .feature-controls {
-	margin-bottom: 20px;
-}
-#sampler .feature-info {
-	background-color: #999;
-	color: white;
-	padding: 20px;
-	line-height: 30px;
-}
-#sampler .feature-name {
-	font-size: 18px;
-	font-weight: bold;
-}
-.i-customcomponent-ModeSwitch .i-button {
-	height: 28px;
-	border: none;
-	border-right: 1px solid #736a60;
-	margin: 0px;
-}
-.i-customcomponent-ModeSwitch .i-button-first-on {
-	background: transparent url(sampler/left-on.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-first {
-	background: transparent url(sampler/left.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-mid-on {
-	background: transparent url(sampler/mid-on.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-mid {
-	background: transparent url(sampler/mid.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-last-on {
-	border: none;
-	background: transparent url(sampler/right-on.gif) no-repeat right top;
-}
-.i-customcomponent-ModeSwitch .i-button-last {
-	border: none;
-	background: transparent url(sampler/right.gif) no-repeat right top;
-}
diff --git a/WebContent/ITMILL/themes/sampler/dummy/styles.css b/WebContent/ITMILL/themes/sampler/dummy/styles.css
new file mode 100644
index 0000000000..ac15844c18
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/dummy/styles.css
@@ -0,0 +1,4 @@
+/* Dummy styles for the DummyExample */
+.i-panel-DummyFeatureExample .i-label {
+	border: 1px dotted red;
+}
\ No newline at end of file
diff --git a/WebContent/ITMILL/themes/sampler/layouts/featureview.html b/WebContent/ITMILL/themes/sampler/layouts/featureview.html
new file mode 100644
index 0000000000..31937e0e67
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/layouts/featureview.html
@@ -0,0 +1,16 @@
+<table width="100%" height="100%" cellpadding="0" cellspacing="0">
+	<tbody>
+		<tr valign="top">
+			<td class="feature-main">
+				<div class="feature-controls" location="feature-controls"></div>
+				<div class="feature-example" location="feature-example"></div>
+			</td>
+			<td width="350px" class="feature-info">
+				<div class="feature-name" location="feature-name"></div>
+				<div class="feature-desc" location="feature-desc"></div>
+				<div class="feature-res" location="feature-res"></div>
+				<div class="feature-api" location="feature-api"></div>
+				<div class="feature-rel" location="feature-rel"></div>
+			</td>
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/WebContent/ITMILL/themes/sampler/sampler/styles.css b/WebContent/ITMILL/themes/sampler/sampler/styles.css
new file mode 100644
index 0000000000..56077af8cd
--- /dev/null
+++ b/WebContent/ITMILL/themes/sampler/sampler/styles.css
@@ -0,0 +1,51 @@
+/******************************************************************************
+ * Sampler styles
+ ******************************************************************************/
+#sampler {
+	background-color: white;
+}
+#sampler .i-expandlayout-topbar {
+	border-bottom: 1px solid #999;
+}
+#sampler .feature-main {
+	padding: 20px;
+}
+#sampler .feature-controls {
+	margin-bottom: 20px;
+}
+#sampler .feature-info {
+	background-color: #999;
+	color: white;
+	padding: 20px;
+	line-height: 30px;
+}
+#sampler .feature-name {
+	font-size: 18px;
+	font-weight: bold;
+}
+.i-customcomponent-ModeSwitch .i-button {
+	height: 28px;
+	border: none;
+	border-right: 1px solid #736a60;
+	margin: 0px;
+}
+.i-customcomponent-ModeSwitch .i-button-first-on {
+	background: transparent url(left-on.gif) no-repeat;
+}
+.i-customcomponent-ModeSwitch .i-button-first {
+	background: transparent url(left.gif) no-repeat;
+}
+.i-customcomponent-ModeSwitch .i-button-mid-on {
+	background: transparent url(mid-on.gif) no-repeat;
+}
+.i-customcomponent-ModeSwitch .i-button-mid {
+	background: transparent url(mid.gif) no-repeat;
+}
+.i-customcomponent-ModeSwitch .i-button-last-on {
+	border: none;
+	background: transparent url(right-on.gif) no-repeat right top;
+}
+.i-customcomponent-ModeSwitch .i-button-last {
+	border: none;
+	background: transparent url(right.gif) no-repeat right top;
+}
diff --git a/WebContent/ITMILL/themes/sampler/styles.css b/WebContent/ITMILL/themes/sampler/styles.css
index 0a20a0771f..cd0aed8820 100644
--- a/WebContent/ITMILL/themes/sampler/styles.css
+++ b/WebContent/ITMILL/themes/sampler/styles.css
@@ -1,55 +1,6 @@
 @import url(../default/styles.css);
 
+@import url(sampler/styles.css);
+
 @import url(dummy/styles.css);
 
-/******************************************************************************
- * For Sampler
- ******************************************************************************/
-#sampler {
-	background-color: white;
-}
-#sampler .i-expandlayout-topbar {
-	border-bottom: 1px solid #999;
-}
-#sampler .feature-main {
-	padding: 20px;
-}
-#sampler .feature-controls {
-	margin-bottom: 20px;
-}
-#sampler .feature-info {
-	background-color: #999;
-	color: white;
-	padding: 20px;
-	line-height: 30px;
-}
-#sampler .feature-name {
-	font-size: 18px;
-	font-weight: bold;
-}
-.i-customcomponent-ModeSwitch .i-button {
-	height: 28px;
-	border: none;
-	border-right: 1px solid #736a60;
-	margin: 0px;
-}
-.i-customcomponent-ModeSwitch .i-button-first-on {
-	background: transparent url(sampler/left-on.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-first {
-	background: transparent url(sampler/left.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-mid-on {
-	background: transparent url(sampler/mid-on.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-mid {
-	background: transparent url(sampler/mid.gif) no-repeat;
-}
-.i-customcomponent-ModeSwitch .i-button-last-on {
-	border: none;
-	background: transparent url(sampler/right-on.gif) no-repeat right top;
-}
-.i-customcomponent-ModeSwitch .i-button-last {
-	border: none;
-	background: transparent url(sampler/right.gif) no-repeat right top;
-}