From 333a901f71f01a698b99882c203f410cd5c1312d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Thu, 12 Apr 2012 18:04:01 +0300 Subject: [PATCH] Rename v-paintable -> v-connector (#8652) --- WebContent/VAADIN/themes/base/paintable/paintable.css | 2 +- .../themes/chameleon/components/textfield/textfield.css | 2 +- WebContent/VAADIN/themes/reindeer/textfield/textfield.css | 8 ++++---- .../gwt/client/ui/AbstractComponentConnector.java | 2 +- src/com/vaadin/ui/LoginForm.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css index 1de0b70c38..36a3fe3455 100644 --- a/WebContent/VAADIN/themes/base/paintable/paintable.css +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -1,4 +1,4 @@ -.v-paintable { +.v-connector { box-sizing: border-box; -moz-box-sizing: border-box; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css index a7601bb649..74882fa693 100644 --- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css +++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css @@ -25,7 +25,7 @@ input.v-textfield[type="text"] { height: 1.2em; } -input.v-paintable.v-textfield[type="text"], +input.v-connector.v-textfield[type="text"], .v-filterselect { height: 1.6em; } diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index dce5dffba0..09c47dc8d4 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -35,8 +35,8 @@ .v-window textarea.v-textarea { padding: 3px 3px 4px; } -.v-app input.v-textfield.v-paintable, -.v-window input.v-textfield.v-paintable { +.v-app input.v-textfield.v-connector, +.v-window input.v-textfield.v-connector { height: 24px; } .v-app .v-textfield-focus, @@ -66,8 +66,8 @@ textarea.v-textarea-prompt { .v-app textarea.v-textarea-small { font-size: 11px; } -.v-app .v-table input.v-textfield.v-paintable, -.v-window .v-table input.v-textfield.v-paintable { +.v-app .v-table input.v-textfield.v-connector, +.v-window .v-table input.v-textfield.v-connector { padding: 1px 2px; height: auto; line-height: normal; diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java index f9b03f04fa..8ab5590700 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java @@ -238,7 +238,7 @@ public abstract class AbstractComponentConnector extends AbstractConnector StringBuffer styleBuf = new StringBuffer(); styleBuf.append(primaryStyleName); - styleBuf.append(" v-paintable"); + styleBuf.append(" v-connector"); // Uses connector methods to enable connectors to take hierarchy or // multiple state variables into account diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java index 69c373cc7c..1d5203bc6b 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/src/com/vaadin/ui/LoginForm.java @@ -158,11 +158,11 @@ public class LoginForm extends CustomComponent { + "
" + usernameCaption + "
" - + "
" + + "" + "
" + passwordCaption + "
" - + "
" + + "
" + "
" + loginButtonCaption + "
" + "") -- 2.39.5