Browse Source

Use v-tree8 as stylename for new Tree component (#9238)

tags/8.1.0.alpha7
Teemu Suo-Anttila 7 years ago
parent
commit
1f44c63a55

+ 2
- 2
server/src/main/java/com/vaadin/ui/Tree.java View File

/** /**
* String renderer that handles icon resources and stores their identifiers * String renderer that handles icon resources and stores their identifiers
* into data objects. * into data objects.
*
*
* @since 8.1 * @since 8.1
*/ */
public final class TreeRenderer extends AbstractRenderer<T, String> public final class TreeRenderer extends AbstractRenderer<T, String>
while (treeGrid.getHeaderRowCount() > 0) { while (treeGrid.getHeaderRowCount() > 0) {
treeGrid.removeHeaderRow(0); treeGrid.removeHeaderRow(0);
} }
treeGrid.setPrimaryStyleName("v-newtree");
treeGrid.setPrimaryStyleName("v-tree8");


setWidth("100%"); setWidth("100%");
treeGrid.setHeightUndefined(); treeGrid.setHeightUndefined();

+ 1
- 1
testbench-api/src/main/java/com/vaadin/testbench/elements/TreeElement.java View File

*/ */
public WebElement getExpandElement(int rowIndex) { public WebElement getExpandElement(int rowIndex) {
return asTreeGrid().getCell(rowIndex, 0) return asTreeGrid().getCell(rowIndex, 0)
.findElement(By.className("v-newtree-expander"));
.findElement(By.className("v-tree8-expander"));


} }



+ 3
- 3
themes/src/main/themes/VAADIN/themes/valo/components/_all.scss View File

@import "textarea"; @import "textarea";
@import "tree"; @import "tree";
@import "treegrid"; @import "treegrid";
@import "newtree";
@import "tree8";
@import "treetable"; @import "treetable";
@import "twincolselect"; @import "twincolselect";
@import "upload"; @import "upload";
@include valo-tree; @include valo-tree;
} }


@if v-is-included(newtree) {
@include valo-newtree;
@if v-is-included(tree8) {
@include valo-tree8;
} }


@if v-is-included(treegrid) { @if v-is-included(treegrid) {

themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss → themes/src/main/themes/VAADIN/themes/valo/components/_tree8.scss View File

@import "treegrid"; @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); @include valo-treegrid($primary-stylename);


.#{$primary-stylename}-cell-content { .#{$primary-stylename}-cell-content {
border: $v-grid-cell-focused-border; border: $v-grid-cell-focused-border;
border-color: transparent; border-color: transparent;
border-radius: $v-newtree-border-radius;
border-radius: $v-tree8-border-radius;
padding: $v-grid-cell-padding; padding: $v-grid-cell-padding;
} }



+ 1
- 1
themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss View File

textarea, textarea,
richtextarea, richtextarea,
tree, tree,
newtree,
tree8,
treegrid, treegrid,
treetable, treetable,
twincolselect, twincolselect,

Loading…
Cancel
Save