Changes padding for Textfields with Chameleon theme. (#12974)

Change-Id: Iefccedce67cb04cf3ceb8128cb07c871fc940ab8

3 files changed, 82 insertions, 1 deletions

diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
index 7c5c72c1df..3962ba9ccd 100644
--- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
@@ -20,7 +20,7 @@ textarea.v-textarea,
 input.#{$primaryStyleName}[type="text"],
 textarea.v-textarea,
 .v-filterselect {
-	padding: .2em;
+	padding: .1em;
 	}
 
 input.#{$primaryStyleName}[type="text"] {
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
new file mode 100644
index 0000000000..2a9df42ba1
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.tests.components.textfield;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+
+@SuppressWarnings("serial")
+@Theme("chameleon")
+public class TextFieldTruncatesUnderscoresInModalDialogs extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        final Window dialog = new Window();
+
+        FormLayout formLayout = new FormLayout();
+        formLayout.setSpacing(true);
+
+        formLayout.addComponent(new Button("Disappear",
+                new Button.ClickListener() {
+
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        event.getButton().setVisible(false);
+                    }
+                }));
+
+        formLayout.addComponent(new TextField(null, "____pqjgy____"));
+
+        dialog.setContent(formLayout);
+
+        getUI().addWindow(dialog);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Text field must not truncate underscores in modal dialogs.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12974;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
new file mode 100644
index 0000000000..66b0df5ff4
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
@@ -0,0 +1,16 @@
+package com.vaadin.tests.components.textfield;
+
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TextFieldTruncatesUnderscoresInModalDialogsTest extends
+        MultiBrowserTest {
+
+    @Test
+    public void testWindowRepositioning() throws Exception {
+        openTestURL();
+
+        compareScreen("TextFieldTruncatesUnderscoresInModalDialogs");
+    }
+}