summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-23 10:51:44 +0100
committerPhil Hughes <me@iamphill.com>2018-04-23 10:51:44 +0100
commitcfae2d755cb38994aeb64fee6a98f9f1db0be4d5 (patch)
tree949e5a9f45a2ad59391d3420b0cd07465ad5d7cd
parenteb8903a1d7a67f07d90fb951c4d9687c175e07df (diff)
downloadgitlab-ce-cfae2d755cb38994aeb64fee6a98f9f1db0be4d5.tar.gz
fixed scss lint & ide_tree_spec
-rw-r--r--app/assets/stylesheets/framework/gitlab_theme.scss3
-rw-r--r--spec/javascripts/ide/components/ide_tree_spec.js9
2 files changed, 0 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/gitlab_theme.scss b/app/assets/stylesheets/framework/gitlab_theme.scss
index 4f8149dd426..0bbd6eb27c1 100644
--- a/app/assets/stylesheets/framework/gitlab_theme.scss
+++ b/app/assets/stylesheets/framework/gitlab_theme.scss
@@ -188,9 +188,6 @@
.ide-sidebar-link {
&.active {
color: $color-700;
- }
-
- &.active {
box-shadow: inset 3px 0 $color-700;
}
}
diff --git a/spec/javascripts/ide/components/ide_tree_spec.js b/spec/javascripts/ide/components/ide_tree_spec.js
index bdc03692b40..97a0a2432f1 100644
--- a/spec/javascripts/ide/components/ide_tree_spec.js
+++ b/spec/javascripts/ide/components/ide_tree_spec.js
@@ -28,15 +28,6 @@ describe('IdeRepoTree', () => {
resetStore(vm.$store);
});
- it('renders loading', done => {
- vm.currentTree.loading = true;
-
- vm.$nextTick(() => {
- expect(vm.$el.querySelectorAll('.multi-file-loading-container').length).toBe(3);
- done();
- });
- });
-
it('renders list of files', () => {
expect(vm.$el.textContent).toContain('fileName');
});