updated styling

fixed merge request text not always appearing
This commit is contained in:
Phil Hughes 2018-05-03 11:26:18 +01:00
parent 129dd18535
commit 9644ed8221
No known key found for this signature in database
GPG key ID: 32245528C52E0F9F
4 changed files with 19 additions and 12 deletions

View file

@ -30,7 +30,6 @@ export default {
<template>
<div
class="dropdown"
style="margin-left:auto;"
>
<button
type="button"

View file

@ -13,7 +13,9 @@ export default {
...mapState(['viewer']),
},
mounted() {
this.$nextTick(() => {
this.updateViewer(this.currentMergeRequest ? 'mrdiff' : 'diff');
});
},
methods: {
...mapActions(['updateViewer']),
@ -51,11 +53,3 @@ export default {
</template>
</ide-tree-list>
</template>
<style>
.ide-review-button-holder {
display: flex;
width: 100%;
align-items: center;
}
</style>

View file

@ -102,14 +102,14 @@ router.beforeEach((to, from, next) => {
throw e;
});
} else if (to.params.mrid) {
store.dispatch('updateActivityBarView', activityBarViews.review);
store
.dispatch('getMergeRequestData', {
projectId: fullProjectId,
mergeRequestId: to.params.mrid,
})
.then(mr => {
store.dispatch('updateActivityBarView', activityBarViews.review);
store.dispatch('getBranchData', {
projectId: fullProjectId,
branchId: mr.source_branch,

View file

@ -972,6 +972,14 @@
.ide-review-header {
flex-direction: column;
align-items: flex-start;
.dropdown {
margin-left: auto;
}
a {
color: $gl-link-color;
}
}
.ide-review-sub-header {
@ -981,3 +989,9 @@
.ide-new-modal-label {
line-height: 34px;
}
.ide-review-button-holder {
display: flex;
width: 100%;
align-items: center;
}