From: Marc Englund <marc.englund@itmill.com>
Date: Fri, 12 Sep 2008 09:13:53 +0000 (+0000)
Subject: Fixed style/layout issues. For #2017 but needs backport to 5.2
X-Git-Tag: 6.7.0.beta1~4173
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9ced8f13e5dedf17fe69a4dd249ebb1ed05f68cc;p=vaadin-framework.git

Fixed style/layout issues. For #2017 but needs backport to 5.2

svn changeset:5392/svn branch:trunk
---

diff --git a/WebContent/ITMILL/themes/reservr/styles.css b/WebContent/ITMILL/themes/reservr/styles.css
index 1e42ba4295..29cb8ab8d6 100644
--- a/WebContent/ITMILL/themes/reservr/styles.css
+++ b/WebContent/ITMILL/themes/reservr/styles.css
@@ -1,54 +1,33 @@
 @import url(../default/styles.css);
 
 /* Reservr styles */
-body {
+#Reservr {
 	background-color: #E9ECED;
 	background-image: url(bmw.jpg);
 	background-repeat: no-repeat;
 	background-position: top right;
-	margin: 0;
-}
-
-#Reservr {
-	background-color: transparent;
 }
 
-#header {
-	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
-	padding: 10px;
-}
-
-#logo {
-	line-height: 43px;
+#Reservr .i-label-logo {
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	padding-left: 13px;
+	padding-bottom: 10px;
 	color: #F14C1A;
 	font-size: 22px;
 	letter-spacing: -0.03em;
-}
-
-#slogan {
-	color: #464F52;
-	font-style: italic;
-	font-size: 12px;
-}
-
-/* Default widgetset overrides */
-.i-label,.i-caption {
-	min-height: 1em;
-}
-
-.i-datefield-entrycalendar-hours {
-	height: 250px;
-	overflow: auto;
-}
-
-.i-datefield-calendarpanel {
-	width: 20em;
+}
+#Reservr .i-label-slogan {
+	color: black;
+	padding-left: 15px;
+	padding-bottom: 10px;
+	font-style: italic;	
 }
 
 .i-caption {
 	color: #F14C1A;
 	font-size: 16px;
-}
+}
+
 
 .i-label-arrow {
 	line-height: 160px;
@@ -58,20 +37,6 @@ body {
 	margin: 0 20px 0 12px;
 }
 
-textarea.i-textfield {
-	font-size: 13px;
-	width: 320px;
-	height: 110px;
-	margin-right: 30px;
-}
-
-.i-button-link {
-	border: 0px;
-	text-align: left;
-	text-decoration: none;
-	background: none;
-}
-
 .i-button-important-link {
 	border: 0px;
 	text-align: left;
@@ -88,12 +53,3 @@ textarea.i-textfield {
 	font-weight: bold;
 	color: #fff;
 }
-
-.i-orderedlayout {
-	margin: 0px;
-	padding: 0px;
-}
-
-.i-orderedlayout td {
-	vertical-align: top;
-}
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
index 07cd81a77d..b385fbf9ad 100644
--- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
+++ b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
@@ -60,9 +60,16 @@ public class ReservationApplication extends Application {
         final Window mainWindow = new Window("Reservr ");
         setMainWindow(mainWindow);
         setTheme("reservr");
-
         mainWindow.getLayout().setWidth("100%");
 
+        Label logo = new Label("Reservr");
+        logo.setStyleName("logo");
+        mainWindow.addComponent(logo);
+
+        Label slogan = new Label("Representational vehicles on-the-road");
+        slogan.setStyleName("slogan");
+        mainWindow.addComponent(slogan);
+
         final TabSheet mainTabs = new TabSheet();
         mainWindow.addComponent(mainTabs);