From 2ee7a77a86ee8e5b323b6b73116fcc29dd29e651 Mon Sep 17 00:00:00 2001
From: charlesh88 <charlesh88@gmail.com>
Date: Tue, 21 Aug 2018 15:56:12 -0700
Subject: [PATCH] Refinements to view control in tree

- Changed state eval to use 'enabled', removed v-if;
---
 src/ui/components/controls/viewControl.vue | 8 ++++----
 src/ui/components/layout/mct-tree.vue      | 2 +-
 src/ui/components/layout/tree-item.vue     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ui/components/controls/viewControl.vue b/src/ui/components/controls/viewControl.vue
index 9e8fca04d9..d3c024eeb2 100644
--- a/src/ui/components/controls/viewControl.vue
+++ b/src/ui/components/controls/viewControl.vue
@@ -2,7 +2,7 @@
     <span class="c-view-control"
     :class="{
         'c-view-control--expanded' : expanded,
-        'is-disabled' : disabled === true
+        'is-enabled' : enabled
     }"
     @click="toggle"></span>
 </template>
@@ -19,8 +19,8 @@
         width: $d;
         position: relative;
 
-        &:not(.is-disabled):before {
-            $s: .75;
+        &.is-enabled:before {
+            $s: .65;
             content: $glyph-icon-arrow-right-equilateral;
             display: block;
             font-family: symbolsfont;
@@ -45,7 +45,7 @@
                 type: Boolean,
                 value: false
             },
-            disabled: {
+            enabled: {
                 // Provided to allow the view-control to still occupy space without displaying a control icon.
                 // Used as such in the tree - when a node doesn't have children, set disabled to true.
                 type: Boolean,
diff --git a/src/ui/components/layout/mct-tree.vue b/src/ui/components/layout/mct-tree.vue
index a0655a95aa..f6cdecc414 100644
--- a/src/ui/components/layout/mct-tree.vue
+++ b/src/ui/components/layout/mct-tree.vue
@@ -16,7 +16,7 @@
         height: 100%;
 
         .c-tree {
-            margin-left: 20px;
+            margin-left: 15px;
         }
 
         &__item {
diff --git a/src/ui/components/layout/tree-item.vue b/src/ui/components/layout/tree-item.vue
index 75ff662b3a..f4cddaaba9 100644
--- a/src/ui/components/layout/tree-item.vue
+++ b/src/ui/components/layout/tree-item.vue
@@ -2,7 +2,7 @@
     <li class="c-tree__item-h">
         <div class="c-tree__item">
             <view-control class="c-tree__item__view-control"
-                          v-if="hasChildren"
+                          :enabled="hasChildren"
                           :expanded="expanded"
                           @click="toggleChildren">
             </view-control>