From c07f421ef34f9aa54de383dec59144046cb81cdc Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Mon, 18 Jun 2007 08:22:20 +0000
Subject: [PATCH] Panel styles now work without captions as well. Default font
 size increased to 11px (68.75%).

svn changeset:1758/svn branch:trunk
---
 .../terminal/gwt/client/ui/IPanel.java        | 15 ++++----
 .../component-themes/common/css/common.css    |  4 +--
 .../component-themes/panel/css/panel.css      | 34 +++++++++++++++----
 .../textfield/css/textfield.css               |  2 +-
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
index 4f323efcc2..1207676b2a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
@@ -32,18 +32,21 @@ public class IPanel extends FlowPanel implements Paintable {
 		this.client = client;
 		this.id = uidl.getId();
 		
-		if(uidl.hasAttribute("caption"))
-			caption.setText(uidl.getStringAttribute("caption"));
-		else
-			caption.setText("");
+		clear();
 		
 		if(uidl.hasAttribute("style"))
 			setStyleName(CLASSNAME + " " + CLASSNAME+"-"+uidl.getStringAttribute("style"));
 		else
 			setStyleName(CLASSNAME);
 		
-		clear();
-		add(caption);
+		// Handle caption displaying
+		if(uidl.hasAttribute("caption") && !uidl.getStringAttribute("caption").equals("")) {
+			caption.setText(uidl.getStringAttribute("caption"));
+			add(caption);
+		} else if(uidl.hasAttribute("style")) {
+				// Theme needs this to work around different paddings
+				addStyleName(CLASSNAME+"-nocaption");
+		}
 		
 		UIDL layoutUidl = uidl.getChildUIDL(0);
 		Widget layout = client.getWidget(layoutUidl);
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css
index 5d8424dca9..f5bb1096ec 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/common/css/common.css
@@ -2,13 +2,13 @@ body {
 	background: #fafafc url(../img/window-bg.png) repeat-x;
 	font-family: helvetica, verdana, tahoma, arial, sans-serif;
 	color: #222;
-	font-size: 62.5%;
+	font-size: 68.75%;
 	line-height: 1.4em;
 }
 
 input, select, textarea, button {
 	font-family: helvetica, verdana, tahoma, arial, sans-serif;
-	font-size: 1.1em;
+	font-size: 1em;
 }
 
 select {
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css
index 286a3746cc..b42af09d32 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/panel/css/panel.css
@@ -11,7 +11,7 @@
 	overflow: hidden;
 	background: transparent url(../img/top-right.png) no-repeat right top;
 	content: url(../img/top-left.png);
-	margin: -6px -6px 0 -6px;
+	margin: -6px -6px 3px -6px;
 }
 
 .i-panel:after {
@@ -24,10 +24,10 @@
 }
 
 .i-panel-caption {
-	font-size: 1.2em;
+	font-size: 1.1em;
 	font-weight: bold;
 	color: #1c3e6e;
-	margin: 3px 0 5px 0;
+	margin: 0 0 7px 0;
 }
 
 
@@ -45,10 +45,19 @@
 
 .i-panel-strong .i-panel-caption {
 	color: #fff;
-	margin: -22px 0 12px 0;
+	margin: -25px 0 12px 0;
 	white-space: nowrap;
 }
 
+/* Strong style without caption */
+.i-panel-strong.i-panel-nocaption {
+	background-image: url(../img/top-bg.png);
+}
+.i-panel-strong.i-panel-nocaption:before {
+	height: 7px;
+	background-image: url(../img/top-right.png);
+	content: url(../img/top-left.png);
+}
 
 
 /* Light style */
@@ -56,7 +65,7 @@
 	background-image: url(../img/top-bg-light.png);
 	border-color: #b3c2d6;
 	border-top-color: #2667a2;
-	margin-top: 23px;
+	margin-top: 20px;
 }
 
 .i-panel-light:before {
@@ -71,11 +80,16 @@
 }
 
 .i-panel-light .i-panel-caption {
-	margin: -23px -5px 18px -5px;
-	font-size: 1.1em;
+	margin: -26px -5px 18px -5px;
+	font-size: 1em;
 	white-space: nowrap;
 }
 
+/* Light style without caption */
+.i-panel-light.i-panel-nocaption {
+	margin-top: 5px;
+}
+
 
 
 
@@ -86,6 +100,11 @@
 	background-position: 0 1px;
 }
 
+* html .i-panel .i-panel-caption,
+*+html .i-panel .i-panel-caption {
+	margin-top: 3px;
+}
+
 * html .i-panel-strong .i-panel-caption,
 *+html .i-panel-strong .i-panel-caption {
 	margin: 1px 0 10px 0;
@@ -93,6 +112,7 @@
 
 * html .i-panel-light .i-panel-caption,
 *+html .i-panel-light .i-panel-caption {
+	margin-top: -23px;
 	margin-bottom: 0;
 	padding-bottom: 23px; /* Must specify enough space because of wierd clipping bug */
 }
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css
index 45f2b8dde3..84ef27e2f3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/component-themes/textfield/css/textfield.css
@@ -1,5 +1,5 @@
 .i-textfield{
-	font-size: 1.2em;
+	font-size: 1.1em;
 	color: #444;
 	background: #fff url(../img/bg.png) repeat-x;
 	padding: 2px;
-- 
2.39.5