Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9644ed82
Commit
9644ed82
authored
May 03, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated styling
fixed merge request text not always appearing
parent
129dd185
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
12 deletions
+19
-12
app/assets/javascripts/ide/components/editor_mode_dropdown.vue
...ssets/javascripts/ide/components/editor_mode_dropdown.vue
+0
-1
app/assets/javascripts/ide/components/ide_review.vue
app/assets/javascripts/ide/components/ide_review.vue
+3
-9
app/assets/javascripts/ide/ide_router.js
app/assets/javascripts/ide/ide_router.js
+2
-2
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+14
-0
No files found.
app/assets/javascripts/ide/components/editor_mode_dropdown.vue
View file @
9644ed82
...
@@ -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"
...
...
app/assets/javascripts/ide/components/ide_review.vue
View file @
9644ed82
...
@@ -13,7 +13,9 @@ export default {
...
@@ -13,7 +13,9 @@ export default {
...
mapState
([
'
viewer
'
]),
...
mapState
([
'
viewer
'
]),
},
},
mounted
()
{
mounted
()
{
this
.
updateViewer
(
this
.
currentMergeRequest
?
'
mrdiff
'
:
'
diff
'
);
this
.
$nextTick
(()
=>
{
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
>
app/assets/javascripts/ide/ide_router.js
View file @
9644ed82
...
@@ -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
,
...
...
app/assets/stylesheets/pages/repo.scss
View file @
9644ed82
...
@@ -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
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment