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
4731eba4
Commit
4731eba4
authored
7 years ago
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Action Icons
parent
d01d509b
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
20 additions
and
25 deletions
+20
-25
app/assets/javascripts/pipelines/components/graph/action_component.vue
...vascripts/pipelines/components/graph/action_component.vue
+3
-9
app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
.../pipelines/components/graph/dropdown_action_component.vue
+1
-9
app/assets/javascripts/vue_shared/components/icon.vue
app/assets/javascripts/vue_shared/components/icon.vue
+1
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+9
-0
lib/gitlab/ci/status/build/cancelable.rb
lib/gitlab/ci/status/build/cancelable.rb
+1
-1
lib/gitlab/ci/status/build/failed_allowed.rb
lib/gitlab/ci/status/build/failed_allowed.rb
+1
-1
lib/gitlab/ci/status/build/play.rb
lib/gitlab/ci/status/build/play.rb
+1
-1
lib/gitlab/ci/status/build/retryable.rb
lib/gitlab/ci/status/build/retryable.rb
+1
-1
lib/gitlab/ci/status/build/stop.rb
lib/gitlab/ci/status/build/stop.rb
+1
-1
spec/javascripts/pipelines/graph/dropdown_action_component_spec.js
...scripts/pipelines/graph/dropdown_action_component_spec.js
+1
-1
No files found.
app/assets/javascripts/pipelines/components/graph/action_component.vue
View file @
4731eba4
<
script
>
<
script
>
import
getActionIcon
from
'
../../../vue_shared/ci_action_icons
'
;
import
tooltip
from
'
../../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../../vue_shared/directives/tooltip
'
;
import
icon
from
'
../../../vue_shared/components/icon.vue
'
;
import
icon
from
'
../../../vue_shared/components/icon.vue
'
;
...
@@ -39,12 +38,8 @@
...
@@ -39,12 +38,8 @@
},
},
computed
:
{
computed
:
{
actionIconSvg
()
{
return
getActionIcon
(
this
.
actionIcon
);
},
cssClass
()
{
cssClass
()
{
return
`js-
${
gl
.
text
.
dasherize
(
this
.
actionIcon
)}
`
;
return
`
${
gl
.
text
.
dasherize
(
this
.
actionIcon
)}
js-
${
gl
.
text
.
dasherize
(
this
.
actionIcon
)}
`
;
},
},
},
},
};
};
...
@@ -59,7 +54,6 @@
...
@@ -59,7 +54,6 @@
:class=
"cssClass"
:class=
"cssClass"
data-container=
"body"
>
data-container=
"body"
>
<icon
<icon
name=
"stop"
:name=
"actionIcon"
/>
size=
"16"
/>
</a>
</a>
</
template
>
</
template
>
This diff is collapsed.
Click to expand it.
app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
View file @
4731eba4
...
@@ -37,13 +37,6 @@
...
@@ -37,13 +37,6 @@
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
computed
:
{
actionIconSvg
()
{
alert
(
'
LA
'
);
return
getActionIcon
(
this
.
actionIcon
);
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
@@ -56,8 +49,7 @@
...
@@ -56,8 +49,7 @@
class=
"ci-action-icon-wrapper js-ci-status-icon"
class=
"ci-action-icon-wrapper js-ci-status-icon"
data-container=
"body"
data-container=
"body"
aria-label=
"Job's action"
>
aria-label=
"Job's action"
>
{{
actionIcon
}}
<icon
<icon
name=
"retry
"
/>
:name=
"actionIcon
"
/>
</a>
</a>
</
template
>
</
template
>
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_shared/components/icon.vue
View file @
4731eba4
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
},
},
fullCssClass
()
{
fullCssClass
()
{
let
classString
=
''
||
this
.
cssClass
;
let
classString
=
''
||
this
.
cssClass
;
//
if (this.size) classString += `s${this.size}`
if
(
this
.
size
)
classString
+=
`s
${
this
.
size
}
`
return
classString
;
return
classString
;
},
},
},
},
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/pipelines.scss
View file @
4731eba4
...
@@ -734,6 +734,15 @@ button.mini-pipeline-graph-dropdown-toggle {
...
@@ -734,6 +734,15 @@ button.mini-pipeline-graph-dropdown-toggle {
&
:focus
svg
{
&
:focus
svg
{
fill
:
$gl-text-color
;
fill
:
$gl-text-color
;
}
}
&
.icon-action-retry
,
&
.icon-action-play
{
svg
{
width
:
calc
(
$ci-action-icon-size-6
);
height
:
calc
(
$ci-action-icon-size-6
);
left
:
8px
;
}
}
}
}
// link to the build
// link to the build
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ci/status/build/cancelable.rb
View file @
4731eba4
...
@@ -8,7 +8,7 @@ module Gitlab
...
@@ -8,7 +8,7 @@ module Gitlab
end
end
def
action_icon
def
action_icon
'
icon_action_
cancel'
'cancel'
end
end
def
action_path
def
action_path
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ci/status/build/failed_allowed.rb
View file @
4731eba4
...
@@ -8,7 +8,7 @@ module Gitlab
...
@@ -8,7 +8,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_status_
warning'
'warning'
end
end
def
group
def
group
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ci/status/build/play.rb
View file @
4731eba4
...
@@ -12,7 +12,7 @@ module Gitlab
...
@@ -12,7 +12,7 @@ module Gitlab
end
end
def
action_icon
def
action_icon
'
icon_action_
play'
'play'
end
end
def
action_title
def
action_title
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ci/status/build/retryable.rb
View file @
4731eba4
...
@@ -8,7 +8,7 @@ module Gitlab
...
@@ -8,7 +8,7 @@ module Gitlab
end
end
def
action_icon
def
action_icon
'
icon_action_
retry'
'retry'
end
end
def
action_title
def
action_title
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ci/status/build/stop.rb
View file @
4731eba4
...
@@ -12,7 +12,7 @@ module Gitlab
...
@@ -12,7 +12,7 @@ module Gitlab
end
end
def
action_icon
def
action_icon
'
icon_action_
stop'
'stop'
end
end
def
action_title
def
action_title
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/pipelines/graph/dropdown_action_component_spec.js
View file @
4731eba4
...
@@ -11,7 +11,7 @@ describe('action component', () => {
...
@@ -11,7 +11,7 @@ describe('action component', () => {
tooltipText
:
'
bar
'
,
tooltipText
:
'
bar
'
,
link
:
'
foo
'
,
link
:
'
foo
'
,
actionMethod
:
'
post
'
,
actionMethod
:
'
post
'
,
actionIcon
:
'
icon_action_
cancel
'
,
actionIcon
:
'
cancel
'
,
},
},
}).
$mount
();
}).
$mount
();
...
...
This diff is collapsed.
Click to expand it.
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