diff options
| author | Manolo Carrasco <manolo@vaadin.com> | 2017-07-26 19:50:50 +0200 |
|---|---|---|
| committer | Manolo Carrasco <manolo@vaadin.com> | 2017-07-26 19:50:50 +0200 |
| commit | 47fdcb5ab7e825f66229b12a109df5e42a963614 (patch) | |
| tree | fb21e33cf2ade4b80afa27de4036ea7b431b398c | |
| parent | 89820eb39ae6a91afada1dae1d188049c5e3c1e6 (diff) | |
| download | vaadin-core-47fdcb5ab7e825f66229b12a109df5e42a963614.tar.gz vaadin-core-47fdcb5ab7e825f66229b12a109df5e42a963614.zip | |
masterOverrides needs resolutions to fix vaadin elements conflicts
| -rw-r--r-- | bower.json | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -64,6 +64,15 @@ "vaadin-text-field": "vaadin/vaadin-text-field#master", "vaadin-themes": "vaadin/vaadin-themes#master", "vaadin-upload": "vaadin/vaadin-upload#master" + }, + "resolutions": { + "iron-flex-layout": "^2.0.0", + "iron-icon": "2.0.0", + "iron-iconset-svg": "^2.0.0", + "iron-meta": "1 - 2", + "iron-form": "^2.0.0", + "vaadin-button": "master", + "vaadin-text-field": "master" } }, "resolutions": { |