From 1f44c63a55b5df9f096b209388e7f5748f90de1a Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Fri, 5 May 2017 10:15:17 +0300 Subject: Use v-tree8 as stylename for new Tree component (#9238) --- server/src/main/java/com/vaadin/ui/Tree.java | 4 +- .../com/vaadin/testbench/elements/TreeElement.java | 2 +- .../themes/VAADIN/themes/valo/components/_all.scss | 6 +-- .../VAADIN/themes/valo/components/_newtree.scss | 62 ---------------------- .../VAADIN/themes/valo/components/_tree8.scss | 62 ++++++++++++++++++++++ .../VAADIN/themes/valo/shared/_variables.scss | 2 +- 6 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss create mode 100644 themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss diff --git a/server/src/main/java/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java index ba249a7169..8f02c8c88f 100644 --- a/server/src/main/java/com/vaadin/ui/Tree.java +++ b/server/src/main/java/com/vaadin/ui/Tree.java @@ -57,7 +57,7 @@ public class Tree extends Composite implements HasDataProvider { /** * String renderer that handles icon resources and stores their identifiers * into data objects. - * + * * @since 8.1 */ public final class TreeRenderer extends AbstractRenderer @@ -132,7 +132,7 @@ public class Tree extends Composite implements HasDataProvider { while (treeGrid.getHeaderRowCount() > 0) { treeGrid.removeHeaderRow(0); } - treeGrid.setPrimaryStyleName("v-newtree"); + treeGrid.setPrimaryStyleName("v-tree8"); setWidth("100%"); treeGrid.setHeightUndefined(); diff --git a/testbench-api/src/main/java/com/vaadin/testbench/elements/TreeElement.java b/testbench-api/src/main/java/com/vaadin/testbench/elements/TreeElement.java index 371cc8b31f..594f919150 100644 --- a/testbench-api/src/main/java/com/vaadin/testbench/elements/TreeElement.java +++ b/testbench-api/src/main/java/com/vaadin/testbench/elements/TreeElement.java @@ -91,7 +91,7 @@ public class TreeElement extends AbstractComponentElement { */ public WebElement getExpandElement(int rowIndex) { return asTreeGrid().getCell(rowIndex, 0) - .findElement(By.className("v-newtree-expander")); + .findElement(By.className("v-tree8-expander")); } diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_all.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_all.scss index 99514e2164..15b6ddd5f8 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_all.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_all.scss @@ -35,7 +35,7 @@ @import "textarea"; @import "tree"; @import "treegrid"; -@import "newtree"; +@import "tree8"; @import "treetable"; @import "twincolselect"; @import "upload"; @@ -147,8 +147,8 @@ @include valo-tree; } - @if v-is-included(newtree) { - @include valo-newtree; + @if v-is-included(tree8) { + @include valo-tree8; } @if v-is-included(treegrid) { diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss deleted file mode 100644 index 20af676e4b..0000000000 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss +++ /dev/null @@ -1,62 +0,0 @@ -@import "treegrid"; - -$v-newtree-border-radius: 3px; - -@mixin valo-newtree ($primary-stylename: v-newtree) { - - @include valo-treegrid($primary-stylename); - - .#{$primary-stylename} { - background-color: transparent; - } - - .#{$primary-stylename}-row > td { - background-color: transparent; - border: none; - } - - .#{$primary-stylename}-tablewrapper { - background-color: transparent; - border: none; - } - - .#{$primary-stylename}-row-selected > .#{$primary-stylename}-cell { - background-color: transparent; - background-image: none; - color: inherit; - text-shadow: none; - border: none; - } - - .#{$primary-stylename}:focus .#{$primary-stylename}-rowmode-row-focused:before { - display: none; - } - - .#{$primary-stylename}-cell-content { - border: $v-grid-cell-focused-border; - border-color: transparent; - border-radius: $v-newtree-border-radius; - padding: $v-grid-cell-padding; - } - - .#{$primary-stylename}:focus .#{$primary-stylename}-rowmode-cell-focused - > .#{$primary-stylename}-node > .#{$primary-stylename}-cell-content { - border: $v-grid-cell-focused-border; - } - - // Selected - .#{$primary-stylename}-row-selected { - $grid-sel-bg: $v-grid-row-selected-background-color; - - > .#{$primary-stylename}-cell > .#{$primary-stylename}-node > .#{$primary-stylename}-cell-content { - @include valo-gradient($grid-sel-bg); - color: valo-font-color($grid-sel-bg); - text-shadow: valo-text-shadow($font-color: valo-font-color($grid-sel-bg), $background-color: $grid-sel-bg); - border-color: adjust-color($grid-sel-bg, $lightness: -8%, $saturation: -8%); - } - - > .#{$primary-stylename}-cell-focused > .#{$primary-stylename}-node > .#{$primary-stylename}-cell-content { - border-color: adjust-color($grid-sel-bg, $lightness: 20%); - } - } -} diff --git a/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss new file mode 100644 index 0000000000..6ca4ab3863 --- /dev/null +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss @@ -0,0 +1,62 @@ +@import "treegrid"; + +$v-tree8-border-radius: 3px; + +@mixin valo-tree8 ($primary-stylename: v-tree8) { + + @include valo-treegrid($primary-stylename); + + .#{$primary-stylename} { + background-color: transparent; + } + + .#{$primary-stylename}-row > td { + background-color: transparent; + border: none; + } + + .#{$primary-stylename}-tablewrapper { + background-color: transparent; + border: none; + } + + .#{$primary-stylename}-row-selected > .#{$primary-stylename}-cell { + background-color: transparent; + background-image: none; + color: inherit; + text-shadow: none; + border: none; + } + + .#{$primary-stylename}:focus .#{$primary-stylename}-rowmode-row-focused:before { + display: none; + } + + .#{$primary-stylename}-cell-content { + border: $v-grid-cell-focused-border; + border-color: transparent; + border-radius: $v-tree8-border-radius; + padding: $v-grid-cell-padding; + } + + .#{$primary-stylename}:focus .#{$primary-stylename}-rowmode-cell-focused + > .#{$primary-stylename}-node > .#{$primary-stylename}-cell-content { + border: $v-grid-cell-focused-border; + } + + // Selected + .#{$primary-stylename}-row-selected { + $grid-sel-bg: $v-grid-row-selected-background-color; + + > .#{$primary-stylename}-cell > .#{$primary-stylename}-node > .#{$primary-stylename}-cell-content { + @include valo-gradient($grid-sel-bg); + color: valo-font-color($grid-sel-bg); + text-shadow: valo-text-shadow($font-color: valo-font-color($grid-sel-bg), $background-color: $grid-sel-bg); + border-color: adjust-color($grid-sel-bg, $lightness: -8%, $saturation: -8%); + } + + > .#{$primary-stylename}-cell-focused > .#{$primary-stylename}-node > .#{$primary-stylename}-cell-content { + border-color: adjust-color($grid-sel-bg, $lightness: 20%); + } + } +} diff --git a/themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss index 2c70ebeee5..3237018087 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss @@ -490,7 +490,7 @@ $v-included-components: textarea, richtextarea, tree, - newtree, + tree8, treegrid, treetable, twincolselect, -- cgit v1.2.3