diff options
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/Tree.java | 4 | ||||
| -rw-r--r-- | testbench-api/src/main/java/com/vaadin/testbench/elements/TreeElement.java | 2 | ||||
| -rw-r--r-- | themes/src/main/themes/VAADIN/themes/valo/components/_all.scss | 6 | ||||
| -rw-r--r-- | themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss (renamed from themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss) | 6 | ||||
| -rw-r--r-- | themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss | 2 |
5 files changed, 10 insertions, 10 deletions
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<T> extends Composite implements HasDataProvider<T> { /** * String renderer that handles icon resources and stores their identifiers * into data objects. - * + * * @since 8.1 */ public final class TreeRenderer extends AbstractRenderer<T, String> @@ -132,7 +132,7 @@ public class Tree<T> extends Composite implements HasDataProvider<T> { 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/_tree8.scss index 20af676e4b..6ca4ab3863 100644 --- a/themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss +++ b/themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss @@ -1,8 +1,8 @@ @import "treegrid"; -$v-newtree-border-radius: 3px; +$v-tree8-border-radius: 3px; -@mixin valo-newtree ($primary-stylename: v-newtree) { +@mixin valo-tree8 ($primary-stylename: v-tree8) { @include valo-treegrid($primary-stylename); @@ -35,7 +35,7 @@ $v-newtree-border-radius: 3px; .#{$primary-stylename}-cell-content { border: $v-grid-cell-focused-border; border-color: transparent; - border-radius: $v-newtree-border-radius; + border-radius: $v-tree8-border-radius; padding: $v-grid-cell-padding; } 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, |