From 63dc030e321b05faf02248ca266a90dec2aff067 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Fri, 4 May 2012 13:13:11 +0000 Subject: Add new CSS class to the base theme enabling (touch) scrolling of the element (#8716 #8720 #8721 #8722 #8723 #8724 #8725) svn changeset:23677/svn branch:6.8 --- WebContent/VAADIN/themes/base/common/common.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'WebContent/VAADIN/themes') diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 27bc57dd00..adf84ac3b7 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -229,4 +229,9 @@ div.v-app-loading { opacity: 0.5; filter: alpha(opacity=50); cursor: default; +} + +.v-scrollable { + overflow: auto; + -webkit-overflow-scrolling: touch; } \ No newline at end of file -- cgit v1.2.3 From 239aad4885931b6e7913ca4c86409b7b6997642f Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Fri, 11 May 2012 14:04:26 +0000 Subject: #8763 Removed overflow: auto from v-panel-content, v-accordion-item-content, and v-view classes; use v-scrollable class in elements that should scroll instead svn changeset:23718/svn branch:6.8 --- WebContent/VAADIN/themes/base/accordion/accordion.css | 1 - WebContent/VAADIN/themes/base/common/common.css | 1 - WebContent/VAADIN/themes/base/panel/panel.css | 1 - 3 files changed, 3 deletions(-) (limited to 'WebContent/VAADIN/themes') diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.css b/WebContent/VAADIN/themes/base/accordion/accordion.css index 10c205ae24..ad762ee0ac 100644 --- a/WebContent/VAADIN/themes/base/accordion/accordion.css +++ b/WebContent/VAADIN/themes/base/accordion/accordion.css @@ -22,6 +22,5 @@ } .v-accordion-item-content { position: absolute; - overflow: auto; width: 100%; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index adf84ac3b7..f0b0f8e7be 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -29,7 +29,6 @@ div.v-app-loading { .v-view { height: 100%; width: 100%; - overflow: auto; /* avoid scrollbars with margins in root layout */ outline: none; margin-top: -1px; diff --git a/WebContent/VAADIN/themes/base/panel/panel.css b/WebContent/VAADIN/themes/base/panel/panel.css index 126d3da91c..74d7b67a35 100644 --- a/WebContent/VAADIN/themes/base/panel/panel.css +++ b/WebContent/VAADIN/themes/base/panel/panel.css @@ -29,7 +29,6 @@ overflow: hidden; } .v-panel-content { - overflow: auto; } .v-panel-deco { } \ No newline at end of file -- cgit v1.2.3 From e716b16b6162a90946a926eff3bfd2593f092b69 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Mon, 21 May 2012 12:26:20 +0000 Subject: Remove -webkit-overflow-scrolling from .v-scrollable for now - caused a weird iOS 5 bug in Accordion touch support (#8723 #8792) svn changeset:23770/svn branch:6.8 --- WebContent/VAADIN/themes/base/common/common.css | 1 - 1 file changed, 1 deletion(-) (limited to 'WebContent/VAADIN/themes') diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index f0b0f8e7be..8734aee63f 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -232,5 +232,4 @@ div.v-app-loading { .v-scrollable { overflow: auto; - -webkit-overflow-scrolling: touch; } \ No newline at end of file -- cgit v1.2.3 From 052feb7be25e3f18bd751877b306d8247098d7f3 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 15 May 2012 05:17:49 +0300 Subject: Fixed header height by taking padding into account (box sizing change) --- WebContent/VAADIN/themes/liferay/window/window.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebContent/VAADIN/themes') diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.css index 5ac7c02175..f034d7503f 100644 --- a/WebContent/VAADIN/themes/liferay/window/window.css +++ b/WebContent/VAADIN/themes/liferay/window/window.css @@ -11,7 +11,7 @@ } .v-window-outerheader { - height: 16px; + height: 38px; margin-left: 9px; padding: 10px 40px 12px 2px; background: transparent url(top-right.png) no-repeat right top; -- cgit v1.2.3 From cee6ead8b0fe6aae4c5a25ad562dfb5a62ecf435 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Fri, 15 Jun 2012 10:38:45 +0000 Subject: #8949 Make sure a drag image always has absolute position svn changeset:23944/svn branch:6.8 --- WebContent/VAADIN/themes/base/common/common.css | 9 +++-- .../draganddropwrapper/DragStartModes.java | 43 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java (limited to 'WebContent/VAADIN/themes') diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 8734aee63f..74ed21bd1a 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -224,10 +224,11 @@ div.v-app-loading { .v-drag-element { z-index: 60000; - position: absolute; - opacity: 0.5; - filter: alpha(opacity=50); - cursor: default; + /* override any other position: properties */ + position: absolute !important; + opacity: 0.5; + filter: alpha(opacity=50); + cursor: default; } .v-scrollable { diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java new file mode 100644 index 0000000000..9b2c03917c --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java @@ -0,0 +1,43 @@ +package com.vaadin.tests.components.draganddropwrapper; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.tests.util.TestUtils; +import com.vaadin.ui.Component; +import com.vaadin.ui.DragAndDropWrapper; +import com.vaadin.ui.DragAndDropWrapper.DragStartMode; +import com.vaadin.ui.Label; + +public class DragStartModes extends TestBase { + + @Override + protected void setup() { + + TestUtils.injectCSS(getMainWindow(), + ".v-ddwrapper { background: #ACF; }"); + + addComponent(makeWrapper(DragStartMode.NONE)); + addComponent(makeWrapper(DragStartMode.COMPONENT)); + addComponent(makeWrapper(DragStartMode.WRAPPER)); + addComponent(makeWrapper(DragStartMode.HTML5)); + } + + private Component makeWrapper(DragStartMode mode) { + Label label = new Label("Drag start mode: " + mode); + DragAndDropWrapper wrapper = new DragAndDropWrapper(label); + wrapper.setHTML5DataFlavor("Text", "HTML5!"); + wrapper.setDragStartMode(mode); + wrapper.setWidth("200px"); + return wrapper; + } + + @Override + protected String getDescription() { + return "Different drag start modes should show correct drag images"; + } + + @Override + protected Integer getTicketNumber() { + return 8949; + } + +} -- cgit v1.2.3