diff options
author | Leif Åstrand <leif@vaadin.com> | 2013-05-17 16:14:27 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2013-05-17 16:14:27 +0300 |
commit | 73a50dbf002b381411a7c6ca1d6b4e59a93bbe0c (patch) | |
tree | 49dfcde7194cf82cc3e96519170decaf12051992 /WebContent | |
parent | 5a9303869ce6912afcb158f6b75b3202d77a40a1 (diff) | |
parent | 0c8edf1ff0502070d92dc6d8ef5af304d7570934 (diff) | |
download | vaadin-framework-73a50dbf002b381411a7c6ca1d6b4e59a93bbe0c.tar.gz vaadin-framework-73a50dbf002b381411a7c6ca1d6b4e59a93bbe0c.zip |
Merge changes from origin/7.0
1a6200e Merge #6880 test from 6.8; fix itself is not needed in Vaadin 7
67696f3 SQLContainer.indexOfId() also searches backwards (#11849, #10376)
611e5f9 Test for #11267 adapted from 6.8.
609acd1 Fixed table height rendering in Android 2.3 #11331
63dd611 Centers VOverlays in visual viewport on iOS, Android, fixes #11614
5a33d7d Test for #11775
0c8edf1 Avoid marking AbstractField dirty in primitive getters (#11201)
Change-Id: I7437e0b249c1a95372d6f349e9d6336fb85f08a4
Diffstat (limited to 'WebContent')
-rw-r--r-- | WebContent/VAADIN/themes/tests-tickets/styles.css | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css index c1dd89d6b8..b96fcbb23d 100644 --- a/WebContent/VAADIN/themes/tests-tickets/styles.css +++ b/WebContent/VAADIN/themes/tests-tickets/styles.css @@ -1,6 +1,17 @@ @import url(../runo/legacy-styles.css); -/* DO NOT ADD GENERIC RULES LIKE .v-table IN THIS FILE */ +/* DO NOT ADD GENERIC RULES LIKE .v-table IN THIS FILE */ +/* Instead prefix with e.g .v-app-<TestClass> or other unique selectors */ +/*****************************************************************************/ + +/*****************************************************************************/ +/* com.vaadin.tests.components.combobox.ComboBoxBorder */ +/*****************************************************************************/ +.v-slot-ComboBoxBorder .v-filterselect-error { + /* Ticket 11267 */ + border: 1px solid #FF0000 ; + height: 25px; /* runo: 23+2, reindeer: 24+2 */ +} /*****************************************************************************/ /* Ticket 1904 */ |