diff options
author | Phil Hughes <me@iamphill.com> | 2018-06-05 16:36:45 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-06 11:19:29 +0100 |
commit | 64360f4f63d471bb391f8d3deecff9e6744d43fb (patch) | |
tree | a17efc24a178332e15384c7aea24178b64587c89 | |
parent | 95b3ff056fb9edabef6c512c5de353c5c4a8bcb3 (diff) | |
download | gitlab-ce-64360f4f63d471bb391f8d3deecff9e6744d43fb.tar.gz |
move styles out of components
5 files changed, 20 insertions, 25 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/dropdown.vue b/app/assets/javascripts/ide/components/merge_requests/dropdown.vue index 6dc5cb1d977..5e29712a8df 100644 --- a/app/assets/javascripts/ide/components/merge_requests/dropdown.vue +++ b/app/assets/javascripts/ide/components/merge_requests/dropdown.vue @@ -25,7 +25,7 @@ export default { </script> <template> - <div class="dropdown-menu ide-merge-requests-dropdown"> + <div class="dropdown-menu ide-merge-requests-dropdown p-0"> <tabs stop-propagation> <tab active> <template slot="title"> @@ -56,11 +56,3 @@ export default { </tabs> </div> </template> - -<style scoped> -.dropdown-menu { - width: 350px; - padding: 0; - max-height: initial !important; -} -</style> diff --git a/app/assets/javascripts/ide/components/merge_requests/item.vue b/app/assets/javascripts/ide/components/merge_requests/item.vue index 0ae35ffca6c..89f71fcb325 100644 --- a/app/assets/javascripts/ide/components/merge_requests/item.vue +++ b/app/assets/javascripts/ide/components/merge_requests/item.vue @@ -44,10 +44,7 @@ export default { class="btn-link d-flex align-items-center" @click.prevent.stop="clickItem" > - <span - class="d-flex append-right-default" - style="min-width: 18px" - > + <span class="d-flex append-right-default ide-merge-request-current-icon"> <icon v-if="isActive" name="mobile-issue-close" diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue index 233370692d6..77511de97af 100644 --- a/app/assets/javascripts/ide/components/merge_requests/list.vue +++ b/app/assets/javascripts/ide/components/merge_requests/list.vue @@ -132,14 +132,3 @@ export default { </div> </div> </template> - -<style scoped> -.ide-merge-requests-empty { - height: 230px; -} - -.ide-merge-requests-dropdown-content { - min-height: 230px; - max-height: 470px; -} -</style> diff --git a/app/assets/javascripts/ide/index.js b/app/assets/javascripts/ide/index.js index 13fc1b6b731..2d74192e6b3 100644 --- a/app/assets/javascripts/ide/index.js +++ b/app/assets/javascripts/ide/index.js @@ -9,7 +9,6 @@ Vue.use(Translate); export function initIde(el) { if (!el) return null; - window.store = store; return new Vue({ el, diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 77ebd4d864d..b07e12c79e0 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -1135,6 +1135,11 @@ .avatar { flex: 0 0 40px; } + + .ide-merge-requests-dropdown.dropdown-menu { + width: 350px; + max-height: initial; + } } .ide-sidebar-project-title { @@ -1294,3 +1299,16 @@ } } } + +.ide-merge-request-current-icon { + min-width: 18px; +} + +.ide-merge-requests-empty { + height: 230px; +} + +.ide-merge-requests-dropdown-content { + min-height: 230px; + max-height: 470px; +} |