Merge branch 'master' into sass

2 files changed, 3 insertions, 12 deletions

diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss
index 5e21ddff35..e5b41b3123 100644
--- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss
@@ -48,6 +48,9 @@ body input.v-filterselect-input[type=text] {
 .v-filterselect-suggestpopup {
 	margin-top: .4em;
 	}
+.v-filterselect-suggestmenu tr {
+    line-height:1.4em;
+}	
 
 body .v-filterselect-suggestpopup-small td {
 	font-size: .85em;
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index c6a7b7ed5d..fc1de31bc8 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -1,5 +1,4 @@
 (function() {
-	var defaults;
 	var apps = {};
 	var themesLoaded = {};
 	var widgetsets = {};
@@ -60,14 +59,6 @@
 	};
 	
 	window.vaadin = window.vaadin || {
-		setDefaults: function(d) {
-			if (defaults) {
-				log("Ignoring new defaults as defaults have already been loaded");
-				return;
-			}
-			log("Got defaults", d);
-			defaults = d;
-		},
 		initApplication: function(appId, config) {
 			if (apps[appId]) {
 				throw "Application " + appId + " already initialized";
@@ -83,9 +74,6 @@
 			
 			var getConfig = function(name) {
 				var value = config[name];
-				if (value === undefined) {
-					value = defaults[name];
-				}
 				return value;
 			};