kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

added line height to label in modal 

fixed spec because of object key change
This commit is contained in:
Phil Hughes 2018-04-19 15:51:43 +01:00
parent 8e0d073b36
commit ca3f7cf0e3
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/ide/components/new_dropdown/modal.vue
View File

@ -75,7 +75,7 @@ export default {
@submit.prevent="createEntryInStore"
>
<fieldset class="form-group append-bottom-0">
<label class="label-light col-sm-3">
<label class="label-light col-sm-3 ide-new-modal-label">
{{ __('Name') }}
</label>
<div class="col-sm-9">

2
app/assets/javascripts/ide/stores/actions.js
View File

@ -142,7 +142,7 @@ export const updateTempFlagForEntry = ({ commit, dispatch, state }, { file, temp
commit(types.UPDATE_TEMP_FLAG, { path: file.path, tempFile });
if (file.parentPath) {
dispatch('updateTempFlagForEntry', { entry: state.entries[file.parentPath], tempFile });
dispatch('updateTempFlagForEntry', { file: state.entries[file.parentPath], tempFile });
}
};

4
app/assets/stylesheets/pages/repo.scss
View File

@ -950,3 +950,7 @@
background: transparent;
resize: none;
}
.ide-new-modal-label {
line-height: 34px;
}

6
spec/javascripts/ide/stores/actions_spec.js
View File

@ -352,7 +352,7 @@ describe('Multi-file store actions', () => {
testAction(
actions.updateTempFlagForEntry,
{ entry: f, tempFile: false },
{ file: f, tempFile: false },
store.state,
[{ type: 'UPDATE_TEMP_FLAG', payload: { path: f.path, tempFile: false } }],
[],
@ -375,10 +375,10 @@ describe('Multi-file store actions', () => {
testAction(
actions.updateTempFlagForEntry,
{ entry: f, tempFile: false },
{ file: f, tempFile: false },
store.state,
[{ type: 'UPDATE_TEMP_FLAG', payload: { path: f.path, tempFile: false } }],
[{ type: 'updateTempFlagForEntry', payload: { entry: parent, tempFile: false } }],
[{ type: 'updateTempFlagForEntry', payload: { file: parent, tempFile: false } }],
done,
);
});