From d8833fbbe1b5840615c866d9486d3f92886e9b1b Mon Sep 17 00:00:00 2001 From: Arjunkumar Date: Fri, 27 Sep 2013 11:18:01 +0530 Subject: [PATCH 1/2] Update theme.css update tree structure --- .../wm/base/widget/themes/default/theme.css | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/theme.css b/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/theme.css index 9df21a424f..71f6b955ac 100644 --- a/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/theme.css +++ b/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/theme.css @@ -190,9 +190,7 @@ th { .wmtree ul { margin: 0; padding: 0; - list-style-type: none; - background: url(images/treeimages.png) repeat-y; - background-position: 0px 100%; + list-style-type: none; width: 18px; } @@ -204,8 +202,16 @@ th { margin: 0; padding: 0 0 0 20px; white-space: nowrap; + position: relative; /* for moving the child up to hide the extra dot lines*/ + top: -4px; } +.wmtree-branch{ + background: url(images/treeimages.png) repeat-y; + background-position: 0px 100%; +} + + .wmtree-root-leaf, .wmtree-leaf, .wmtree-last-leaf, .wmtree-root-last-leaf { margin: 0 0 0 -20px; padding-right: 2px; @@ -229,12 +235,13 @@ th { } .wmtree-last-item { - width: 12px; + /* width: 12px; background-image: url(images/treeimages.png); background-position: -84px 0px; -/* background-image: url(images/tree_half_bar.gif);*/ + background-image: url(images/tree_half_bar.gif); background-repeat: no-repeat; - vertical-align: top; + vertical-align: top; Marking the end of the child + height:7px;*/ } .wmtree-disabled .wmtree-root-leaf, .wmtree-disabled .wmtree-root-last-leaf, .wmtree-disabled .wmtree-last-item { @@ -244,13 +251,12 @@ th { .wmtree-leaf { width: 18px; background-image: url(images/treeimages.png); - background-position: -104px 0px; + /* background-position: -104px 0px; */ + background-position: -84px 0px; background-repeat: no-repeat; /* background: url(images/tree_leaf.gif) no-repeat;*/ } - - .wmtree .wmtree-empty { background-image: none; } @@ -1634,4 +1640,4 @@ height: 16px; .wmeditor .dijitComboBox .dijitArrowButton, .wmeditor .dijitSelect .dijitArrowButton { background-image: none; -} \ No newline at end of file +} From 1f782bbf3ba435a68ce3771001d4a91370c59601 Mon Sep 17 00:00:00 2001 From: Arjunkumar Date: Fri, 27 Sep 2013 11:23:10 +0530 Subject: [PATCH 2/2] Update mtheme.css mobile tree update for tree --- .../wm/base/widget/themes/default/mtheme.css | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/mtheme.css b/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/mtheme.css index e899e48e6d..86a136f7d0 100644 --- a/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/mtheme.css +++ b/wavemaker/wavemaker-studio/src/main/webapp/lib/wm/base/widget/themes/default/mtheme.css @@ -1,4 +1,3 @@ - /* * Copyright (C) 2010-2013 VMware, Inc. All rights reserved. * @@ -204,8 +203,6 @@ user-select: none; margin: 0; padding: 0; list-style-type: none; - background: url(images/treeimages.png) repeat-y; - background-position: 0px 100%; width: 18px; } @@ -217,6 +214,13 @@ user-select: none; margin: 0; padding: 0 0 0 20px; white-space: nowrap; + position: relative; /*for moving the child up to hide the extra dot lines*/ + top: -4px; +} + +.wmtree-branch{ + background: url(images/treeimages.png) repeat-y; + background-position: 0px 100%; } .wmtree-root-leaf, .wmtree-leaf, .wmtree-last-leaf, .wmtree-root-last-leaf { @@ -242,14 +246,27 @@ user-select: none; } .wmtree-last-item { - width: 12px; + /* width: 12px; background-image: url(images/treeimages.png); background-position: -84px 0px; -/* background-image: url(images/tree_half_bar.gif);*/ + background-image: url(images/tree_half_bar.gif); background-repeat: no-repeat; - vertical-align: top; + vertical-align: top; Marking the end of the child + height:7px;*/ +} + +.wmtree-disabled .wmtree-root-leaf, .wmtree-disabled .wmtree-root-last-leaf, .wmtree-disabled .wmtree-last-item { + background-color: #C8C8C8; } +.wmtree-leaf { + width: 18px; + background-image: url(images/treeimages.png); + /* background-position: -104px 0px; */ + background-position: -84px 0px; + background-repeat: no-repeat; +/* background: url(images/tree_leaf.gif) no-repeat;*/ +} .wmtree-disabled .wmtree-root-leaf, .wmtree-disabled .wmtree-root-last-leaf, .wmtree-disabled .wmtree-last-item { background-color: #C8C8C8; } @@ -1397,4 +1414,4 @@ display: inline-block; .wmeditor .dijitComboBox .dijitArrowButton, .wmeditor .dijitSelect .dijitArrowButton { background-image: none; -} \ No newline at end of file +}