Merge remote-tracking branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
	src/com/vaadin/ui/TabSheet.java

3 files changed, 5 insertions, 1 deletions

diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 892b2958a4..d369cd99f0 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -13,6 +13,9 @@
 	width: 100%;
 	overflow:hidden;
 }
+.v-tabsheet-tabitemcell:focus {
+	outline: none;
+}
 .v-tabsheet-tabitemcell,
 .v-tabsheet-spacertd {
 	margin: 0;
diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.css
index ea56b14f98..2bc52bc844 100644
--- a/WebContent/VAADIN/themes/chameleon/components/table/table.css
+++ b/WebContent/VAADIN/themes/chameleon/components/table/table.css
@@ -43,7 +43,7 @@ div.v-table-focus-slot-left {
     }
 
 .v-table tr.v-selected {
-	background-image: url(/vaadin-demo-site/VAADIN/themes/chameleon/img/grad-light-top2.png);
+	background-image: url(../../img/grad-light-top2.png);
 	background-position: 0 -1px;
 	}
 
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css
index bfbed67f93..9b78d86e34 100644
--- a/WebContent/VAADIN/themes/reindeer/table/table.css
+++ b/WebContent/VAADIN/themes/reindeer/table/table.css
@@ -149,6 +149,7 @@
 }
 .v-table-header-drag {
 	padding-left: 6px;
+	height: 16px;
 }
 .v-table-header-drag img {
 	height: 16px;