summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2014-08-07 16:32:23 +0300
committerJohn Ahlroos <john@vaadin.com>2014-08-07 16:35:06 +0300
commitecff9648d1cb3d5cc4bd54d2b1e1c6357429792f (patch)
treeb21f4b599183c157900b0f24d41c94e6af3b08a7 /WebContent/VAADIN/themes
parente5230e6a2433f5c8a74c66b73e96d0454866d316 (diff)
parentff47bdd97b03a42dfc812b4dc9ad71fa45ce3827 (diff)
downloadvaadin-framework-ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f.tar.gz
vaadin-framework-ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f.zip
Merge remote-tracking branch 'origin/master' into grid
Conflicts: WebContent/release-notes.html Change-Id: Ie05bea7142134a7a9d655fcdf6ca232fd13c742b
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/base/notification/notification.scss2
-rw-r--r--WebContent/VAADIN/themes/chameleon/components/notification/notification.scss2
-rw-r--r--WebContent/VAADIN/themes/tests-valo-blueprint/_variables.scss (renamed from WebContent/VAADIN/themes/tests-valo/_blueprint.scss)0
-rw-r--r--WebContent/VAADIN/themes/tests-valo-blueprint/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/tests-valo-dark/_variables.scss (renamed from WebContent/VAADIN/themes/tests-valo/_dark.scss)0
-rw-r--r--WebContent/VAADIN/themes/tests-valo-dark/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/tests-valo-facebook/_variables.scss (renamed from WebContent/VAADIN/themes/tests-valo/_facebook.scss)0
-rw-r--r--WebContent/VAADIN/themes/tests-valo-facebook/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/tests-valo-flat/_variables.scss (renamed from WebContent/VAADIN/themes/tests-valo/_flat.scss)0
-rw-r--r--WebContent/VAADIN/themes/tests-valo-flat/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/tests-valo-flatdark/_variables.scss (renamed from WebContent/VAADIN/themes/tests-valo/_flat-dark.scss)0
-rw-r--r--WebContent/VAADIN/themes/tests-valo-flatdark/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/tests-valo-metro/_variables.scss (renamed from WebContent/VAADIN/themes/tests-valo/_metro.scss)0
-rw-r--r--WebContent/VAADIN/themes/tests-valo-metro/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/tests-valo/_valotest.scss118
-rw-r--r--WebContent/VAADIN/themes/tests-valo/_variables.scss (renamed from WebContent/VAADIN/themes/tests-valo/_default.scss)0
-rw-r--r--WebContent/VAADIN/themes/tests-valo/styles.scss128
-rw-r--r--WebContent/VAADIN/themes/valo/components/_button.scss5
-rw-r--r--WebContent/VAADIN/themes/valo/components/_dragwrapper.scss3
-rw-r--r--WebContent/VAADIN/themes/valo/components/_tree.scss7
-rw-r--r--WebContent/VAADIN/themes/valo/components/_upload.scss11
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eotbin19544 -> 19544 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttfbin38452 -> 38452 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woffbin22432 -> 22432 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eotbin20133 -> 20133 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttfbin39076 -> 39076 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woffbin23048 -> 23048 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eotbin20855 -> 20855 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttfbin42024 -> 42024 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woffbin23764 -> 23764 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eotbin21576 -> 21576 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttfbin43420 -> 43420 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woffbin24568 -> 24568 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eotbin20265 -> 20265 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttfbin38412 -> 38412 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woffbin23188 -> 23188 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eotbin19514 -> 19514 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttfbin37336 -> 37336 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woffbin22248 -> 22248 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eotbin20535 -> 20535 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttfbin39956 -> 39956 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woffbin23400 -> 23400 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eotbin19836 -> 19836 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttfbin38232 -> 38232 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woffbin22660 -> 22660 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eotbin20028 -> 20028 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttfbin39476 -> 39476 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woffbin22908 -> 22908 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eotbin20962 -> 20962 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttfbin40252 -> 40252 bytes
-rwxr-xr-x[-rw-r--r--]WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woffbin23764 -> 23764 bytes
51 files changed, 181 insertions, 131 deletions
diff --git a/WebContent/VAADIN/themes/base/notification/notification.scss b/WebContent/VAADIN/themes/base/notification/notification.scss
index 0fc7801777..a91e26947d 100644
--- a/WebContent/VAADIN/themes/base/notification/notification.scss
+++ b/WebContent/VAADIN/themes/base/notification/notification.scss
@@ -33,8 +33,6 @@
}
.#{$primaryStyleName}-system {
background-color: red;
- opacity: .7;
- filter: alpha(opacity=70);
}
.#{$primaryStyleName}-system h1 {
display: block;
diff --git a/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss b/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss
index 783e4bcc1f..85fbb3295f 100644
--- a/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss
@@ -8,6 +8,8 @@ div.#{$primaryStyleName} {
-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.7);
-moz-box-shadow: 0 2px 5px rgba(0,0,0,.7);
box-shadow: 0 2px 5px rgba(0,0,0,.7);
+ //IE8 does not support rgba, using just rgb
+ background:rgb(255,255,255) url(../img/grad-light-top.png) repeat-x;
background:rgba(255,255,255,.90) url(../img/grad-light-top.png) repeat-x;
}
diff --git a/WebContent/VAADIN/themes/tests-valo/_blueprint.scss b/WebContent/VAADIN/themes/tests-valo-blueprint/_variables.scss
index 696da0b69e..696da0b69e 100644
--- a/WebContent/VAADIN/themes/tests-valo/_blueprint.scss
+++ b/WebContent/VAADIN/themes/tests-valo-blueprint/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-blueprint/styles.scss b/WebContent/VAADIN/themes/tests-valo-blueprint/styles.scss
new file mode 100644
index 0000000000..9433f4eba6
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-blueprint/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-blueprint {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/tests-valo/_dark.scss b/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss
index 21bcd00ae9..21bcd00ae9 100644
--- a/WebContent/VAADIN/themes/tests-valo/_dark.scss
+++ b/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-dark/styles.scss b/WebContent/VAADIN/themes/tests-valo-dark/styles.scss
new file mode 100644
index 0000000000..13f98ae418
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-dark/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-dark {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/tests-valo/_facebook.scss b/WebContent/VAADIN/themes/tests-valo-facebook/_variables.scss
index 5b83aae4ca..5b83aae4ca 100644
--- a/WebContent/VAADIN/themes/tests-valo/_facebook.scss
+++ b/WebContent/VAADIN/themes/tests-valo-facebook/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-facebook/styles.scss b/WebContent/VAADIN/themes/tests-valo-facebook/styles.scss
new file mode 100644
index 0000000000..7b784627b2
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-facebook/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-facebook {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/tests-valo/_flat.scss b/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss
index 5d2b8abbb7..5d2b8abbb7 100644
--- a/WebContent/VAADIN/themes/tests-valo/_flat.scss
+++ b/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-flat/styles.scss b/WebContent/VAADIN/themes/tests-valo-flat/styles.scss
new file mode 100644
index 0000000000..7b981de04a
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-flat/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-flat {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/tests-valo/_flat-dark.scss b/WebContent/VAADIN/themes/tests-valo-flatdark/_variables.scss
index f68f9c266d..f68f9c266d 100644
--- a/WebContent/VAADIN/themes/tests-valo/_flat-dark.scss
+++ b/WebContent/VAADIN/themes/tests-valo-flatdark/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-flatdark/styles.scss b/WebContent/VAADIN/themes/tests-valo-flatdark/styles.scss
new file mode 100644
index 0000000000..d0871fcba2
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-flatdark/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-flatdark {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/tests-valo/_metro.scss b/WebContent/VAADIN/themes/tests-valo-metro/_variables.scss
index f11cdb8b64..f11cdb8b64 100644
--- a/WebContent/VAADIN/themes/tests-valo/_metro.scss
+++ b/WebContent/VAADIN/themes/tests-valo-metro/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-metro/styles.scss b/WebContent/VAADIN/themes/tests-valo-metro/styles.scss
new file mode 100644
index 0000000000..51b3427a12
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-metro/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-metro {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/tests-valo/_valotest.scss b/WebContent/VAADIN/themes/tests-valo/_valotest.scss
new file mode 100644
index 0000000000..f775938e13
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo/_valotest.scss
@@ -0,0 +1,118 @@
+@mixin valotest {
+ @include valo;
+
+ .valo-menu .v-checkbox {
+ margin: round($v-unit-size/2);
+ font-weight: 400;
+ }
+
+ $color1: hsl(220, 5%, 38%);
+ $color2: #5d73c0;
+ $color3: #3dbc1a;
+ $color4: #d2f4f3;
+ $color5: #fe902a;
+ $colors: $color1, $color2, $color3, $color4, $color5;
+
+ .v-textfield-color1 {
+ @include valo-textfield-style($background-color: $color1);
+ }
+
+ .v-textfield-color2 {
+ @include valo-textfield-style($background-color: $color3);
+ }
+
+ .v-textfield-color3 {
+ @include valo-textfield-style($background-color: $color4);
+ }
+
+
+ .v-textarea-color1 {
+ @include valo-textarea-style($background-color: $color1);
+ }
+
+ .v-textarea-color2 {
+ @include valo-textarea-style($background-color: $color3);
+ }
+
+ .v-textarea-color3 {
+ @include valo-textarea-style($background-color: $color4);
+ }
+
+
+ .v-datefield-color1 {
+ @include valo-datefield-style($background-color: $color1);
+ }
+
+ .v-datefield-color2 {
+ @include valo-datefield-style($background-color: $color3);
+ }
+
+ .v-datefield-color3 {
+ @include valo-datefield-style($background-color: $color4);
+ }
+
+
+ .v-filterselect-color1 {
+ @include valo-combobox-style($background-color: $color1);
+ }
+
+ .v-filterselect-color2 {
+ @include valo-combobox-style($background-color: $color3);
+ }
+
+ .v-filterselect-color3 {
+ @include valo-combobox-style($background-color: $color4);
+ }
+
+
+ $copy: $v-selection-color;
+ $v-selection-color: white;
+ .v-checkbox-color1 {
+ @include valo-checkbox-style($background-color: $color1);
+ }
+
+ .v-checkbox-color2 {
+ @include valo-checkbox-style($background-color: $color2);
+ }
+ $v-selection-color: $copy;
+
+
+ .v-slider-color1 {
+ @include valo-slider-handle-style($background-color: $color1);
+ }
+
+ .v-slider-color2 {
+ @include valo-slider-track-style($background-color: $color3);
+ }
+
+ .v-slider-color3 {
+ @include valo-slider-indicator-style($background-color: #dcdc1e);
+ }
+
+
+ .v-panel-caption-color1 {
+ @include valo-panel-caption-style($background-color: $color1);
+ }
+
+ .v-panel-caption-color2 {
+ @include valo-panel-caption-style($background-color: $color3);
+ }
+
+ .v-panel-caption-color3 {
+ @include valo-panel-caption-style($background-color: $color5);
+ }
+
+ // Show splitpanel borders
+ .v-splitpanel-vertical,
+ .v-splitpanel-horizontal {
+ outline: 1px dotted rgba(gray, .2);
+ }
+
+ .v-slider-ticks {
+ @include valo-slider-ticks($tick-count: 5);
+ }
+
+ .v-accordion-item-color1 .v-accordion-item-caption {
+ @include valo-accordion-item-caption-style($background-color: $color2);
+ }
+} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/tests-valo/_default.scss b/WebContent/VAADIN/themes/tests-valo/_variables.scss
index c227156e2e..c227156e2e 100644
--- a/WebContent/VAADIN/themes/tests-valo/_default.scss
+++ b/WebContent/VAADIN/themes/tests-valo/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo/styles.scss b/WebContent/VAADIN/themes/tests-valo/styles.scss
index 89fc5755f4..1ba0b29b04 100644
--- a/WebContent/VAADIN/themes/tests-valo/styles.scss
+++ b/WebContent/VAADIN/themes/tests-valo/styles.scss
@@ -1,127 +1,5 @@
-@import "default";
-// @import "flat";
-// @import "flat-dark";
-// @import "facebook";
-// @import "metro";
-// @import "dark";
-// @import "blueprint";
-
-
+@import "variables";
+@import "valotest";
.tests-valo {
- @include valo;
-
- .valo-menu .v-checkbox {
- margin: round($v-unit-size/2);
- font-weight: 400;
- }
-
- $color1: hsl(220, 5%, 38%);
- $color2: #5d73c0;
- $color3: #3dbc1a;
- $color4: #d2f4f3;
- $color5: #fe902a;
- $colors: $color1, $color2, $color3, $color4, $color5;
-
- .v-textfield-color1 {
- @include valo-textfield-style($background-color: $color1);
- }
-
- .v-textfield-color2 {
- @include valo-textfield-style($background-color: $color3);
- }
-
- .v-textfield-color3 {
- @include valo-textfield-style($background-color: $color4);
- }
-
-
- .v-textarea-color1 {
- @include valo-textarea-style($background-color: $color1);
- }
-
- .v-textarea-color2 {
- @include valo-textarea-style($background-color: $color3);
- }
-
- .v-textarea-color3 {
- @include valo-textarea-style($background-color: $color4);
- }
-
-
- .v-datefield-color1 {
- @include valo-datefield-style($background-color: $color1);
- }
-
- .v-datefield-color2 {
- @include valo-datefield-style($background-color: $color3);
- }
-
- .v-datefield-color3 {
- @include valo-datefield-style($background-color: $color4);
- }
-
-
- .v-filterselect-color1 {
- @include valo-combobox-style($background-color: $color1);
- }
-
- .v-filterselect-color2 {
- @include valo-combobox-style($background-color: $color3);
- }
-
- .v-filterselect-color3 {
- @include valo-combobox-style($background-color: $color4);
- }
-
-
- $copy: $v-selection-color;
- $v-selection-color: white;
- .v-checkbox-color1 {
- @include valo-checkbox-style($background-color: $color1);
- }
-
- .v-checkbox-color2 {
- @include valo-checkbox-style($background-color: $color2);
- }
- $v-selection-color: $copy;
-
-
- .v-slider-color1 {
- @include valo-slider-handle-style($background-color: $color1);
- }
-
- .v-slider-color2 {
- @include valo-slider-track-style($background-color: $color3);
- }
-
- .v-slider-color3 {
- @include valo-slider-indicator-style($background-color: #dcdc1e);
- }
-
-
- .v-panel-caption-color1 {
- @include valo-panel-caption-style($background-color: $color1);
- }
-
- .v-panel-caption-color2 {
- @include valo-panel-caption-style($background-color: $color3);
- }
-
- .v-panel-caption-color3 {
- @include valo-panel-caption-style($background-color: $color5);
- }
-
- // Show splitpanel borders
- .v-splitpanel-vertical,
- .v-splitpanel-horizontal {
- outline: 1px dotted rgba(gray, .2);
- }
-
- .v-slider-ticks {
- @include valo-slider-ticks($tick-count: 5);
- }
-
- .v-accordion-item-color1 .v-accordion-item-caption {
- @include valo-accordion-item-caption-style($background-color: $color2);
- }
+ @include valotest;
}
diff --git a/WebContent/VAADIN/themes/valo/components/_button.scss b/WebContent/VAADIN/themes/valo/components/_button.scss
index cea1c9fbc8..4930742dad 100644
--- a/WebContent/VAADIN/themes/valo/components/_button.scss
+++ b/WebContent/VAADIN/themes/valo/components/_button.scss
@@ -241,6 +241,11 @@
.#{$primary-stylename}-wrap {
visibility: visible;
}
+
+ .#{$primary-stylename}-caption {
+ // For IE8
+ display: inline-block;
+ }
}
diff --git a/WebContent/VAADIN/themes/valo/components/_dragwrapper.scss b/WebContent/VAADIN/themes/valo/components/_dragwrapper.scss
index 7f1be69553..6527e42ed7 100644
--- a/WebContent/VAADIN/themes/valo/components/_dragwrapper.scss
+++ b/WebContent/VAADIN/themes/valo/components/_dragwrapper.scss
@@ -7,7 +7,8 @@
}
.#{$primary-stylename}.v-active-drag-source {
- visibility: hidden;
+ // This breaks file upload dragging (for some reason the ddwrapper gets this class when an active file drag is over it)
+ // visibility: hidden;
}
.#{$primary-stylename} {
diff --git a/WebContent/VAADIN/themes/valo/components/_tree.scss b/WebContent/VAADIN/themes/valo/components/_tree.scss
index 9ac2f7e43d..1327320cd4 100644
--- a/WebContent/VAADIN/themes/valo/components/_tree.scss
+++ b/WebContent/VAADIN/themes/valo/components/_tree.scss
@@ -116,11 +116,12 @@ $v-tree-expand-animation-enabled: false !default;
&:after {
content: "";
- display: inline-block;
+ display: block;
vertical-align: top;
position: absolute;
z-index: 1;
left: 0;
+ margin-top: -$v-tree-row-height;
width: 100%;
height: $v-tree-row-height;
border-radius: $v-border-radius;
@@ -153,8 +154,8 @@ $v-tree-expand-animation-enabled: false !default;
@include valo-tree-expanded-icon-style(true);
}
- .#{$primary-stylename}-node-leaf > .#{$primary-stylename}-node-caption > div:before,
- .v-ie8 & .#{$primary-stylename}-node-leaf:before {
+ .#{$primary-stylename}-node-leaf:before,
+ .#{$primary-stylename}-node-leaf > .#{$primary-stylename}-node-caption > div:before {
visibility: hidden;
}
diff --git a/WebContent/VAADIN/themes/valo/components/_upload.scss b/WebContent/VAADIN/themes/valo/components/_upload.scss
index 103c21b6fe..c54227c704 100644
--- a/WebContent/VAADIN/themes/valo/components/_upload.scss
+++ b/WebContent/VAADIN/themes/valo/components/_upload.scss
@@ -2,4 +2,15 @@
.#{$primary-stylename} .v-button {
@include valo-widget-style;
}
+
+ .#{$primary-stylename}-immediate input[type="file"] {
+ @include opacity(0);
+ z-index: 2;
+ position: absolute;
+ right: 0;
+ height: $v-unit-size;
+ text-align: right;
+ border: none;
+ background: transparent;
+ }
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot
index 5d20d91633..5d20d91633 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf
index 2109c958e3..2109c958e3 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff
index 1205787b0e..1205787b0e 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot
index 1f639a15ff..1f639a15ff 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf
index 242d6b25c3..242d6b25c3 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff
index ed760c0628..ed760c0628 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot
index 1e29ad5954..1e29ad5954 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf
index 6b9118ee35..6b9118ee35 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff
index a7b99d2552..a7b99d2552 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot
index 77184af422..77184af422 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf
index 26a07e9392..26a07e9392 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff
index 45395d1bbe..45395d1bbe 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot
index 0c8a0ae06e..0c8a0ae06e 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf
index 12d25d9a73..12d25d9a73 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff
index ff652e6435..ff652e6435 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot
index 14868406aa..14868406aa 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf
index 63af664cde..63af664cde 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff
index e786074813..e786074813 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot
index 8f445929ff..8f445929ff 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf
index 01dda2858a..01dda2858a 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff
index 43e8b9e6cc..43e8b9e6cc 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot
index 6bbc3cf58c..6bbc3cf58c 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf
index c537f8382a..c537f8382a 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff
index e231183dce..e231183dce 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot
index d8375dd0ab..d8375dd0ab 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf
index b3290843a7..b3290843a7 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff
index 28d6adee03..28d6adee03 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot
index 0ab1db22e6..0ab1db22e6 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf
index d2d6318f66..d2d6318f66 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf
Binary files differ
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff
index d4dfca402e..d4dfca402e 100644..100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff
+++ b/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff
Binary files differ