diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-05-05 10:15:17 +0300 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-05-05 10:15:17 +0300 |
| commit | 1f44c63a55b5df9f096b209388e7f5748f90de1a (patch) | |
| tree | f013e30abcb11282d463acf113e00f315eee2911 /themes | |
| parent | 902363090e35172603ecc7dec60dc26c5f2bafde (diff) | |
| download | vaadin-framework-1f44c63a55b5df9f096b209388e7f5748f90de1a.tar.gz vaadin-framework-1f44c63a55b5df9f096b209388e7f5748f90de1a.zip | |
Use v-tree8 as stylename for new Tree component (#9238)
Diffstat (limited to 'themes')
| -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 |
3 files changed, 7 insertions, 7 deletions
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, |