Commit 64360f4f authored by Phil Hughes's avatar Phil Hughes

move styles out of components

parent 95b3ff05
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
</script> </script>
<template> <template>
<div class="dropdown-menu ide-merge-requests-dropdown"> <div class="dropdown-menu ide-merge-requests-dropdown p-0">
<tabs stop-propagation> <tabs stop-propagation>
<tab active> <tab active>
<template slot="title"> <template slot="title">
...@@ -56,11 +56,3 @@ export default { ...@@ -56,11 +56,3 @@ export default {
</tabs> </tabs>
</div> </div>
</template> </template>
<style scoped>
.dropdown-menu {
width: 350px;
padding: 0;
max-height: initial !important;
}
</style>
...@@ -44,10 +44,7 @@ export default { ...@@ -44,10 +44,7 @@ export default {
class="btn-link d-flex align-items-center" class="btn-link d-flex align-items-center"
@click.prevent.stop="clickItem" @click.prevent.stop="clickItem"
> >
<span <span class="d-flex append-right-default ide-merge-request-current-icon">
class="d-flex append-right-default"
style="min-width: 18px"
>
<icon <icon
v-if="isActive" v-if="isActive"
name="mobile-issue-close" name="mobile-issue-close"
......
...@@ -132,14 +132,3 @@ export default { ...@@ -132,14 +132,3 @@ export default {
</div> </div>
</div> </div>
</template> </template>
<style scoped>
.ide-merge-requests-empty {
height: 230px;
}
.ide-merge-requests-dropdown-content {
min-height: 230px;
max-height: 470px;
}
</style>
...@@ -9,7 +9,6 @@ Vue.use(Translate); ...@@ -9,7 +9,6 @@ Vue.use(Translate);
export function initIde(el) { export function initIde(el) {
if (!el) return null; if (!el) return null;
window.store = store;
return new Vue({ return new Vue({
el, el,
......
...@@ -1135,6 +1135,11 @@ ...@@ -1135,6 +1135,11 @@
.avatar { .avatar {
flex: 0 0 40px; flex: 0 0 40px;
} }
.ide-merge-requests-dropdown.dropdown-menu {
width: 350px;
max-height: initial;
}
} }
.ide-sidebar-project-title { .ide-sidebar-project-title {
...@@ -1294,3 +1299,16 @@ ...@@ -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;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment