diff options
author | Henrik Paul <henrik@vaadin.com> | 2014-12-05 12:55:40 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-12-08 09:27:34 +0000 |
commit | 9f24790d3607510b30abba08a3b29f8144332ac5 (patch) | |
tree | 8167eff1bd8dae4d487e147f8ffdb5333be51b58 /WebContent/VAADIN | |
parent | 167a9bcc33d5c36e148dae04d63f37ca7f01f34b (diff) | |
download | vaadin-framework-9f24790d3607510b30abba08a3b29f8144332ac5.tar.gz vaadin-framework-9f24790d3607510b30abba08a3b29f8144332ac5.zip |
Fixes some errors in Runo/Reindeer (#13334)
Change-Id: I5f19b8b03362035b4217dcda626d368559fc424d
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/grid/grid.scss | 2 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/grid/img/asc-light.png | bin | 0 -> 228 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/grid/img/desc-light.png | bin | 0 -> 231 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/grid/img/header-bg-light.png | bin | 0 -> 208 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/reindeer.scss | 2 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/grid/grid.scss | 2 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/grid/img/header-bg.png | bin | 0 -> 236 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/runo/grid/img/resizer-bg.png | bin | 0 -> 141 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/runo/grid/img/sort-asc.png | bin | 0 -> 281 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/runo/grid/img/sort-desc.png | bin | 0 -> 303 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/runo/runo.scss | 2 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/valo/components/_grid.scss | 16 |
12 files changed, 13 insertions, 11 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/grid/grid.scss b/WebContent/VAADIN/themes/reindeer/grid/grid.scss index 976693fba7..1fa0a743a6 100644 --- a/WebContent/VAADIN/themes/reindeer/grid/grid.scss +++ b/WebContent/VAADIN/themes/reindeer/grid/grid.scss @@ -51,7 +51,7 @@ .#{$primary-stylename}-body { // Rows - .#{$primary-stylename}-row:nth-child(odd) .#{$primary-stylename}-cell { + .#{$primary-stylename}-row-stripe > .#{$primary-stylename}-cell { background-color: #eff0f1; } diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/asc-light.png b/WebContent/VAADIN/themes/reindeer/grid/img/asc-light.png Binary files differnew file mode 100644 index 0000000000..44ed76001a --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/grid/img/asc-light.png diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/desc-light.png b/WebContent/VAADIN/themes/reindeer/grid/img/desc-light.png Binary files differnew file mode 100644 index 0000000000..84d15a0628 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/grid/img/desc-light.png diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/header-bg-light.png b/WebContent/VAADIN/themes/reindeer/grid/img/header-bg-light.png Binary files differnew file mode 100644 index 0000000000..0b913e2ef1 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/grid/img/header-bg-light.png diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss index 485839ecc7..b49e58c323 100644 --- a/WebContent/VAADIN/themes/reindeer/reindeer.scss +++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss @@ -12,6 +12,7 @@ @import "datefield/datefield.scss"; @import "inlinedatefield/inlinedatefield.scss"; @import "formlayout/formlayout.scss"; +@import "grid/grid.scss"; @import "label/label.scss"; @import "layouts/layouts.scss"; @import "link/link.scss"; @@ -49,6 +50,7 @@ $line-height: normal; @include reindeer-datefield; @include reindeer-inlinedatefield; @include reindeer-formlayout; + @include reindeer-grid; @include reindeer-label; @include reindeer-layouts; @include reindeer-link; diff --git a/WebContent/VAADIN/themes/runo/grid/grid.scss b/WebContent/VAADIN/themes/runo/grid/grid.scss index 65d16849a8..c5b3602943 100644 --- a/WebContent/VAADIN/themes/runo/grid/grid.scss +++ b/WebContent/VAADIN/themes/runo/grid/grid.scss @@ -76,7 +76,7 @@ // Grid body .#{$primary-stylename}-body { - .#{$primary-stylename}-row:nth-child(odd) .#{$primary-stylename}-cell { + .#{$primary-stylename}-row-stripe(odd) > .#{$primary-stylename}-cell { background-color: #f6f7f7; } diff --git a/WebContent/VAADIN/themes/runo/grid/img/header-bg.png b/WebContent/VAADIN/themes/runo/grid/img/header-bg.png Binary files differnew file mode 100644 index 0000000000..275fbc4382 --- /dev/null +++ b/WebContent/VAADIN/themes/runo/grid/img/header-bg.png diff --git a/WebContent/VAADIN/themes/runo/grid/img/resizer-bg.png b/WebContent/VAADIN/themes/runo/grid/img/resizer-bg.png Binary files differnew file mode 100644 index 0000000000..d9089775cb --- /dev/null +++ b/WebContent/VAADIN/themes/runo/grid/img/resizer-bg.png diff --git a/WebContent/VAADIN/themes/runo/grid/img/sort-asc.png b/WebContent/VAADIN/themes/runo/grid/img/sort-asc.png Binary files differnew file mode 100644 index 0000000000..44e17d5446 --- /dev/null +++ b/WebContent/VAADIN/themes/runo/grid/img/sort-asc.png diff --git a/WebContent/VAADIN/themes/runo/grid/img/sort-desc.png b/WebContent/VAADIN/themes/runo/grid/img/sort-desc.png Binary files differnew file mode 100644 index 0000000000..35fd0595f8 --- /dev/null +++ b/WebContent/VAADIN/themes/runo/grid/img/sort-desc.png diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss index 33ad35a8af..2294d0329b 100644 --- a/WebContent/VAADIN/themes/runo/runo.scss +++ b/WebContent/VAADIN/themes/runo/runo.scss @@ -9,6 +9,7 @@ @import "datefield/datefield.scss"; @import "inlinedatefield/inlinedatefield.scss"; @import "formlayout/formlayout.scss"; +@import "grid/grid.scss"; @import "gridlayout/gridlayout.scss"; @import "label/label.scss"; @import "link/link.scss"; @@ -50,6 +51,7 @@ $line-height: 18px; @include runo-datefield; @include runo-inline-datefield; @include runo-formlayout; + @include runo-grid; @include runo-gridlayout; @include runo-label; @include runo-link; diff --git a/WebContent/VAADIN/themes/valo/components/_grid.scss b/WebContent/VAADIN/themes/valo/components/_grid.scss index 6a17393809..ee973921b9 100644 --- a/WebContent/VAADIN/themes/valo/components/_grid.scss +++ b/WebContent/VAADIN/themes/valo/components/_grid.scss @@ -56,15 +56,13 @@ $grid-cell-padding-vertical: round(($v-table-row-height - $v-font-size)/2); .#{$primary-stylename}-body { // Rows - .#{$primary-stylename}-row { - &:nth-child(odd) td { - $bg-lightness: if(color-luminance($grid-background-color) < 10, 4%, -4%); - background-color: scale-color($grid-background-color, $lightness: $bg-lightness); - } - - &:nth-child(even) td { - background-color: $grid-background-color; - } + .#{$primary-stylename}-row > td { + background-color: $grid-background-color; + } + + .#{$primary-stylename}-row-stripe > td { + $bg-lightness: if(color-luminance($grid-background-color) < 10, 4%, -4%); + background-color: scale-color($grid-background-color, $lightness: $bg-lightness); } // Cells |