aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-11-28 11:42:54 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2014-11-28 11:43:26 +0200
commit4e1b181a699efcd083b14270145bd2e540a2f772 (patch)
tree52917ae7c5f0e97777be8133b6f3109d90a2f2d1 /WebContent
parentfbfca1e9fc7a77e02c4262f0dfbe7ff408633499 (diff)
parenta0f4c3dfb37b1e742b74a78d8133b1bb4a399052 (diff)
downloadvaadin-framework-4e1b181a699efcd083b14270145bd2e540a2f772.tar.gz
vaadin-framework-4e1b181a699efcd083b14270145bd2e540a2f772.zip
Merge remote-tracking branch 'origin/master' into grid
Change-Id: I1983d8a8c86caf75c4f5d32ee9367bbd6d58057c
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/tests-valo-disabled-animations/_variables.scss3
-rw-r--r--WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss3
-rw-r--r--WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss6
-rw-r--r--WebContent/VAADIN/themes/valo/components/_table.scss61
-rw-r--r--WebContent/VAADIN/themes/valo/components/_textfield.scss2
-rw-r--r--WebContent/VAADIN/themes/valo/components/_valo-menu.scss3
-rw-r--r--WebContent/VAADIN/themes/valo/components/_window.scss11
8 files changed, 53 insertions, 42 deletions
diff --git a/WebContent/VAADIN/themes/tests-valo-disabled-animations/_variables.scss b/WebContent/VAADIN/themes/tests-valo-disabled-animations/_variables.scss
new file mode 100644
index 0000000000..d2411c675c
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-disabled-animations/_variables.scss
@@ -0,0 +1,3 @@
+$v-animations-enabled: false;
+
+@import "../valo/valo";
diff --git a/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss b/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss
new file mode 100644
index 0000000000..b941c1b3d1
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-disabled-animations {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss
new file mode 100644
index 0000000000..b1b215a40c
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss
@@ -0,0 +1,3 @@
+$v-bevel: false;
+
+@import "../valo/valo";
diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss
new file mode 100644
index 0000000000..96a3ca63b6
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss
@@ -0,0 +1,6 @@
+@import "variables";
+@import "../tests-valo/valotest";
+
+.tests-valo-textfield-bevel {
+ @include valotest;
+}
diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss
index a70532ccfd..019d8673ce 100644
--- a/WebContent/VAADIN/themes/valo/components/_table.scss
+++ b/WebContent/VAADIN/themes/valo/components/_table.scss
@@ -238,6 +238,7 @@ $v-table-background-color: null !default;
border-left: $v-table-border-width solid $border-color;
overflow: hidden;
height: $v-table-row-height;
+ vertical-align: middle;
&:first-child {
border-left: none;
@@ -520,46 +521,28 @@ $v-table-background-color: null !default;
}
}
- .#{$primary-stylename}-row-drag-middle td:first-child:before {
- content: "";
- display: block;
- position: absolute;
- z-index: 1;
- height: $v-table-row-height + $v-table-border-width;
- left: 0;
- right: 0;
- background: $v-focus-color;
- @include opacity(.2);
+ .#{$primary-stylename}-row-drag-middle .#{$primary-stylename}-cell-content {
+ $bg: mix($v-focus-color, $background-color, 20%);
+ background-color: $bg;
+ color: valo-font-color($bg);
}
- .#{$primary-stylename}-row-drag-top td:first-child:before,
- .#{$primary-stylename}-row-drag-bottom td:first-child:after {
- content: "\2022";
- display: block;
- position: absolute;
- height: 2px;
- left: 0;
- right: 0;
- background: $v-focus-color;
- font-size: $v-font-size * 2;
- line-height: 2px;
- color: $v-focus-color;
- text-indent: round($v-font-size/-4);
- text-shadow: 0 0 1px $background-color, 0 0 1px $background-color;
+ .#{$primary-stylename}-row-drag-bottom td.#{$primary-stylename}-cell-content {
+ border-bottom: 2px solid $v-focus-color;
+ height: $v-table-row-height - 2px;
}
- .#{$primary-stylename}-row-drag-top td:first-child:before {
- margin-top: -$v-table-border-width;
+ .#{$primary-stylename}-row-drag-bottom .#{$primary-stylename}-cell-wrapper {
+ margin-bottom: -2px;
}
- .v-ff & .#{$primary-stylename}-row-drag-top td:first-child:before,
- .v-ff & .#{$primary-stylename}-row-drag-bottom td:first-child:after {
- line-height: 1px;
+ .#{$primary-stylename}-row-drag-top td.#{$primary-stylename}-cell-content {
+ border-top: 2px solid $v-focus-color;
+ height: $v-table-row-height - 2px + $v-table-border-width;
}
- .v-ie & .#{$primary-stylename}-row-drag-top td:first-child:before,
- .v-ie & .#{$primary-stylename}-row-drag-bottom td:first-child:after {
- line-height: 0;
+ .#{$primary-stylename}-row-drag-top .#{$primary-stylename}-cell-wrapper {
+ margin-top: -1px;
}
@@ -700,6 +683,11 @@ $v-table-background-color: null !default;
border-top: none;
border-bottom: none;
}
+
+ .#{$primary-stylename}-row-drag-top .#{$primary-stylename}-cell-content,
+ .#{$primary-stylename}-row-drag-bottom .#{$primary-stylename}-cell-content {
+ height: $v-table-row-height - 1px;
+ }
}
@@ -814,10 +802,6 @@ $v-table-background-color: null !default;
margin-top: round($row-height/-2);
}
- .#{$primary-stylename}-row-drag-middle td:first-child:before {
- height: $row-height + $v-table-border-width;
- }
-
&.v-treetable {
.#{$primary-stylename}-cell-wrapper {
padding-left: 0;
@@ -839,4 +823,9 @@ $v-table-background-color: null !default;
padding-right: $cell-padding-horizontal;
}
}
+
+ .#{$primary-stylename}-row-drag-top .#{$primary-stylename}-cell-content,
+ .#{$primary-stylename}-row-drag-bottom .#{$primary-stylename}-cell-content {
+ height: $row-height - 1px;
+ }
}
diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/WebContent/VAADIN/themes/valo/components/_textfield.scss
index 58f69e5e4c..50cb7b8042 100644
--- a/WebContent/VAADIN/themes/valo/components/_textfield.scss
+++ b/WebContent/VAADIN/themes/valo/components/_textfield.scss
@@ -14,7 +14,7 @@ $v-textfield-background-color--readonly: darkest-color($v-app-background-color,
* The bevel style for text fields. See the documentation for $v-bevel.
* @group textfield
*/
-$v-textfield-bevel: inset 0 1px 0 v-shade !default;
+$v-textfield-bevel: if($v-bevel and ($v-bevel != none), inset 0 1px 0 v-shade, $v-bevel) !default;
/**
* The shadow style for text fields. See the documentation for $v-shadow.
diff --git a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
index 071aceb971..5ed125b909 100644
--- a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
+++ b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
@@ -193,6 +193,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
height: $v-unit-size !important;
padding-top: 0;
padding-bottom: 0;
+ -webkit-backface-visibility: hidden;
}
.valo-menu .v-menubar-user-menu {
@@ -205,6 +206,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
height: $v-unit-size;
color: valo-font-color($v-selection-color, 0.5);
max-width: 30%;
+ -webkit-backface-visibility: hidden;
.v-menubar-menuitem {
line-height: $v-unit-size - 1px;
@@ -328,6 +330,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
padding: 0 round($v-unit-size) 0 round($v-unit-size/2);
cursor: pointer;
position: relative;
+ overflow: hidden;
text-shadow: valo-text-shadow($font-color: $font-color, $background-color: $bg, $offset: 2px);
@include transition(background-color 300ms, color 60ms);
diff --git a/WebContent/VAADIN/themes/valo/components/_window.scss b/WebContent/VAADIN/themes/valo/components/_window.scss
index ce7a530c98..23fa5338c2 100644
--- a/WebContent/VAADIN/themes/valo/components/_window.scss
+++ b/WebContent/VAADIN/themes/valo/components/_window.scss
@@ -89,11 +89,12 @@ $v-window-modality-curtain-background-color: #222 !default;
left: 0;
@include radial-gradient(circle at 50% 50%, $v-window-modality-curtain-background-color, darken($v-window-modality-curtain-background-color, valo-gradient-opacity()), $fallback: $v-window-modality-curtain-background-color);
@include opacity(max(0.2, 0.8 - valo-gradient-opacity()/100%));
- @include valo-animate-in-fade($duration: 400ms, $delay: 100ms);
-
- .v-op12 & {
- // Opera 12 has a shitbreak with the fade-in (flickers)
- @include animation(none);
+ @if $v-animations-enabled {
+ @include valo-animate-in-fade($duration: 400ms, $delay: 100ms);
+ .v-op12 & {
+ // Opera 12 has a shitbreak with the fade-in (flickers)
+ @include animation(none);
+ }
}
}