Merge remote-tracking branch 'origin/master' into grid

Change-Id: Ic6b667ea6ceff43a609ce2037f656c6274871fb7

2 files changed, 20 insertions, 7 deletions

diff --git a/WebContent/VAADIN/themes/chameleon/common/common.scss b/WebContent/VAADIN/themes/chameleon/common/common.scss
index 7bee2f529c..82e0810bc2 100644
--- a/WebContent/VAADIN/themes/chameleon/common/common.scss
+++ b/WebContent/VAADIN/themes/chameleon/common/common.scss
@@ -34,7 +34,9 @@ $chameleon-line-height: 1.4;
 		}
 	
 	.v-sa & .v-tooltip {
-		outline: 1px solid rgba(0,0,0,.2);
+		outline-color: #000000; /* Fallback for browsers that does not support RGBA such as IE8 */
+		outline-color: rgba(0,0,0,.2);
+		outline: 1px solid;
 		-webkit-border-radius: 0;
 		-moz-border-radius: 0;
 		border: none;
@@ -92,6 +94,7 @@ $chameleon-line-height: 1.4;
 	.v-Notification,
 	.v-menubar-submenu {
 		border: 1px solid #adadad;
+		border-color: #000000; /* Fallback for browsers that does not support RGBA such as IE8 */
 		border-color: rgba(0,0,0,.4);
 		border-radius: 4px;
 		-webkit-border-radius: 4px;
@@ -104,8 +107,10 @@ $chameleon-line-height: 1.4;
 	.v-datefield-popup,
 	.v-contextmenu,
 	.v-menubar-submenu{
-    	background: rgba(232,232,232,.90) url(../img/grad-light-top.png) repeat-x;
-    	}
+		background: #e8e8e8; /* Fallback for browsers that does not support RGBA such as IE8 */
+		background: rgba(232,232,232,.90);
+		background-image: url(../img/grad-light-top.png) repeat-x;
+		}
 	.v-filterselect-suggestpopup,
 	.v-contextmenu,
 	.v-menubar-submenu {
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index ced077138f..53b213e110 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -18,13 +18,19 @@
     	log = console.log;
     }
 	
-	var loadTheme = function(url) {
+	var loadTheme = function(url, version) {
 		if(!themesLoaded[url]) {
-			log("loadTheme", url);
+			log("loadTheme", url, version);
+			
+			var href = url + '/styles.css';
+			if (version) {
+				href += '?v=' + version;
+			}
+			
 			var stylesheet = document.createElement('link');
 			stylesheet.setAttribute('rel', 'stylesheet');
 			stylesheet.setAttribute('type', 'text/css');
-			stylesheet.setAttribute('href', url + "/styles.css");
+			stylesheet.setAttribute('href', href);
 			document.getElementsByTagName('head')[0].appendChild(stylesheet);
 			themesLoaded[url] = true;
 		}		
@@ -200,8 +206,10 @@
 			var bootstrapApp = function(mayDefer) {
 				var vaadinDir = getConfig('vaadinDir');
 				
+				var versionInfo = getConfig('versionInfo');
+				
 				var themeUri = vaadinDir + 'themes/' + getConfig('theme');
-				loadTheme(themeUri);
+				loadTheme(themeUri, versionInfo && versionInfo['vaadinVersion']);
 				
 				var widgetset = getConfig('widgetset');
 				var widgetsetUrl = getConfig('widgetsetUrl');