From 17c0f672543946e0c39b42c37cc5e1d43607e2b4 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Sat, 8 Sep 2012 11:21:57 +0300 Subject: Using HTML5 doctype --- server/src/com/vaadin/server/BootstrapHandler.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java index a4aac2b310..7103ca86ae 100644 --- a/server/src/com/vaadin/server/BootstrapHandler.java +++ b/server/src/com/vaadin/server/BootstrapHandler.java @@ -207,12 +207,9 @@ public abstract class BootstrapHandler implements RequestHandler { Document document = response.getDocument(); - DocumentType doctype = new DocumentType("html", - "-//W3C//DTD XHTML 1.0 Transitional//EN", - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", + DocumentType doctype = new DocumentType("html", "", "", document.baseUri()); document.child(0).before(doctype); - document.body().parent().attr("xmlns", "http://www.w3.org/1999/xhtml"); Element head = document.head(); head.appendElement("meta").attr("http-equiv", "Content-Type") -- cgit v1.2.3 From b5019ec6788de767ef965578b2ce3ba7fc612516 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Tue, 18 Sep 2012 14:24:09 +0300 Subject: Removed empty content: in css rules since they generate a empty line with html5 content type --- WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss | 2 +- WebContent/VAADIN/themes/base/layout/layout.scss | 3 +-- WebContent/VAADIN/themes/base/table/table.scss | 2 +- WebContent/VAADIN/themes/base/tree/tree.scss | 2 +- WebContent/VAADIN/themes/runo/panel/panel.scss | 2 +- WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss index 558b305742..9d60bf0618 100644 --- a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss +++ b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss @@ -110,7 +110,7 @@ .v-ddwrapper-over-left:before, .v-ddwrapper-over-right:before { display: block; - content: ""; + position: absolute; width: 6px; height: 6px; diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss index 04df35872e..1be2cfccd6 100644 --- a/WebContent/VAADIN/themes/base/layout/layout.scss +++ b/WebContent/VAADIN/themes/base/layout/layout.scss @@ -79,7 +79,6 @@ div.v-layout.v-horizontal.v-widget { /* Clear any floats inside the slot, to prevent unwanted collapsing */ .v-vertical > .v-slot:after { - content: ""; display: inline-block; clear: both; width: 0; @@ -114,7 +113,7 @@ div.v-layout.v-horizontal.v-widget { .v-align-bottom:before, .v-expand > .v-align-middle:before, .v-expand > .v-align-bottom:before { - content: ""; + display: inline-block; height: 100%; vertical-align: middle; diff --git a/WebContent/VAADIN/themes/base/table/table.scss b/WebContent/VAADIN/themes/base/table/table.scss index d521b5ebae..fd3c0af0e1 100644 --- a/WebContent/VAADIN/themes/base/table/table.scss +++ b/WebContent/VAADIN/themes/base/table/table.scss @@ -267,7 +267,7 @@ .v-table-row-drag-top .v-table-cell-content:first-child:before, .v-table-row-drag-bottom .v-table-cell-content:first-child:after { display: block; - content: ""; + position: absolute; width: 6px; height: 6px; diff --git a/WebContent/VAADIN/themes/base/tree/tree.scss b/WebContent/VAADIN/themes/base/tree/tree.scss index 0319bbe994..2e34053ad5 100644 --- a/WebContent/VAADIN/themes/base/tree/tree.scss +++ b/WebContent/VAADIN/themes/base/tree/tree.scss @@ -58,7 +58,7 @@ div.v-tree-node-leaf { .v-tree .v-tree-node-drag-bottom:after, .v-tree .v-tree-node-caption-drag-center:after { display: block; - content: ""; + position: absolute; width: 6px; height: 6px; diff --git a/WebContent/VAADIN/themes/runo/panel/panel.scss b/WebContent/VAADIN/themes/runo/panel/panel.scss index 5963f73434..3d6b00173b 100644 --- a/WebContent/VAADIN/themes/runo/panel/panel.scss +++ b/WebContent/VAADIN/themes/runo/panel/panel.scss @@ -38,7 +38,7 @@ } .v-panel-deco:before { display: block; - content: ""; + width: 9px; height: 9px; margin-left: -9px; diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss index 683eb35f4c..ec6bdd5b0f 100644 --- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss +++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss @@ -117,7 +117,7 @@ } .v-tabsheet-deco:before { display: block; - content: ""; + width: 9px; height: 9px; margin-left: -9px; -- cgit v1.2.3 From 834346b12fc04908dcfe486ea0d990d53b39e4cb Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Wed, 19 Sep 2012 09:24:56 +0300 Subject: Fixed issue where layouts with empty slots gets line height. #8294 --- WebContent/VAADIN/themes/base/layout/layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss index 1be2cfccd6..b1d7101812 100644 --- a/WebContent/VAADIN/themes/base/layout/layout.scss +++ b/WebContent/VAADIN/themes/base/layout/layout.scss @@ -55,6 +55,7 @@ TODO .v-vertical, .v-horizontal { display: inline-block; + line-height:0; } div.v-layout.v-horizontal.v-widget { -- cgit v1.2.3 From e61b319de7579ce13367d81c09b98ebced945566 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Wed, 19 Sep 2012 09:51:27 +0300 Subject: Trying again, this time making layouts block elements #8294 --- WebContent/VAADIN/themes/base/layout/layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss index b1d7101812..4adf6ceb3a 100644 --- a/WebContent/VAADIN/themes/base/layout/layout.scss +++ b/WebContent/VAADIN/themes/base/layout/layout.scss @@ -54,8 +54,7 @@ TODO .v-vertical, .v-horizontal { - display: inline-block; - line-height:0; + display: block; } div.v-layout.v-horizontal.v-widget { @@ -85,6 +84,7 @@ div.v-layout.v-horizontal.v-widget { width: 0; height: 0; overflow: hidden; + line-height:0; } .v-vertical > .v-slot, -- cgit v1.2.3 From 5fd0cda243e548448fe2b60e6693d626a7d9b734 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Wed, 19 Sep 2012 12:43:15 +0300 Subject: Fixed 1px jump in caption #8294 --- WebContent/VAADIN/themes/base/caption/caption.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/VAADIN/themes/base/caption/caption.scss b/WebContent/VAADIN/themes/base/caption/caption.scss index c6fd124ad6..3eb26e255c 100644 --- a/WebContent/VAADIN/themes/base/caption/caption.scss +++ b/WebContent/VAADIN/themes/base/caption/caption.scss @@ -18,7 +18,7 @@ .v-caption .v-captiontext { display: inline-block; overflow: hidden; - vertical-align: middle; + vertical-align: top; } .v-caption .v-required-field-indicator { display: inline-block; -- cgit v1.2.3 From 0b8b4c38e37f1f4da7db3410f8d34f6cb05a916a Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Thu, 20 Sep 2012 12:53:26 +0300 Subject: Fixed NativeButton 1px caption jump #8294 --- WebContent/VAADIN/themes/base/button/button.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss index ad4dce4978..0ee9c05a00 100644 --- a/WebContent/VAADIN/themes/base/button/button.scss +++ b/WebContent/VAADIN/themes/base/button/button.scss @@ -91,13 +91,14 @@ margin: 0; color: inherit; font: inherit; - line-height: normal; + line-height: normal; } .v-nativebutton .v-nativebutton-caption { vertical-align: middle; white-space: nowrap; font: inherit; color: inherit; + display:block; } .v-nativebutton .v-icon { -- cgit v1.2.3 From a24b78f25f29d2fb4e8fff472e0b8745ec8ee8b6 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Thu, 20 Sep 2012 14:44:27 +0300 Subject: Revert "Fixed NativeButton 1px caption jump #8294" --- WebContent/VAADIN/themes/base/button/button.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss index 0ee9c05a00..ad4dce4978 100644 --- a/WebContent/VAADIN/themes/base/button/button.scss +++ b/WebContent/VAADIN/themes/base/button/button.scss @@ -91,14 +91,13 @@ margin: 0; color: inherit; font: inherit; - line-height: normal; + line-height: normal; } .v-nativebutton .v-nativebutton-caption { vertical-align: middle; white-space: nowrap; font: inherit; color: inherit; - display:block; } .v-nativebutton .v-icon { -- cgit v1.2.3 From 96cfce02e4bd4fe2eb4f220aa0b63c27ed72a51f Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Thu, 20 Sep 2012 15:09:04 +0300 Subject: Fixed select row height changes #8294 --- WebContent/VAADIN/themes/base/select/select.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WebContent/VAADIN/themes/base/select/select.scss b/WebContent/VAADIN/themes/base/select/select.scss index d6ef6d3585..d2d9e8a663 100644 --- a/WebContent/VAADIN/themes/base/select/select.scss +++ b/WebContent/VAADIN/themes/base/select/select.scss @@ -98,6 +98,10 @@ .v-filterselect-suggestmenu table { border-collapse: collapse; border: none; + vertical-align:top; +} +.v-filterselect-suggestmenu tr{ + line-height:0; } .v-filterselect-suggestmenu .gwt-MenuItem { white-space: nowrap; -- cgit v1.2.3 From fcebeb089895068970465e97a9bb37d44d73f3c9 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Thu, 20 Sep 2012 15:54:41 +0300 Subject: Fixed empty space in LoginForm #8294 --- server/src/com/vaadin/ui/LoginForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java index 69778c4c07..1ff9045306 100644 --- a/server/src/com/vaadin/ui/LoginForm.java +++ b/server/src/com/vaadin/ui/LoginForm.java @@ -161,7 +161,7 @@ public class LoginForm extends CustomComponent { + "\">" + "
" + "" + + "border:0;margin:0;padding:0;display:block'>" + "
" + "
" + usernameCaption -- cgit v1.2.3 From 3552a52ca1c39dc79a669e44e1aadfa99e017f47 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Thu, 20 Sep 2012 16:10:55 +0300 Subject: Fixed panel caption height causing 1px jump #8294 --- WebContent/VAADIN/themes/base/panel/panel.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/VAADIN/themes/base/panel/panel.scss b/WebContent/VAADIN/themes/base/panel/panel.scss index 93d82cd615..202e75c226 100644 --- a/WebContent/VAADIN/themes/base/panel/panel.scss +++ b/WebContent/VAADIN/themes/base/panel/panel.scss @@ -21,6 +21,7 @@ } .v-panel-caption span { vertical-align: middle; + display: table-row; } .v-panel-caption { white-space: nowrap; -- cgit v1.2.3 From 2b38d8f8a727c8b5b718de8fecc942918f1de91e Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Fri, 21 Sep 2012 09:52:27 +0300 Subject: Restored table row heights #8294 --- WebContent/VAADIN/themes/reindeer/table/table.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/VAADIN/themes/reindeer/table/table.scss b/WebContent/VAADIN/themes/reindeer/table/table.scss index cb190e1f30..7f13e80d1c 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.scss +++ b/WebContent/VAADIN/themes/reindeer/table/table.scss @@ -99,8 +99,8 @@ vertical-align: top; } .v-table-cell-wrapper { - padding-top: 3px; - padding-bottom: 3px; + padding-top: 2px; + padding-bottom: 2px; } .v-table-row-odd { background: #eff0f1; -- cgit v1.2.3 From ad29c11f1f75205d13084d488e36975d23634c8a Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Fri, 21 Sep 2012 10:12:14 +0300 Subject: Revert "Restored table row heights #8294". --- WebContent/VAADIN/themes/reindeer/table/table.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/VAADIN/themes/reindeer/table/table.scss b/WebContent/VAADIN/themes/reindeer/table/table.scss index 7f13e80d1c..cb190e1f30 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.scss +++ b/WebContent/VAADIN/themes/reindeer/table/table.scss @@ -99,8 +99,8 @@ vertical-align: top; } .v-table-cell-wrapper { - padding-top: 2px; - padding-bottom: 2px; + padding-top: 3px; + padding-bottom: 3px; } .v-table-row-odd { background: #eff0f1; -- cgit v1.2.3 From bd576ade92607669fa7806fed18e90789027a80d Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Mon, 24 Sep 2012 09:00:50 +0300 Subject: Do not add an empty description label to test case if testcase description is null (generates an empty line with HTML5 doctype) #8294 --- uitest/src/com/vaadin/tests/components/TestBase.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/uitest/src/com/vaadin/tests/components/TestBase.java b/uitest/src/com/vaadin/tests/components/TestBase.java index 3260c52003..265c74df59 100644 --- a/uitest/src/com/vaadin/tests/components/TestBase.java +++ b/uitest/src/com/vaadin/tests/components/TestBase.java @@ -14,9 +14,11 @@ public abstract class TestBase extends AbstractTestCase { setMainWindow(window); window.getContent().setSizeFull(); - Label label = new Label(getDescription(), ContentMode.HTML); - label.setWidth("100%"); - window.getContent().addComponent(label); + if (getDescription() != null) { + Label label = new Label(getDescription(), ContentMode.HTML); + label.setWidth("100%"); + window.getContent().addComponent(label); + } layout = new VerticalLayout(); window.getContent().addComponent(layout); -- cgit v1.2.3 From ce0113c0122b631c080b75bf1fe6de0f6667b035 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Mon, 24 Sep 2012 11:47:48 +0300 Subject: Revert "Do not add an empty description label to test case if testcase" Brakes some tests depending on the DOM path. Reverting this and fixing the screenshots instead. #8294 This reverts commit bd576ade92607669fa7806fed18e90789027a80d. --- uitest/src/com/vaadin/tests/components/TestBase.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/uitest/src/com/vaadin/tests/components/TestBase.java b/uitest/src/com/vaadin/tests/components/TestBase.java index 265c74df59..3260c52003 100644 --- a/uitest/src/com/vaadin/tests/components/TestBase.java +++ b/uitest/src/com/vaadin/tests/components/TestBase.java @@ -14,11 +14,9 @@ public abstract class TestBase extends AbstractTestCase { setMainWindow(window); window.getContent().setSizeFull(); - if (getDescription() != null) { - Label label = new Label(getDescription(), ContentMode.HTML); - label.setWidth("100%"); - window.getContent().addComponent(label); - } + Label label = new Label(getDescription(), ContentMode.HTML); + label.setWidth("100%"); + window.getContent().addComponent(label); layout = new VerticalLayout(); window.getContent().addComponent(layout); -- cgit v1.2.3 From 6b79c529ec8dd7117377fcce4d350736d7a988cd Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Mon, 24 Sep 2012 13:14:04 +0300 Subject: Fixed different spacing height in IE and Opera #8294 --- WebContent/VAADIN/themes/reindeer/layouts/layouts.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss index fb47c100f8..1ba348d37b 100644 --- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss +++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss @@ -35,6 +35,11 @@ width: 6px; } +.v-ie .v-spacing, +.v-op .v-spacing { + height: 4px; +} + /* Blue background */ .v-verticallayout-blue, .v-horizontallayout-blue, -- cgit v1.2.3 From 410a4787830a6b58507217219cd20f8965aa2eff Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Mon, 24 Sep 2012 14:48:05 +0300 Subject: Revert "Fixed different spacing height in IE and Opera #8294". Was causing too many other tests to fail. --- WebContent/VAADIN/themes/reindeer/layouts/layouts.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss index 1ba348d37b..fb47c100f8 100644 --- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss +++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss @@ -35,11 +35,6 @@ width: 6px; } -.v-ie .v-spacing, -.v-op .v-spacing { - height: 4px; -} - /* Blue background */ .v-verticallayout-blue, .v-horizontallayout-blue, -- cgit v1.2.3