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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
4223beff
Commit
4223beff
authored
Jun 06, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed a link into a button
i18n
parent
5372c2e8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
14 deletions
+23
-14
app/assets/javascripts/ide/components/ide_review.vue
app/assets/javascripts/ide/components/ide_review.vue
+5
-1
app/assets/javascripts/ide/components/ide_side_bar.vue
app/assets/javascripts/ide/components/ide_side_bar.vue
+3
-4
app/assets/javascripts/ide/components/merge_requests/list.vue
...assets/javascripts/ide/components/merge_requests/list.vue
+1
-1
app/assets/stylesheets/framework/contextual_sidebar.scss
app/assets/stylesheets/framework/contextual_sidebar.scss
+8
-2
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+6
-6
No files found.
app/assets/javascripts/ide/components/ide_review.vue
View file @
4223beff
...
@@ -18,6 +18,9 @@ export default {
...
@@ -18,6 +18,9 @@ export default {
showMergeRequestText
()
{
showMergeRequestText
()
{
return
this
.
currentMergeRequestId
&&
this
.
viewer
===
viewerTypes
.
mr
;
return
this
.
currentMergeRequestId
&&
this
.
viewer
===
viewerTypes
.
mr
;
},
},
mergeRequestId
()
{
return
`!
${
this
.
currentMergeRequest
.
iid
}
`
;
},
},
},
mounted
()
{
mounted
()
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
...
@@ -57,7 +60,8 @@ export default {
...
@@ -57,7 +60,8 @@ export default {
(
<a
(
<a
v-if=
"currentMergeRequest"
v-if=
"currentMergeRequest"
:href=
"currentMergeRequest.web_url"
:href=
"currentMergeRequest.web_url"
>
!
{{
currentMergeRequest
.
iid
}}
</a>
)
v-text=
"mergeRequestId"
></a>
)
</
template
>
</
template
>
</div>
</div>
</template>
</template>
...
...
app/assets/javascripts/ide/components/ide_side_bar.vue
View file @
4223beff
...
@@ -127,9 +127,8 @@ export default {
...
@@ -127,9 +127,8 @@ export default {
class=
"context-header ide-context-header dropdown"
class=
"context-header ide-context-header dropdown"
ref=
"mergeRequestDropdown"
ref=
"mergeRequestDropdown"
>
>
<a
<button
href=
"#"
type=
"button"
role=
"button"
data-toggle=
"dropdown"
data-toggle=
"dropdown"
>
>
<div
<div
...
@@ -185,7 +184,7 @@ export default {
...
@@ -185,7 +184,7 @@ export default {
class=
"ml-auto"
class=
"ml-auto"
name=
"chevron-down"
name=
"chevron-down"
/>
/>
</
a
>
</
button
>
<merge-request-dropdown
<merge-request-dropdown
:show=
"showMergeRequestsDropdown"
:show=
"showMergeRequestsDropdown"
/>
/>
...
...
app/assets/javascripts/ide/components/merge_requests/list.vue
View file @
4223beff
...
@@ -82,7 +82,7 @@ export default {
...
@@ -82,7 +82,7 @@ export default {
<input
<input
type=
"search"
type=
"search"
class=
"dropdown-input-field"
class=
"dropdown-input-field"
placeholder=
"Search merge requests
"
:placeholder=
"__('Search merge requests')
"
v-model=
"search"
v-model=
"search"
@
input=
"searchMergeRequests"
@
input=
"searchMergeRequests"
ref=
"searchInput"
ref=
"searchInput"
...
...
app/assets/stylesheets/framework/contextual_sidebar.scss
View file @
4223beff
...
@@ -26,18 +26,24 @@
...
@@ -26,18 +26,24 @@
margin-right
:
2px
;
margin-right
:
2px
;
width
:
$contextual-sidebar-width
;
width
:
$contextual-sidebar-width
;
a
{
>
a
,
>
button
{
transition
:
padding
$sidebar-transition-duration
;
transition
:
padding
$sidebar-transition-duration
;
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
display
:
flex
;
display
:
flex
;
width
:
100%
;
align-items
:
center
;
align-items
:
center
;
padding
:
10px
16px
10px
10px
;
padding
:
10px
16px
10px
10px
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
background-color
:
transparent
;
border
:
0
;
text-align
:
left
;
&
:hover
,
&
:hover
,
a
:hover
{
&
:focus
{
background-color
:
$link-hover-background
;
background-color
:
$link-hover-background
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
outline
:
0
;
}
}
}
}
...
...
app/assets/stylesheets/pages/repo.scss
View file @
4223beff
...
@@ -458,14 +458,10 @@
...
@@ -458,14 +458,10 @@
width
:
auto
;
width
:
auto
;
margin-right
:
0
;
margin-right
:
0
;
a
{
>
a
,
>
button
{
height
:
60px
;
height
:
60px
;
}
}
a
:hover
,
a
:focus
{
text-decoration
:
none
;
}
}
}
.projects-sidebar
{
.projects-sidebar
{
...
@@ -1302,6 +1298,10 @@
...
@@ -1302,6 +1298,10 @@
.dropdown-input
{
.dropdown-input
{
padding-left
:
$gl-padding
;
padding-left
:
$gl-padding
;
padding-right
:
$gl-padding
;
padding-right
:
$gl-padding
;
.fa
{
right
:
26px
;
}
}
}
.btn-link
{
.btn-link
{
...
...
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