diff options
Diffstat (limited to 'app/assets/javascripts/ide/components')
7 files changed, 15 insertions, 11 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue index 59a32dd477e..bbcb866c758 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue @@ -1,7 +1,7 @@ <script> import { mapActions } from 'vuex'; -import { sprintf, __ } from '~/locale'; import { GlModal } from '@gitlab/ui'; +import { sprintf, __ } from '~/locale'; import FileIcon from '~/vue_shared/components/file_icon.vue'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue index 3bba4fbc906..9342ab87c1a 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue @@ -1,7 +1,7 @@ <script> import { mapState, mapActions, mapGetters } from 'vuex'; -import { n__, __ } from '~/locale'; import { GlModal } from '@gitlab/ui'; +import { n__, __ } from '~/locale'; import LoadingButton from '~/vue_shared/components/loading_button.vue'; import CommitMessageField from './message_field.vue'; import Actions from './actions.vue'; @@ -138,7 +138,7 @@ export default { @input="updateCommitMessage" @submit="commit" /> - <div class="clearfix prepend-top-15"> + <div class="clearfix gl-mt-5"> <actions /> <loading-button :loading="submitCommitLoading" diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue index 5cff1079eb0..d1422a506e7 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -1,7 +1,7 @@ <script> import { mapActions } from 'vuex'; -import { __, sprintf } from '~/locale'; import { GlModal } from '@gitlab/ui'; +import { __, sprintf } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; import tooltip from '~/vue_shared/directives/tooltip'; import ListItem from './list_item.vue'; diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue index 03304337839..1b257ca11cc 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue @@ -84,7 +84,7 @@ export default { :title="additionsTooltip" data-container="body" data-placement="left" - class="append-bottom-10" + class="gl-mb-3" > <icon :name="additionIconName" :size="18" :class="addedFilesIconClass" /> </div> @@ -94,7 +94,7 @@ export default { :title="modifiedTooltip" data-container="body" data-placement="left" - class="prepend-top-10 append-bottom-10" + class="gl-mt-3 gl-mb-3" > <icon :name="modifiedIconName" :size="18" :class="modifiedFilesClass" /> </div> diff --git a/app/assets/javascripts/ide/components/ide_project_header.vue b/app/assets/javascripts/ide/components/ide_project_header.vue index 36bc7c70196..36891505230 100644 --- a/app/assets/javascripts/ide/components/ide_project_header.vue +++ b/app/assets/javascripts/ide/components/ide_project_header.vue @@ -20,7 +20,11 @@ export default { <project-avatar-default :project="project" :size="48" /> <span class="ide-sidebar-project-title"> <span class="sidebar-context-title"> {{ project.name }} </span> - <span class="sidebar-context-title text-secondary"> + <span + class="sidebar-context-title text-secondary" + data-qa-selector="project_path_content" + :data-qa-project-path="project.path_with_namespace" + > {{ project.path_with_namespace }} </span> </span> diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue index fe0167942b8..44986c8c575 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue @@ -1,8 +1,8 @@ <script> import { mapActions, mapState, mapGetters } from 'vuex'; -import flash from '~/flash'; -import { __, sprintf, s__ } from '~/locale'; import { GlModal } from '@gitlab/ui'; +import { deprecatedCreateFlash as flash } from '~/flash'; +import { __, sprintf, s__ } from '~/locale'; import { modalTypes } from '../../constants'; import { trimPathComponents, getPathParent } from '../../utils'; diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index ac445a1d9f1..d22d430cb4a 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -1,7 +1,7 @@ <script> import { mapState, mapGetters, mapActions } from 'vuex'; import { viewerInformationForPath } from '~/vue_shared/components/content_viewer/lib/viewer_utils'; -import flash from '~/flash'; +import { deprecatedCreateFlash as flash } from '~/flash'; import ContentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue'; import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; import { @@ -167,7 +167,7 @@ export default { }, mounted() { if (!this.editor) { - this.editor = Editor.create(this.editorOptions); + this.editor = Editor.create(this.$store, this.editorOptions); } this.initEditor(); |