Преглед изворни кода

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

tags/8.1.0.alpha7
Teemu Suo-Anttila пре 7 година
родитељ
комит
1f44c63a55

+ 2
- 2
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();

+ 1
- 1
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"));

}


+ 3
- 3
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) {

themes/src/main/themes/VAADIN/themes/valo/components/_newtree.scss → 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;
}


+ 1
- 1
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,

Loading…
Откажи
Сачувај