diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-21 20:59:32 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-01-21 20:59:32 +0200 |
| commit | c410fa7e85e0769369cee2cebd2cea538919af2b (patch) | |
| tree | c7535bd48ae9c2b221a867e47f91515e1bbc2ffa /WebContent | |
| parent | 74976a7ffcdd4ea3c19e799d16bf5430c6975420 (diff) | |
| parent | f818f7cb44fc77db7252e97c78608ae6c67d6ab6 (diff) | |
| download | vaadin-framework-c410fa7e85e0769369cee2cebd2cea538919af2b.tar.gz vaadin-framework-c410fa7e85e0769369cee2cebd2cea538919af2b.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
client/src/com/vaadin/client/ui/VScrollTable.java
Change-Id: I79e003b2087e8e0e5c8aa6d25bdeb890ce9a60c5
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/tests-components/images/logo.png | bin | 0 -> 19532 bytes | |||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_upload.scss | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/tests-components/images/logo.png b/WebContent/VAADIN/themes/tests-components/images/logo.png Binary files differnew file mode 100644 index 0000000000..9990cd2f28 --- /dev/null +++ b/WebContent/VAADIN/themes/tests-components/images/logo.png diff --git a/WebContent/VAADIN/themes/valo/components/_upload.scss b/WebContent/VAADIN/themes/valo/components/_upload.scss index 07a51f03ef..1616e80563 100644 --- a/WebContent/VAADIN/themes/valo/components/_upload.scss +++ b/WebContent/VAADIN/themes/valo/components/_upload.scss @@ -16,7 +16,7 @@ .#{$primary-stylename}-immediate input[type="file"] { @include opacity(0); - z-index: 2; + z-index: -1; position: absolute; right: 0; height: $v-unit-size; |
