From 55841c374c2e10e92428037fcdd713acc1908c03 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Tue, 2 Oct 2012 12:34:28 +0300 Subject: Remove default bootstrap parameter support (#9824) Also remove the code that used to set the pathInfo parameter which is never used. Change-Id: I0ec7cc8453766bccf9527bfcf5e78411364da5f0 --- WebContent/VAADIN/vaadinBootstrap.js | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'WebContent/VAADIN') 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; }; -- cgit v1.2.3 From 54ed7cf6f2cdb193503f8d7b403fa3cbaa384f46 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Wed, 3 Oct 2012 09:11:54 +0300 Subject: Fixed combobox line heights in Chameleon theme #9838 Change-Id: I2193f9304b378084bdd9f0e750e049af5af5e0ec --- WebContent/VAADIN/themes/chameleon/components/selects/selects.scss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'WebContent/VAADIN') 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; -- cgit v1.2.3