diff --git a/lib/items/commit-preview-item.js b/lib/items/commit-preview-item.js index 0f83c4255a..367ffde0f2 100644 --- a/lib/items/commit-preview-item.js +++ b/lib/items/commit-preview-item.js @@ -69,11 +69,11 @@ export default class CommitPreviewItem extends React.Component { } getTitle() { - return 'Commit preview'; + return 'Staged Changes'; } getIconName() { - return 'git-commit'; + return 'tasklist'; } getWorkingDirectory() { diff --git a/styles/commit-view.less b/styles/commit-view.less index 5151292b49..936f53e0bd 100644 --- a/styles/commit-view.less +++ b/styles/commit-view.less @@ -3,7 +3,6 @@ .github-CommitView { padding: @component-padding; - border-top: 1px solid @base-border-color; flex: 0 0 auto; &-editor { @@ -82,7 +81,10 @@ &-buttonWrapper { align-items: center; display: flex; - margin-bottom: 10px; + margin: 0 -@component-padding @component-padding -@component-padding; + padding: @component-padding; + padding-top: 0; + border-bottom: 1px solid @base-border-color; } &-coAuthorEditor { diff --git a/test/controllers/root-controller.test.js b/test/controllers/root-controller.test.js index e3bf7c6530..ad00178c20 100644 --- a/test/controllers/root-controller.test.js +++ b/test/controllers/root-controller.test.js @@ -1255,7 +1255,7 @@ describe('RootController', function() { const uri = CommitPreviewItem.buildURI(workdir); const item = await atomEnv.workspace.open(uri); - assert.strictEqual(item.getTitle(), 'Commit preview'); + assert.strictEqual(item.getTitle(), 'Staged Changes'); assert.lengthOf(wrapper.update().find('CommitPreviewItem'), 1); }); diff --git a/test/items/commit-preview-item.test.js b/test/items/commit-preview-item.test.js index f7a12d8bb1..0d66fe4140 100644 --- a/test/items/commit-preview-item.test.js +++ b/test/items/commit-preview-item.test.js @@ -96,8 +96,8 @@ describe('CommitPreviewItem', function() { const wrapper = mount(buildPaneApp()); const item = await open(wrapper); - assert.strictEqual(item.getTitle(), 'Commit preview'); - assert.strictEqual(item.getIconName(), 'git-commit'); + assert.strictEqual(item.getTitle(), 'Staged Changes'); + assert.strictEqual(item.getIconName(), 'tasklist'); }); it('terminates pending state', async function() {