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 1e42ba42957fea2714d512c46c9e29b8474c8567..29cb8ab8d691bf28ab4983127a2c69ae37fd5252 100644 (file)
--- 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 */\r
-body {\r
+#Reservr {\r
        background-color: #E9ECED;\r
        background-image: url(bmw.jpg);\r
        background-repeat: no-repeat;\r
        background-position: top right;\r
-       margin: 0;\r
-}\r
-\r
-#Reservr {\r
-       background-color: transparent;\r
 }\r
 \r
-#header {\r
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;\r
-       padding: 10px;\r
-}\r
-\r
-#logo {\r
-       line-height: 43px;\r
+#Reservr .i-label-logo {
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+       padding-left: 13px;
+       padding-bottom: 10px;\r
        color: #F14C1A;\r
        font-size: 22px;\r
        letter-spacing: -0.03em;\r
-}\r
-\r
-#slogan {\r
-       color: #464F52;\r
-       font-style: italic;\r
-       font-size: 12px;\r
-}\r
-\r
-/* Default widgetset overrides */\r
-.i-label,.i-caption {\r
-       min-height: 1em;\r
-}\r
-\r
-.i-datefield-entrycalendar-hours {\r
-       height: 250px;\r
-       overflow: auto;\r
-}\r
-\r
-.i-datefield-calendarpanel {\r
-       width: 20em;\r
+}
+#Reservr .i-label-slogan {
+       color: black;
+       padding-left: 15px;
+       padding-bottom: 10px;
+       font-style: italic;     
 }\r
 \r
 .i-caption {\r
        color: #F14C1A;\r
        font-size: 16px;\r
-}\r
+}
+\r
 \r
 .i-label-arrow {\r
        line-height: 160px;\r
@@ -58,20 +37,6 @@ body {
        margin: 0 20px 0 12px;\r
 }\r
 \r
-textarea.i-textfield {\r
-       font-size: 13px;\r
-       width: 320px;\r
-       height: 110px;\r
-       margin-right: 30px;\r
-}\r
-\r
-.i-button-link {\r
-       border: 0px;\r
-       text-align: left;\r
-       text-decoration: none;\r
-       background: none;\r
-}\r
-\r
 .i-button-important-link {\r
        border: 0px;\r
        text-align: left;\r
@@ -88,12 +53,3 @@ textarea.i-textfield {
        font-weight: bold;\r
        color: #fff;\r
 }\r
-\r
-.i-orderedlayout {\r
-       margin: 0px;\r
-       padding: 0px;\r
-}\r
-\r
-.i-orderedlayout td {\r
-       vertical-align: top;\r
-}
\ 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 07cd81a77d3e974b80b6b6f3cdd679ca9812f4a4..b385fbf9ad109017c8ec58e43314e2f8024085de 100644 (file)
--- 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 ");\r
         setMainWindow(mainWindow);\r
         setTheme("reservr");\r
-\r
         mainWindow.getLayout().setWidth("100%");\r
 \r
+        Label logo = new Label("Reservr");\r
+        logo.setStyleName("logo");\r
+        mainWindow.addComponent(logo);\r
+\r
+        Label slogan = new Label("Representational vehicles on-the-road");\r
+        slogan.setStyleName("slogan");\r
+        mainWindow.addComponent(slogan);\r
+\r
         final TabSheet mainTabs = new TabSheet();\r
         mainWindow.addComponent(mainTabs);\r
 \r