Commit 9644ed82 authored by Phil Hughes's avatar Phil Hughes

updated styling

fixed merge request text not always appearing
parent 129dd185
...@@ -30,7 +30,6 @@ export default { ...@@ -30,7 +30,6 @@ export default {
<template> <template>
<div <div
class="dropdown" class="dropdown"
style="margin-left:auto;"
> >
<button <button
type="button" type="button"
......
...@@ -13,7 +13,9 @@ export default { ...@@ -13,7 +13,9 @@ export default {
...mapState(['viewer']), ...mapState(['viewer']),
}, },
mounted() { mounted() {
this.$nextTick(() => {
this.updateViewer(this.currentMergeRequest ? 'mrdiff' : 'diff'); this.updateViewer(this.currentMergeRequest ? 'mrdiff' : 'diff');
});
}, },
methods: { methods: {
...mapActions(['updateViewer']), ...mapActions(['updateViewer']),
...@@ -51,11 +53,3 @@ export default { ...@@ -51,11 +53,3 @@ export default {
</template> </template>
</ide-tree-list> </ide-tree-list>
</template> </template>
<style>
.ide-review-button-holder {
display: flex;
width: 100%;
align-items: center;
}
</style>
...@@ -102,14 +102,14 @@ router.beforeEach((to, from, next) => { ...@@ -102,14 +102,14 @@ router.beforeEach((to, from, next) => {
throw e; throw e;
}); });
} else if (to.params.mrid) { } else if (to.params.mrid) {
store.dispatch('updateActivityBarView', activityBarViews.review);
store store
.dispatch('getMergeRequestData', { .dispatch('getMergeRequestData', {
projectId: fullProjectId, projectId: fullProjectId,
mergeRequestId: to.params.mrid, mergeRequestId: to.params.mrid,
}) })
.then(mr => { .then(mr => {
store.dispatch('updateActivityBarView', activityBarViews.review);
store.dispatch('getBranchData', { store.dispatch('getBranchData', {
projectId: fullProjectId, projectId: fullProjectId,
branchId: mr.source_branch, branchId: mr.source_branch,
......
...@@ -972,6 +972,14 @@ ...@@ -972,6 +972,14 @@
.ide-review-header { .ide-review-header {
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
.dropdown {
margin-left: auto;
}
a {
color: $gl-link-color;
}
} }
.ide-review-sub-header { .ide-review-sub-header {
...@@ -981,3 +989,9 @@ ...@@ -981,3 +989,9 @@
.ide-new-modal-label { .ide-new-modal-label {
line-height: 34px; line-height: 34px;
} }
.ide-review-button-holder {
display: flex;
width: 100%;
align-items: center;
}
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