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
1e8de503
Commit
1e8de503
authored
Dec 01, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replaced some fork icons instances and fixed the Icon component on the MR Widget
parent
a623ddb0
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
12 deletions
+25
-12
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
...s/vue_merge_request_widget/components/mr_widget_header.js
+7
-7
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+6
-0
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+6
-0
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+1
-1
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+2
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
View file @
1e8de503
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
{
pluralize
}
from
'
../../lib/utils/text_utility
'
;
import
{
pluralize
}
from
'
../../lib/utils/text_utility
'
;
import
{
spriteIcon
}
from
'
../../lib/utils/common_utils
'
;
import
Icon
from
'
../../vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
name
:
'
MRWidgetHeader
'
,
name
:
'
MRWidgetHeader
'
,
...
@@ -10,6 +10,9 @@ export default {
...
@@ -10,6 +10,9 @@ export default {
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
components
:
{
Icon
,
},
computed
:
{
computed
:
{
shouldShowCommitsBehindText
()
{
shouldShowCommitsBehindText
()
{
return
this
.
mr
.
divergedCommitsCount
>
0
;
return
this
.
mr
.
divergedCommitsCount
>
0
;
...
@@ -26,9 +29,6 @@ export default {
...
@@ -26,9 +29,6 @@ export default {
gfm
:
`\`
${
this
.
mr
.
sourceBranch
}
\``
,
gfm
:
`\`
${
this
.
mr
.
sourceBranch
}
\``
,
});
});
},
},
downloadIcon
()
{
return
spriteIcon
(
'
download
'
);
},
},
},
methods
:
{
methods
:
{
isBranchTitleLong
(
branchTitle
)
{
isBranchTitleLong
(
branchTitle
)
{
...
@@ -85,9 +85,9 @@ export default {
...
@@ -85,9 +85,9 @@ export default {
data-toggle="dropdown"
data-toggle="dropdown"
aria-label="Download as"
aria-label="Download as"
role="button">
role="button">
<i
<i
con
v-html="downloadIcon
">
name="download
">
</i>
</i
con
>
<i
<i
class="fa fa-caret-down"
class="fa fa-caret-down"
aria-hidden="true">
aria-hidden="true">
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
1e8de503
...
@@ -723,3 +723,9 @@
...
@@ -723,3 +723,9 @@
font-size
:
16px
;
font-size
:
16px
;
}
}
}
}
.fork-sprite
{
width
:
12px
;
height
:
12px
;
margin-right
:
-5px
;
}
app/assets/stylesheets/pages/pipelines.scss
View file @
1e8de503
...
@@ -143,6 +143,12 @@
...
@@ -143,6 +143,12 @@
fill
:
$gl-text-color-secondary
;
fill
:
$gl-text-color-secondary
;
}
}
.sprite
{
width
:
12px
;
height
:
12px
;
fill
:
$gl-text-color
;
}
.fa
{
.fa
{
font-size
:
12px
;
font-size
:
12px
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
...
...
app/views/projects/blob/_editor.html.haml
View file @
1e8de503
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.file-holder-bottom-radius.file-holder.file.append-bottom-default
.file-holder-bottom-radius.file-holder.file.append-bottom-default
.js-file-title.file-title.clearfix
{
data:
{
current_action:
action
}
}
.js-file-title.file-title.clearfix
{
data:
{
current_action:
action
}
}
.editor-ref
.editor-ref
=
icon
(
'code-
fork'
)
=
sprite_icon
(
'
fork'
)
=
ref
=
ref
%span
.editor-file-name
%span
.editor-file-name
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
...
...
app/views/projects/branches/_branch.html.haml
View file @
1e8de503
...
@@ -8,7 +8,8 @@
...
@@ -8,7 +8,8 @@
%li
{
class:
"js-branch-#{branch.name}"
}
%li
{
class:
"js-branch-#{branch.name}"
}
%div
%div
=
link_to
project_tree_path
(
@project
,
branch
.
name
),
class:
'item-title str-truncated ref-name'
do
=
link_to
project_tree_path
(
@project
,
branch
.
name
),
class:
'item-title str-truncated ref-name'
do
=
icon
(
'code-fork'
,
class:
'append-right-5'
)
+
"
#{
branch
.
name
}
"
=
sprite_icon
(
'fork'
,
size:
8
)
=
branch
.
name
-
if
branch
.
name
==
@repository
.
root_ref
-
if
branch
.
name
==
@repository
.
root_ref
%span
.label.label-primary
default
%span
.label.label-primary
default
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
1e8de503
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
-
if
ref
-
if
ref
-
if
job
.
ref
-
if
job
.
ref
.icon-container
.icon-container
=
job
.
tag?
?
icon
(
'tag'
)
:
icon
(
'code-fork
'
)
=
job
.
tag?
?
icon
(
'tag'
)
:
sprite_icon
(
'fork'
,
css_class:
'sprite
'
)
=
link_to
job
.
ref
,
project_ref_path
(
job
.
project
,
job
.
ref
),
class:
"ref-name"
=
link_to
job
.
ref
,
project_ref_path
(
job
.
project
,
job
.
ref
),
class:
"ref-name"
-
else
-
else
.light
none
.light
none
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
1e8de503
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
%span
.project-ref-path
%span
.project-ref-path
=
link_to
project_ref_path
(
merge_request
.
project
,
merge_request
.
target_branch
),
class:
'ref-name'
do
=
link_to
project_ref_path
(
merge_request
.
project
,
merge_request
.
target_branch
),
class:
'ref-name'
do
=
icon
(
'code-fork
'
)
=
sprite_icon
(
'fork'
,
css_class:
'fork-sprite
'
)
=
merge_request
.
target_branch
=
merge_request
.
target_branch
-
if
merge_request
.
labels
.
any?
-
if
merge_request
.
labels
.
any?
...
...
app/views/shared/projects/_project.html.haml
View file @
1e8de503
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
=
render_project_pipeline_status
(
project
.
pipeline_status
)
=
render_project_pipeline_status
(
project
.
pipeline_status
)
-
if
forks
-
if
forks
%span
.prepend-left-10
%span
.prepend-left-10
=
icon
(
'code-
fork'
)
=
sprite_icon
(
'
fork'
)
=
number_with_delimiter
(
project
.
forks_count
)
=
number_with_delimiter
(
project
.
forks_count
)
-
if
stars
-
if
stars
%span
.prepend-left-10
%span
.prepend-left-10
...
...
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