Merge branch 'develop'

gbmhunter · Feb 27, 2018 · 527f09d · 527f09d
2 parents 9b382df + 87045e2
commit 527f09d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v3.2.1] - 2018-02-27
+
+### Fixed
+- Fixed display error with TreeView component where bullet-point and bullet-point text were not on the same line.
+
 ## [v3.2.0] - 2018-02-27
 
 ### Added

diff --git a/src/misc/TreeView/TreeItem.vue b/src/misc/TreeView/TreeItem.vue
@@ -5,7 +5,7 @@
     <div class="whole-row" :class="{ hover: isHover, selected: data.selected }" @mouseover="isHover=true" @mouseout="isHover=false"
          style="width: 100%; display: block; position: absolute; left: 0; height: 25px; z-index: 0; transition: background-color 0.2s ease;"></div>
       <div class="name" @mouseover="isHover=true" @mouseout="isHover=false"
-           style="z-index: 1; background-color: transparent; position: relative; height: 25px; display: flex; justify-content: center; flex-direction: column;">{{ data.name }}</div>
+           style="z-index: 1; background-color: transparent; position: relative; height: 25px;">{{ data.name }}</div>
     <ul style="padding-left: 10px; background-color: transparent;">
       <tree-item v-for="(child, index) in model.children"
                  :key="index"