From 82c0df4475078b5d5fb8a9753c6dfc716d9cb25f Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Fri, 4 Sep 2009 06:53:38 +0000 Subject: [PATCH] Fixed button sizing calculation regression for Runo theme (moved box-sizing property from Reindeer to Base). svn changeset:8663/svn branch:6.1 --- WebContent/VAADIN/themes/base/button/button.css | 4 ++++ WebContent/VAADIN/themes/base/styles.css | 4 ++++ WebContent/VAADIN/themes/reindeer/button/standard.css | 4 ---- WebContent/VAADIN/themes/reindeer/styles.css | 8 ++++---- WebContent/VAADIN/themes/runo/styles.css | 4 ++++ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css index 9dbc5e8309..aacc05bbb7 100644 --- a/WebContent/VAADIN/themes/base/button/button.css +++ b/WebContent/VAADIN/themes/base/button/button.css @@ -19,6 +19,10 @@ -moz-user-select: none; -ie-user-select: none; user-select: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .v-ie6 .v-button { diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 8b0497272b..40e7d93e48 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -53,6 +53,10 @@ -moz-user-select: none; -ie-user-select: none; user-select: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .v-ie6 .v-button { diff --git a/WebContent/VAADIN/themes/reindeer/button/standard.css b/WebContent/VAADIN/themes/reindeer/button/standard.css index 5510f82295..becd20457d 100644 --- a/WebContent/VAADIN/themes/reindeer/button/standard.css +++ b/WebContent/VAADIN/themes/reindeer/button/standard.css @@ -29,10 +29,6 @@ background-image: url(img/left.png); /** sprite-ref: buttons */ border: none; cursor: default; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .v-button-wrap, diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 9d4c64a3a4..8f75bb11d4 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -53,6 +53,10 @@ -moz-user-select: none; -ie-user-select: none; user-select: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .v-ie6 .v-button { @@ -1779,10 +1783,6 @@ div.v-tree-node-leaf { background-position: left -104px; border: none; cursor: default; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .v-button-wrap, diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 20210d3c86..e147af60bf 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -53,6 +53,10 @@ -moz-user-select: none; -ie-user-select: none; user-select: none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .v-ie6 .v-button { -- 2.39.5