diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-25 10:47:04 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-25 10:47:04 +0100 |
commit | 272b8f3f7220c10070e3fc8f45109e2e7adad87e (patch) | |
tree | 03adcfc6a16feab25ad3fba77aa824646d377d56 | |
parent | 7adbed74648574e35cfe79210ef67157cd44937e (diff) | |
download | gitlab-ce-272b8f3f7220c10070e3fc8f45109e2e7adad87e.tar.gz |
fixed alignment of new dropdown in file rows
fixed bad merge resolutions
-rw-r--r-- | app/assets/javascripts/ide/components/ide.vue | 48 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 1 |
2 files changed, 28 insertions, 21 deletions
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue index 2d2af6e0e49..ea0fa109fa4 100644 --- a/app/assets/javascripts/ide/components/ide.vue +++ b/app/assets/javascripts/ide/components/ide.vue @@ -1,5 +1,5 @@ <script> -import { mapState, mapGetters } from 'vuex'; +import { mapActions, mapState, mapGetters } from 'vuex'; import IdeSidebar from './ide_side_bar.vue'; import RepoTabs from './repo_tabs.vue'; import IdeStatusBar from './ide_status_bar.vue'; @@ -32,34 +32,40 @@ export default { ]), ...mapGetters(['activeFile', 'hasChanges']), }, + methods: { + ...mapActions(['toggleFileFinder']), + mousetrapStopCallback(e, el, combo) { + if (combo === 't' && el.classList.contains('dropdown-input-field')) { + return true; + } else if (combo === 'command+p' || combo === 'ctrl+p') { + return false; + } + + return originalStopCallback(e, el, combo); + }, + }, mounted() { const returnValue = 'Are you sure you want to lose unsaved changes?'; window.onbeforeunload = e => { if (!this.changedFiles.length) return undefined; - Mousetrap.bind(['t', 'command+p', 'ctrl+p'], e => { - if (e.preventDefault) { - e.preventDefault(); - } - - this.toggleFileFinder(!this.fileFindVisible); + Object.assign(e, { + returnValue, }); + return returnValue; + }; - Mousetrap.stopCallback = (e, el, combo) => this.mousetrapStopCallback(e, el, combo); - }, - methods: { - ...mapActions(['toggleFileFinder']), - mousetrapStopCallback(e, el, combo) { - if (combo === 't' && el.classList.contains('dropdown-input-field')) { - return true; - } else if (combo === 'command+p' || combo === 'ctrl+p') { - return false; - } + Mousetrap.bind(['t', 'command+p', 'ctrl+p'], e => { + if (e.preventDefault) { + e.preventDefault(); + } - return originalStopCallback(e, el, combo); - }, - }, - }; + this.toggleFileFinder(!this.fileFindVisible); + }); + + Mousetrap.stopCallback = (e, el, combo) => this.mousetrapStopCallback(e, el, combo); + }, +}; </script> <template> diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 5254a4d0c76..fa918283d2d 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -55,6 +55,7 @@ white-space: nowrap; text-overflow: ellipsis; max-width: inherit; + line-height: 22px; svg { vertical-align: middle; |