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
Léo-Paul Géneau
gitlab-ce
Commits
a623ddb0
Commit
a623ddb0
authored
Nov 16, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced download icon for the sprite based one
parent
c034594f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
11 deletions
+17
-11
app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
.../javascripts/pipelines/components/pipelines_artifacts.vue
+7
-4
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
...s/vue_merge_request_widget/components/mr_widget_header.js
+5
-2
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+1
-1
app/views/projects/artifacts/browse.html.haml
app/views/projects/artifacts/browse.html.haml
+1
-1
app/views/projects/blob/viewers/_download.html.haml
app/views/projects/blob/viewers/_download.html.haml
+1
-1
app/views/projects/buttons/_download.html.haml
app/views/projects/buttons/_download.html.haml
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
No files found.
app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
View file @
a623ddb0
<
script
>
<
script
>
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
Icon
from
'
../../vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -11,6 +12,9 @@
...
@@ -11,6 +12,9 @@
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
components
:
{
Icon
,
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
@@ -24,10 +28,9 @@
...
@@ -24,10 +28,9 @@
data-placement=
"top"
data-placement=
"top"
data-toggle=
"dropdown"
data-toggle=
"dropdown"
aria-label=
"Artifacts"
>
aria-label=
"Artifacts"
>
<i
<icon
class=
"fa fa-download"
name=
"download"
>
aria-hidden=
"true"
>
</icon>
</i>
<i
<i
class=
"fa fa-caret-down"
class=
"fa fa-caret-down"
aria-hidden=
"true"
>
aria-hidden=
"true"
>
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
View file @
a623ddb0
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
'
;
export
default
{
export
default
{
name
:
'
MRWidgetHeader
'
,
name
:
'
MRWidgetHeader
'
,
...
@@ -25,6 +26,9 @@ export default {
...
@@ -25,6 +26,9 @@ export default {
gfm
:
`\`
${
this
.
mr
.
sourceBranch
}
\``
,
gfm
:
`\`
${
this
.
mr
.
sourceBranch
}
\``
,
});
});
},
},
downloadIcon
()
{
return
spriteIcon
(
'
download
'
);
},
},
},
methods
:
{
methods
:
{
isBranchTitleLong
(
branchTitle
)
{
isBranchTitleLong
(
branchTitle
)
{
...
@@ -82,8 +86,7 @@ export default {
...
@@ -82,8 +86,7 @@ export default {
aria-label="Download as"
aria-label="Download as"
role="button">
role="button">
<i
<i
class="fa fa-download"
v-html="downloadIcon">
aria-hidden="true">
</i>
</i>
<i
<i
class="fa fa-caret-down"
class="fa fa-caret-down"
...
...
app/helpers/blob_helper.rb
View file @
a623ddb0
...
@@ -232,7 +232,7 @@ module BlobHelper
...
@@ -232,7 +232,7 @@ module BlobHelper
return
if
blob
.
empty?
return
if
blob
.
empty?
if
blob
.
raw_binary?
||
blob
.
stored_externally?
if
blob
.
raw_binary?
||
blob
.
stored_externally?
icon
=
icon
(
'download'
)
icon
=
sprite_
icon
(
'download'
)
title
=
'Download'
title
=
'Download'
else
else
icon
=
icon
(
'file-code-o'
)
icon
=
icon
(
'file-code-o'
)
...
...
app/views/projects/artifacts/browse.html.haml
View file @
a623ddb0
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.tree-controls
.tree-controls
=
link_to
download_project_job_artifacts_path
(
@project
,
@build
),
=
link_to
download_project_job_artifacts_path
(
@project
,
@build
),
rel:
'nofollow'
,
download:
''
,
class:
'btn btn-default download'
do
rel:
'nofollow'
,
download:
''
,
class:
'btn btn-default download'
do
=
icon
(
'download'
)
=
sprite_
icon
(
'download'
)
Download artifacts archive
Download artifacts archive
.tree-content-holder
.tree-content-holder
...
...
app/views/projects/blob/viewers/_download.html.haml
View file @
a623ddb0
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
.center.render-error.vertical-center
.center.render-error.vertical-center
=
link_to
blob_raw_path
do
=
link_to
blob_raw_path
do
%h1
.light
%h1
.light
=
icon
(
'download'
)
=
sprite_
icon
(
'download'
)
%h4
%h4
Download (
#{
number_to_human_size
(
viewer
.
blob
.
raw_size
)
}
)
Download (
#{
number_to_human_size
(
viewer
.
blob
.
raw_size
)
}
)
app/views/projects/buttons/_download.html.haml
View file @
a623ddb0
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
if
!
project
.
empty_repo?
&&
can?
(
current_user
,
:download_code
,
project
)
-
if
!
project
.
empty_repo?
&&
can?
(
current_user
,
:download_code
,
project
)
.project-action-button.dropdown.inline
>
.project-action-button.dropdown.inline
>
%button
.btn.has-tooltip
{
title:
s_
(
'DownloadSource|Download'
),
'data-toggle'
=>
'dropdown'
,
'aria-label'
=>
s_
(
'DownloadSource|Download'
)
}
%button
.btn.has-tooltip
{
title:
s_
(
'DownloadSource|Download'
),
'data-toggle'
=>
'dropdown'
,
'aria-label'
=>
s_
(
'DownloadSource|Download'
)
}
=
icon
(
'download'
)
=
sprite_
icon
(
'download'
)
=
icon
(
"caret-down"
)
=
icon
(
"caret-down"
)
%span
.sr-only
=
_
(
'Select Archive Format'
)
%span
.sr-only
=
_
(
'Select Archive Format'
)
%ul
.dropdown-menu.dropdown-menu-align-right
{
role:
'menu'
}
%ul
.dropdown-menu.dropdown-menu-align-right
{
role:
'menu'
}
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
a623ddb0
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
.pull-right
.pull-right
-
if
can?
(
current_user
,
:read_build
,
job
)
&&
job
.
artifacts?
-
if
can?
(
current_user
,
:read_build
,
job
)
&&
job
.
artifacts?
=
link_to
download_project_job_artifacts_path
(
job
.
project
,
job
),
rel:
'nofollow'
,
download:
''
,
title:
'Download artifacts'
,
class:
'btn btn-build'
do
=
link_to
download_project_job_artifacts_path
(
job
.
project
,
job
),
rel:
'nofollow'
,
download:
''
,
title:
'Download artifacts'
,
class:
'btn btn-build'
do
=
icon
(
'download'
)
=
sprite_
icon
(
'download'
)
-
if
can?
(
current_user
,
:update_build
,
job
)
-
if
can?
(
current_user
,
:update_build
,
job
)
-
if
job
.
active?
-
if
job
.
active?
=
link_to
cancel_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Cancel'
,
class:
'btn btn-build'
do
=
link_to
cancel_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Cancel'
,
class:
'btn btn-build'
do
...
...
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