#5517 related fixes to liferay theme

svn changeset:15092/svn branch:6.4

3 files changed, 60 insertions, 40 deletions

diff --git a/WebContent/VAADIN/themes/liferay/button/button.css b/WebContent/VAADIN/themes/liferay/button/button.css
index 7ba962d596..8181a041a0 100644
--- a/WebContent/VAADIN/themes/liferay/button/button.css
+++ b/WebContent/VAADIN/themes/liferay/button/button.css
@@ -2,21 +2,29 @@
 	outline: none;
 }
 
-.v-button:hover {
+.v-button:hover .v-button-wrap {
 	background: #b9ced9 url(/html/themes/classic/images/application/state_hover_bg.png) repeat-x 0 0;
 	border-color: #627782;
 	color: #369;
 }
 
-.v-button:active,
-.v-button.v-pressed,
-.v-button:focus {
+.v-button:active .v-button-wrap,
+.v-button.v-pressed .v-button-wrap,
+.v-button:focus .v-button-wrap {
 	background: #ebebeb url(/html/themes/classic/images/application/state_active_bg.png) repeat-x 0 0;
 	border-color: #555;
 }
 
-.v-button,
-.v-disabled.v-button  {
+.v-button {
+	padding: 0;
+	border: none;
+	height: 26px;
+	overflow: hidden;
+}
+
+
+.v-button .v-button-wrap,
+.v-disabled.v-button .v-button-wrap {
 	display: block;
 	font-size: 11px;
 	font-weight: bold;
@@ -34,25 +42,15 @@
 	min-height: 16px;
 	text-shadow: 1px 1px #fff;
 	color: #34404f;
-	overflow: hidden;
 	text-overflow: ellipsis;
-	height: 26px;
-}
-
-.v-button-wrap {
-	display: block;
-	height: 19px;
+	height: 20px;
 }
 
 .v-button-caption {
 	line-height: 16px;	
 }
 
-.v-ie6 .v-button {
-	height: 20px;
-}
 .v-ie6 .v-button .v-button-wrap {
-	height: 17px;
 	display: inline;
 	zoom: 1;
 }
@@ -73,7 +71,6 @@ button.v-nativebutton-link-pressed,
 .v-button.v-button-link .v-button-wrap,
 .v-button.v-button-link:focus .v-button-wrap,
 .v-button.v-button-link:active .v-button-wrap,
-.v-button-link.v-pressed .v-button-wrap,
 .v-disabled.v-button.v-button-link .v-button-wrap {
 	color: #5B677D;
 	font-weight: normal;
@@ -97,7 +94,7 @@ button.v-nativebutton-link-pressed,
 }
 
 .v-button-link:focus,
-.v-nativebutton-link:focus {
+.v-sa .v-button-link:focus {
 	outline: 1px dotted #1b699f;
 	outline-offset: -1px;
 }
diff --git a/WebContent/VAADIN/themes/liferay/select/select.css b/WebContent/VAADIN/themes/liferay/select/select.css
index 323c730d29..48e35f9baa 100644
--- a/WebContent/VAADIN/themes/liferay/select/select.css
+++ b/WebContent/VAADIN/themes/liferay/select/select.css
@@ -7,6 +7,10 @@ select {
 	background-color: #fff;	
 }
 
+.v-ie6 select { 
+	font-size: 1em;
+}
+
 .v-filterselect-button {
 	width: 24px;
 	height: 24px;
@@ -65,4 +69,13 @@ select {
 	color: #000;
 	background: #dfe8f6;
 	border-color: #a3bae9;
+}
+
+.v-filterselect-suggestmenu .gwt-MenuItem .v-icon {
+	float: left;
+}
+
+.v-select-twincol-buttons .v-button-wrap { 
+	padding-left: 11px;
+	padding-right: 11px;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 322976105b..5f4a338beb 100644
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_4_5_dev-20100920";}
-.v-theme-version-6_4_5_dev-20100920 {display: none;}
+.v-theme-version:after {content:"6_4_5_dev-20100921";}
+.v-theme-version-6_4_5_dev-20100921 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -2253,21 +2253,29 @@ div.v-window-header {
 	outline: none;
 }
 
-.v-button:hover {
+.v-button:hover .v-button-wrap {
 	background: #b9ced9 url(/html/themes/classic/images/application/state_hover_bg.png) repeat-x 0 0;
 	border-color: #627782;
 	color: #369;
 }
 
-.v-button:active,
-.v-button.v-pressed,
-.v-button:focus {
+.v-button:active .v-button-wrap,
+.v-button.v-pressed .v-button-wrap,
+.v-button:focus .v-button-wrap {
 	background: #ebebeb url(/html/themes/classic/images/application/state_active_bg.png) repeat-x 0 0;
 	border-color: #555;
 }
 
-.v-button,
-.v-disabled.v-button  {
+.v-button {
+	padding: 0;
+	border: none;
+	height: 26px;
+	overflow: hidden;
+}
+
+
+.v-button .v-button-wrap,
+.v-disabled.v-button .v-button-wrap {
 	display: block;
 	font-size: 11px;
 	font-weight: bold;
@@ -2285,25 +2293,15 @@ div.v-window-header {
 	min-height: 16px;
 	text-shadow: 1px 1px #fff;
 	color: #34404f;
-	overflow: hidden;
 	text-overflow: ellipsis;
-	height: 26px;
-}
-
-.v-button-wrap {
-	display: block;
-	height: 19px;
+	height: 20px;
 }
 
 .v-button-caption {
 	line-height: 16px;	
 }
 
-.v-ie6 .v-button {
-	height: 20px;
-}
 .v-ie6 .v-button .v-button-wrap {
-	height: 17px;
 	display: inline;
 	zoom: 1;
 }
@@ -2324,7 +2322,6 @@ button.v-nativebutton-link-pressed,
 .v-button.v-button-link .v-button-wrap,
 .v-button.v-button-link:focus .v-button-wrap,
 .v-button.v-button-link:active .v-button-wrap,
-.v-button-link.v-pressed .v-button-wrap,
 .v-disabled.v-button.v-button-link .v-button-wrap {
 	color: #5B677D;
 	font-weight: normal;
@@ -2348,7 +2345,7 @@ button.v-nativebutton-link-pressed,
 }
 
 .v-button-link:focus,
-.v-nativebutton-link:focus {
+.v-sa .v-button-link:focus {
 	outline: 1px dotted #1b699f;
 	outline-offset: -1px;
 }
@@ -2790,6 +2787,10 @@ select {
 	background-color: #fff;	
 }
 
+.v-ie6 select { 
+	font-size: 1em;
+}
+
 .v-filterselect-button {
 	width: 24px;
 	height: 24px;
@@ -2850,6 +2851,15 @@ select {
 	border-color: #a3bae9;
 }
 
+.v-filterselect-suggestmenu .gwt-MenuItem .v-icon {
+	float: left;
+}
+
+.v-select-twincol-buttons .v-button-wrap { 
+	padding-left: 11px;
+	padding-right: 11px;
+}
+
 .v-slider {
 	border: 1px solid #9e9e9e;
 	border-right: 1px solid #c8c9ca;