summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-19 15:51:43 +0100
committerPhil Hughes <me@iamphill.com>2018-04-19 15:51:43 +0100
commitca3f7cf0e3e41206e2f557c49b5bf26d4b9cad0f (patch)
tree900ff4c0bf9b843b65da9bf231d3a70d36bd9b62 /app
parent8e0d073b369ecabe7dabc75bda76b795b2d28931 (diff)
downloadgitlab-ce-ca3f7cf0e3e41206e2f557c49b5bf26d4b9cad0f.tar.gz
added line height to label in modal
fixed spec because of object key change
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/ide/components/new_dropdown/modal.vue2
-rw-r--r--app/assets/javascripts/ide/stores/actions.js2
-rw-r--r--app/assets/stylesheets/pages/repo.scss4
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
index e228a2f4024..a95a0225950 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -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">
diff --git a/app/assets/javascripts/ide/stores/actions.js b/app/assets/javascripts/ide/stores/actions.js
index bfdbbd7ccb0..99e3c8f6794 100644
--- a/app/assets/javascripts/ide/stores/actions.js
+++ b/app/assets/javascripts/ide/stores/actions.js
@@ -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 });
}
};
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index b122ed34f53..a94edc7d34c 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -950,3 +950,7 @@
background: transparent;
resize: none;
}
+
+.ide-new-modal-label {
+ line-height: 34px;
+}