From a9a7a79e0f4611be13a2e5eb0a152601831c8b7c Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 1 Feb 2010 08:52:51 +0000 Subject: Merged code changes from 6.2 svn changeset:11069/svn branch:6.3 --- WebContent/VAADIN/themes/base/button/button.css | 6 +++++- WebContent/VAADIN/themes/base/styles.css | 6 +++++- .../VAADIN/themes/reindeer/button/button-link-style.css | 5 +++++ WebContent/VAADIN/themes/reindeer/styles.css | 15 ++++++++++++--- WebContent/VAADIN/themes/runo/styles.css | 6 +++++- 5 files changed, 32 insertions(+), 6 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css index aacc05bbb7..9d4bec0fe4 100644 --- a/WebContent/VAADIN/themes/base/button/button.css +++ b/WebContent/VAADIN/themes/base/button/button.css @@ -23,7 +23,11 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - } +} + +.v-button.v-disabled { + cursor: default; +} .v-ie6 .v-button { display: inline; diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index f1840c6bf2..28d412536e 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -59,7 +59,11 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - } +} + +.v-button.v-disabled { + cursor: default; +} .v-ie6 .v-button { display: inline; diff --git a/WebContent/VAADIN/themes/reindeer/button/button-link-style.css b/WebContent/VAADIN/themes/reindeer/button/button-link-style.css index 14530c8dff..f4ba80b3cd 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-link-style.css +++ b/WebContent/VAADIN/themes/reindeer/button/button-link-style.css @@ -14,6 +14,11 @@ cursor: pointer; line-height: inherit; } + +.v-button.v-button-link.v-disabled, +.v-button.v-button-link.v-disabled .v-button-wrap { + cursor: default; + } .v-button-link .v-button-caption, .v-nativebutton-link .v-nativebutton-caption { diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index afb15e49a8..c4d29c78ce 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1,5 +1,5 @@ -.v-theme-version:after {content:"6_2_0_dev-20091229";} -.v-theme-version-6_2_0_dev-20091229 {display: none;} +.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";} +.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;} /* Automatically compiled css file from subdirectories. */ .v-absolutelayout-wrapper { @@ -59,7 +59,11 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - } +} + +.v-button.v-disabled { + cursor: default; +} .v-ie6 .v-button { display: inline; @@ -2177,6 +2181,11 @@ div.v-window-header { cursor: pointer; line-height: inherit; } + +.v-button.v-button-link.v-disabled, +.v-button.v-button-link.v-disabled .v-button-wrap { + cursor: default; + } .v-button-link .v-button-caption, .v-nativebutton-link .v-nativebutton-caption { diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 06bce5dfa9..7e14ce6d40 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -59,7 +59,11 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; - } +} + +.v-button.v-disabled { + cursor: default; +} .v-ie6 .v-button { display: inline; -- cgit v1.2.3 From 05c3c650e2b78dc17256b5237c8a9f14eb13a554 Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Wed, 10 Feb 2010 11:07:01 +0000 Subject: Merged changes from 6.2 branch. svn changeset:11245/svn branch:6.3 --- .../VAADIN/themes/base/datefield/datefield.css | 3 ++ WebContent/VAADIN/themes/base/styles.css | 3 ++ .../vaadin/terminal/gwt/client/ui/VEmbedded.java | 11 +++++-- .../terminal/gwt/client/ui/VNativeButton.java | 36 ++++++++++++++-------- 4 files changed, 38 insertions(+), 15 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 720a80716f..fd2730bf24 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -51,6 +51,9 @@ .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 28d412536e..af82ec079d 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -528,6 +528,9 @@ div.v-app-loading { .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java index 7d69e5682a..ffd09dab2c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java @@ -140,6 +140,7 @@ public class VEmbedded extends HTML implements Paintable { parameters.put("movie", getSrc(uidl, client)); } + // Add the parameters to the Object for (String name : parameters.keySet()) { html += ""; + + width + "\" height=\"" + height + "\" "; - html += ""; + // Add the parameters to the Embed + for (String name : parameters.keySet()) { + html += escapeAttribute(name) + "=\"" + + escapeAttribute(parameters.get(name)) + "\" "; + } + + html += ">"; setHTML(html); } else if (mime.equals("image/svg+xml")) { String data; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java index e544e1f9ce..ef7e183698 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java @@ -19,7 +19,7 @@ import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VTooltip; -public class VNativeButton extends Button implements Paintable { +public class VNativeButton extends Button implements Paintable, ClickHandler { public static final String CLASSNAME = "v-nativebutton"; @@ -48,18 +48,8 @@ public class VNativeButton extends Button implements Paintable { getElement().appendChild(captionElement); captionElement.setClassName(getStyleName() + "-caption"); - addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - if (id == null || client == null) { - return; - } - if (BrowserInfo.get().isSafari()) { - VNativeButton.this.setFocus(true); - } - client.updateVariable(id, "state", true, true); - clickPending = false; - } - }); + addClickHandler(this); + sinkEvents(VTooltip.TOOLTIP_EVENTS); sinkEvents(Event.ONMOUSEDOWN); sinkEvents(Event.ONMOUSEUP); @@ -179,4 +169,24 @@ public class VNativeButton extends Button implements Paintable { } } + /* + * (non-Javadoc) + * + * @see + * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event + * .dom.client.ClickEvent) + */ + public void onClick(ClickEvent event) { + if (id == null || client == null) { + return; + } + + if (BrowserInfo.get().isSafari()) { + VNativeButton.this.setFocus(true); + } + + client.updateVariable(id, "state", true, true); + clickPending = false; + } + } -- cgit v1.2.3 From 4f26b843bac9d97720ab0a9743e704741335cbc6 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 10 Feb 2010 12:37:35 +0000 Subject: Changed base theme layout margins and spacings from ems to pixels (reduce layout calculations, no conversion needed in the browser). svn changeset:11248/svn branch:6.3 --- WebContent/VAADIN/themes/base/csslayout/csslayout.css | 11 +++++------ WebContent/VAADIN/themes/base/formlayout/formlayout.css | 10 +++++----- WebContent/VAADIN/themes/base/gridlayout/gridlayout.css | 12 ++++++------ .../VAADIN/themes/base/orderedlayout/orderedlayout.css | 12 ++++++------ 4 files changed, 22 insertions(+), 23 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.css b/WebContent/VAADIN/themes/base/csslayout/csslayout.css index 12f1cd08fc..1f85d6f460 100644 --- a/WebContent/VAADIN/themes/base/csslayout/csslayout.css +++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.css @@ -1,16 +1,15 @@ .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; -} + padding-right: 12px; +} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.css b/WebContent/VAADIN/themes/base/formlayout/formlayout.css index 47ae45df52..9566ff1663 100644 --- a/WebContent/VAADIN/themes/base/formlayout/formlayout.css +++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.css @@ -15,7 +15,7 @@ .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -25,18 +25,18 @@ .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css index 039f080ac2..87cdcfd361 100644 --- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css +++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css @@ -1,18 +1,18 @@ .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css index 6dafa2d252..9f91669385 100644 --- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css +++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css @@ -1,28 +1,28 @@ .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, -- cgit v1.2.3 From 0a33c5aa1f51272661158fe3e52634432344e2c7 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 10 Feb 2010 12:50:01 +0000 Subject: Changed base theme layout margins and spacings from ems to pixels (reduce layout calculations, no conversion needed in the browser). svn changeset:11249/svn branch:6.3 --- WebContent/VAADIN/themes/base/styles.css | 43 +++++++++++++------------- WebContent/VAADIN/themes/reindeer/styles.css | 46 +++++++++++++++------------- WebContent/VAADIN/themes/runo/styles.css | 46 +++++++++++++++------------- 3 files changed, 69 insertions(+), 66 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index af82ec079d..92fea9cdf9 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -453,18 +453,17 @@ div.v-app-loading { .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-customcomponent { @@ -570,7 +569,7 @@ div.v-app-loading { .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -580,38 +579,38 @@ div.v-app-loading { .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; } .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, @@ -768,28 +767,28 @@ div.v-app-loading { .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index c4d29c78ce..7de56769d2 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -453,18 +453,17 @@ div.v-app-loading { .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-customcomponent { @@ -528,6 +527,9 @@ div.v-app-loading { .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { @@ -567,7 +569,7 @@ div.v-app-loading { .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -577,38 +579,38 @@ div.v-app-loading { .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; } .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, @@ -765,28 +767,28 @@ div.v-app-loading { .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 7e14ce6d40..5f27bce064 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -453,18 +453,17 @@ div.v-app-loading { .v-csslayout { overflow: hidden; } - .v-csslayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-csslayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-csslayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-csslayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-customcomponent { @@ -528,6 +527,9 @@ div.v-app-loading { .v-datefield-time .v-label { display: inline; } +.v-datefield-popup { + background: #fff; +} /* Disabled by default .v-datefield-error .v-textfield, .v-datefield-error .v-datefield-calendarpanel { @@ -567,7 +569,7 @@ div.v-app-loading { .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell, .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell { - padding-top: 1em; + padding-top: 6px; } .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell, @@ -577,38 +579,38 @@ div.v-app-loading { .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell, .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell { - padding-top: 2em; + padding-top: 12px; } .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell, .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell { - padding-bottom: 2em; + padding-bottom: 12px; } .v-formlayout-margin-left .v-formlayout-captioncell { - padding-left: 2em; + padding-left: 12px; } .v-formlayout-margin-right .v-formlayout-contentcell { - padding-right: 2em; + padding-right: 12px; } .v-formlayout-captioncell .v-caption .v-required-field-indicator { float: none; } .v-gridlayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-gridlayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-gridlayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-gridlayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-gridlayout-spacing-on { - padding-left: 1em; - padding-top: 1em; + padding-left: 6px; + padding-top: 6px; overflow: hidden; } .v-gridlayout-spacing, @@ -765,28 +767,28 @@ div.v-app-loading { .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { - padding-top: 2em; + padding-top: 12px; } .v-orderedlayout-margin-right, .v-horizontallayout-margin-right, .v-verticallayout-margin-right { - padding-right: 2em; + padding-right: 12px; } .v-orderedlayout-margin-bottom, .v-horizontallayout-margin-bottom, .v-verticallayout-margin-bottom { - padding-bottom: 2em; + padding-bottom: 12px; } .v-orderedlayout-margin-left, .v-horizontallayout-margin-left, .v-verticallayout-margin-left { - padding-left: 2em; + padding-left: 12px; } .v-orderedlayout-spacing-on, .v-horizontallayout-spacing-on, .v-verticallayout-spacing-on { - padding-top: 1em; - padding-left: 1em; + padding-top: 6px; + padding-left: 6px; } /* This can be used to define spacing if spacing is off server side */ .v-orderedlayout-spacing-off, -- cgit v1.2.3 From dea99fd63f72d205292cdbcda7f70cc2b49be6fd Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Fri, 12 Feb 2010 12:28:53 +0000 Subject: Merged portlet mode and windowing changes from 6.2. For #4143 svn changeset:11297/svn branch:6.3 --- WebContent/WEB-INF/portlet.xml | 167 +++++++++------------ .../gwt/server/AbstractApplicationPortlet.java | 85 +++-------- .../gwt/server/PortletCommunicationManager.java | 27 ---- 3 files changed, 92 insertions(+), 187 deletions(-) (limited to 'WebContent') diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index b1a6d4722d..bab08d4eb1 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -2,7 +2,7 @@ - + PortletDemoPortlet Vaadin PortletDemo @@ -120,7 +120,7 @@ user - + HelloWorldPortlet Hello World @@ -136,92 +136,75 @@ HelloWorld HelloWorld - + - + + Portlet Mode Example + Portlet Mode Example + com.vaadin.demo.portlet.PortletModePortlet + + widgetset + com.vaadin.portal.gwt.PortalDefaultWidgetSet + + + application + com.vaadin.demo.portlet.PortletModeExample + + text/html view + edit + help + config - Inter-portlet events (non-Vaadin) - Inter-portlet events (non-Vaadin) + PortletModeExample + PortletModeExample - - vaadin:Reply - - - vaadin:FromVaadin - - - vaadin:Hello - - - vaadin:ReplyToVaadin - - HelloState - --> - - Portlet Mode Example - Portlet Mode Example - com.vaadin.demo.portlet.PortletModePortlet - - widgetset - com.vaadin.portal.gwt.PortalDefaultWidgetSet - - - text/html - view - edit - help - config - - - PortletModeExample - PortletModeExample - - AddressBookPortlet @@ -238,9 +221,9 @@ Address Book Address Book - - - + + + SamplerPortlet Sampler @@ -260,9 +243,9 @@ Sampler Sampler - + - + CalcPortlet Calc @@ -274,7 +257,7 @@ widgetset com.vaadin.demo.sampler.gwt.SamplerWidgetSet - + text/html view @@ -282,8 +265,8 @@ Calc Calc - - + + ChatServletPortlet Vaadin ChatServlet @@ -361,23 +344,23 @@ user - + - - Custom mode - config - false - + + Custom mode + config + false + vaadin:Hello java.lang.String - - + + vaadin:Reply java.lang.String @@ -387,7 +370,7 @@ HelloState vaadin:HelloState - +