Commit 39ed07a8 authored by Phil Hughes's avatar Phil Hughes

karma updates

parent 6139050e
...@@ -553,6 +553,10 @@ ...@@ -553,6 +553,10 @@
} }
.multi-file-commit-list-item { .multi-file-commit-list-item {
&.is-active {
background-color: $white-normal;
}
.multi-file-discard-btn { .multi-file-discard-btn {
display: none; display: none;
margin-top: -2px; margin-top: -2px;
...@@ -612,10 +616,6 @@ ...@@ -612,10 +616,6 @@
} }
} }
.multi-file-commit-list-item.is-active {
background-color: $white-normal;
}
.multi-file-commit-list-path { .multi-file-commit-list-path {
padding: 0; padding: 0;
background: none; background: none;
......
...@@ -19,6 +19,7 @@ describe('Multi-file editor commit sidebar list item', () => { ...@@ -19,6 +19,7 @@ describe('Multi-file editor commit sidebar list item', () => {
vm = createComponentWithStore(Component, store, { vm = createComponentWithStore(Component, store, {
file: f, file: f,
actionComponent: 'stage-button', actionComponent: 'stage-button',
activeFileKey: `staged-${f.key}`,
}).$mount(); }).$mount();
}); });
......
...@@ -17,6 +17,7 @@ describe('Multi-file editor commit sidebar list', () => { ...@@ -17,6 +17,7 @@ describe('Multi-file editor commit sidebar list', () => {
action: 'stageAllChanges', action: 'stageAllChanges',
actionBtnText: 'stage all', actionBtnText: 'stage all',
itemActionComponent: 'stage-button', itemActionComponent: 'stage-button',
activeFileKey: 'staged-testing',
}); });
vm.$store.state.rightPanelCollapsed = false; vm.$store.state.rightPanelCollapsed = false;
......
...@@ -98,6 +98,7 @@ describe('RepoCommitSection', () => { ...@@ -98,6 +98,7 @@ describe('RepoCommitSection', () => {
store.state.noChangesStateSvgPath = 'nochangessvg'; store.state.noChangesStateSvgPath = 'nochangessvg';
store.state.committedStateSvgPath = 'svg'; store.state.committedStateSvgPath = 'svg';
vm.$destroy();
vm = createComponentWithStore(Component, store).$mount(); vm = createComponentWithStore(Component, store).$mount();
expect(vm.$el.querySelector('.js-empty-state').textContent.trim()).toContain('No changes'); expect(vm.$el.querySelector('.js-empty-state').textContent.trim()).toContain('No changes');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment