summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base/tree
diff options
context:
space:
mode:
Diffstat (limited to 'WebContent/VAADIN/themes/base/tree')
-rw-r--r--WebContent/VAADIN/themes/base/tree/tree-connectors.css35
-rw-r--r--WebContent/VAADIN/themes/base/tree/tree.css2
-rw-r--r--WebContent/VAADIN/themes/base/tree/tree.scss (renamed from WebContent/VAADIN/themes/base/tree/tree-default.css)52
3 files changed, 49 insertions, 40 deletions
diff --git a/WebContent/VAADIN/themes/base/tree/tree-connectors.css b/WebContent/VAADIN/themes/base/tree/tree-connectors.css
deleted file mode 100644
index c60e41c48b..0000000000
--- a/WebContent/VAADIN/themes/base/tree/tree-connectors.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Make item caption height an even number (so that the connector dots overlap nicely) */
-.v-tree-connectors .v-tree-node-caption {
- padding-top: 1px;
-}
-.v-tree-connectors .v-tree-node {
- background: transparent url(img/connector-expand.png) no-repeat 2px -52px;
-}
-.v-tree-connectors .v-tree-node-expanded {
- background: transparent url(img/connector-collapse.png) no-repeat 2px -52px;
-}
-.v-tree-connectors .v-tree-node-last {
- background: transparent url(img/connector-expand-last.png) no-repeat 2px -52px;
-}
-.v-tree-connectors .v-tree-node-expanded.v-tree-node-last {
- background: transparent url(img/connector-collapse-last.png) no-repeat 2px -52px;
-}
-.v-tree-connectors .v-tree-node-leaf {
- background: transparent url(img/connector-leaf.png) repeat-y 2px 50%;
-}
-.v-tree-connectors .v-tree-node-leaf-last {
- background: transparent url(img/connector-leaf-last.png) repeat-y 2px 50%;
-}
-.v-tree-connectors .v-tree-node-children {
- background: transparent url(img/connector.png) repeat-y 2px 0;
-}
-.v-tree-connectors .v-tree-node-children-last {
- background: transparent;
-}
-.v-tree-connectors .v-tree-node-drag-top,
-.v-tree-connectors .v-tree-node-expanded.v-tree-node-drag-top {
- background-position: 2px -53px;
-}
-.v-tree-connectors .v-tree-node-drag-top.v-tree-node-leaf {
- background-position: 2px 50%;
-}
diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css
deleted file mode 100644
index 59987731b0..0000000000
--- a/WebContent/VAADIN/themes/base/tree/tree.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "tree-default.css";
-@import "tree-connectors.css"; \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/tree/tree-default.css b/WebContent/VAADIN/themes/base/tree/tree.scss
index 23721c77ae..0319bbe994 100644
--- a/WebContent/VAADIN/themes/base/tree/tree-default.css
+++ b/WebContent/VAADIN/themes/base/tree/tree.scss
@@ -1,3 +1,7 @@
+@mixin base-tree {
+
+// tree-default.css
+
.v-tree {
text-align: left; /* Force default alignment */
overflow: hidden;
@@ -37,9 +41,9 @@ div.v-tree-node-leaf {
.v-tree-node-children {
padding-left: 1em;
}
-/***************************************
- * Drag'n'drop styles
- ***************************************/
+
+// Drag'n'drop styles
+
.v-tree .v-tree-node-drag-top {
border-top: 2px solid #1d9dff;
margin-top: -1px;
@@ -92,4 +96,46 @@ div.v-tree-node-leaf {
.v-tree .v-tree-node-drag-top,
.v-tree .v-tree-node-drag-bottom {
border-color: rgba(0,109,232,.6);
+}
+
+// tree-connectors.css
+
+.v-tree-connectors {
+ // Make item caption height an even number (so that the connector dots overlap nicely)
+ .v-tree-node-caption {
+ padding-top: 1px;
+ }
+ .v-tree-node {
+ background: transparent url(img/connector-expand.png) no-repeat 2px -52px;
+ }
+ .v-tree-node-expanded {
+ background: transparent url(img/connector-collapse.png) no-repeat 2px -52px;
+ }
+ .v-tree-node-last {
+ background: transparent url(img/connector-expand-last.png) no-repeat 2px -52px;
+ }
+ .v-tree-node-expanded.v-tree-node-last {
+ background: transparent url(img/connector-collapse-last.png) no-repeat 2px -52px;
+ }
+ .v-tree-node-leaf {
+ background: transparent url(img/connector-leaf.png) repeat-y 2px 50%;
+ }
+ .v-tree-node-leaf-last {
+ background: transparent url(img/connector-leaf-last.png) repeat-y 2px 50%;
+ }
+ .v-tree-node-children {
+ background: transparent url(img/connector.png) repeat-y 2px 0;
+ }
+ .v-tree-node-children-last {
+ background: transparent;
+ }
+ .v-tree-node-drag-top,
+ .v-tree-node-expanded.v-tree-node-drag-top {
+ background-position: 2px -53px;
+ }
+ .v-tree-node-drag-top.v-tree-node-leaf {
+ background-position: 2px 50%;
+ }
+}
+
} \ No newline at end of file