From 451ff0aa0c0dec0072188ff710480b9e5a5729ff Mon Sep 17 00:00:00 2001
From: Lakhan Mandloi <lakhan_m@tekditechnologies.com>
Date: Thu, 14 Feb 2019 18:30:28 +0530
Subject: [PATCH] Issue SB-10380 fix: TOC icons fixes
---
.../collection-player.component.spec.ts | 22 +++++++++----------
.../styles/components/ui.fancytree.scss | 13 ++++++++---
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/app/client/src/app/modules/resource/components/collection-player/collection-player.component.spec.ts b/src/app/client/src/app/modules/resource/components/collection-player/collection-player.component.spec.ts
index 415b55e2d8..5d03f2f088 100644
--- a/src/app/client/src/app/modules/resource/components/collection-player/collection-player.component.spec.ts
+++ b/src/app/client/src/app/modules/resource/components/collection-player/collection-player.component.spec.ts
@@ -69,18 +69,18 @@ describe('CollectionPlayerComponent', () => {
loaderMessage: 'Fetching content details!'
});
expect(component.collectionTreeOptions).toEqual({
- fileIcon: 'fa fa-file-o fa-lg',
+ fileIcon: 'sb-icon-content',
customFileIcon: {
- 'video': 'fa fa-file-video-o fa-lg',
- 'pdf': 'fa fa-file-pdf-o fa-lg',
- 'youtube': 'fa fa-youtube fa-lg fancy_tree_red',
- 'H5P': 'fa fa-html5 fa-lg',
- 'audio': 'fa fa-file-audio-o fa-lg',
- 'ECML': 'fa fa-file-code-o fa-lg',
- 'HTML': 'fa fa-html5 fa-lg',
- 'collection': 'fa fa-file-archive-o fa-lg',
- 'epub': 'fa fa-file-text fa-lg',
- 'doc': 'fa fa-file-text fa-lg'
+ 'video': 'sb-icon-video',
+ 'pdf': 'sb-icon-doc',
+ 'youtube': 'sb-icon-video',
+ 'H5P': 'sb-icon-content',
+ 'audio': 'sb-icon-mp3',
+ 'ECML': 'sb-icon-content',
+ 'HTML': 'sb-icon-content',
+ 'collection': 'sb-icon-collection',
+ 'epub': 'sb-icon-doc',
+ 'doc': 'sb-icon-doc'
}
});
});
diff --git a/src/app/client/src/assets/styles/components/ui.fancytree.scss b/src/app/client/src/assets/styles/components/ui.fancytree.scss
index eb83472061..e715b99449 100644
--- a/src/app/client/src/assets/styles/components/ui.fancytree.scss
+++ b/src/app/client/src/assets/styles/components/ui.fancytree.scss
@@ -18,8 +18,11 @@
pointer-events: none;
opacity: .6;
}
-.ui-fancytree {
- margin: 0;
+.ui-fancytree,
+.ui-fancytree ul {
+ margin: 0 0 0 (3 * $base-block-space);
+ padding: 0 $base-block-space;
+ border-left: 1px dotted $gray-800;
&:focus {
outline: none;
@@ -45,8 +48,12 @@
margin-bottom: $base-block-space;
}
+ .fancytree-has-children {
+ margin-left: -(2.5 * $base-block-space);
+ }
+
.fa-caret-right,
.fa-caret-down {
- margin: 0 $base-block-space 0 0;
+ margin: 0 (2 * $base-block-space) 0 0;
}
}
\ No newline at end of file
--
GitLab