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
c63f510d
Commit
c63f510d
authored
Apr 28, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update environment item action buttons icons
parent
9267ef0b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
34 deletions
+39
-34
app/assets/javascripts/environments/components/environment_actions.vue
...vascripts/environments/components/environment_actions.vue
+10
-8
app/assets/javascripts/environments/components/environment_external_url.vue
...ipts/environments/components/environment_external_url.vue
+8
-6
app/assets/javascripts/environments/components/environment_monitoring.vue
...cripts/environments/components/environment_monitoring.vue
+8
-7
app/assets/javascripts/environments/components/environment_rollback.vue
...ascripts/environments/components/environment_rollback.vue
+0
-3
app/assets/javascripts/environments/components/environment_terminal_button.vue
...s/environments/components/environment_terminal_button.vue
+8
-10
changelogs/unreleased/update-environment-item-action-buttons-icons.yml
...released/update-environment-item-action-buttons-icons.yml
+5
-0
No files found.
app/assets/javascripts/environments/components/environment_actions.vue
View file @
c63f510d
<
script
>
<
script
>
import
playIconSvg
from
'
icons/_icon_play.svg
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
...
@@ -8,9 +8,9 @@
...
@@ -8,9 +8,9 @@
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
components
:
{
components
:
{
loadingIcon
,
loadingIcon
,
Icon
,
},
},
props
:
{
props
:
{
actions
:
{
actions
:
{
...
@@ -19,20 +19,16 @@
...
@@ -19,20 +19,16 @@
default
:
()
=>
[],
default
:
()
=>
[],
},
},
},
},
data
()
{
data
()
{
return
{
return
{
playIconSvg
,
isLoading
:
false
,
isLoading
:
false
,
};
};
},
},
computed
:
{
computed
:
{
title
()
{
title
()
{
return
'
Deploy to...
'
;
return
'
Deploy to...
'
;
},
},
},
},
methods
:
{
methods
:
{
onClickAction
(
endpoint
)
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
...
@@ -65,7 +61,10 @@
...
@@ -65,7 +61,10 @@
:disabled=
"isLoading"
:disabled=
"isLoading"
>
>
<span>
<span>
<span
v-html=
"playIconSvg"
></span>
<icon
name=
"play"
:size=
"12"
/>
<i
<i
class=
"fa fa-caret-down"
class=
"fa fa-caret-down"
aria-hidden=
"true"
aria-hidden=
"true"
...
@@ -86,7 +85,10 @@
...
@@ -86,7 +85,10 @@
:class=
"
{ disabled: isActionDisabled(action) }"
:class=
"
{ disabled: isActionDisabled(action) }"
:disabled="isActionDisabled(action)"
:disabled="isActionDisabled(action)"
>
>
<span
v-html=
"playIconSvg"
></span>
<icon
name=
"play"
:size=
"12"
/>
<span>
<span>
{{
action
.
name
}}
{{
action
.
name
}}
</span>
</span>
...
...
app/assets/javascripts/environments/components/environment_external_url.vue
View file @
c63f510d
<
script
>
<
script
>
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
{
s__
}
from
'
../../locale
'
;
import
{
s__
}
from
'
../../locale
'
;
...
@@ -6,6 +7,9 @@
...
@@ -6,6 +7,9 @@
* Renders the external url link in environments table.
* Renders the external url link in environments table.
*/
*/
export
default
{
export
default
{
components
:
{
Icon
,
},
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
...
@@ -15,7 +19,6 @@
...
@@ -15,7 +19,6 @@
required
:
true
,
required
:
true
,
},
},
},
},
computed
:
{
computed
:
{
title
()
{
title
()
{
return
s__
(
'
Environments|Open
'
);
return
s__
(
'
Environments|Open
'
);
...
@@ -34,10 +37,9 @@
...
@@ -34,10 +37,9 @@
:aria-label=
"title"
:aria-label=
"title"
:href=
"externalUrl"
:href=
"externalUrl"
>
>
<i
<icon
class=
"fa fa-external-link"
name=
"external-link"
aria-hidden=
"true"
:size=
"12"
>
/>
</i>
</a>
</a>
</
template
>
</
template
>
app/assets/javascripts/environments/components/environment_monitoring.vue
View file @
c63f510d
...
@@ -2,20 +2,22 @@
...
@@ -2,20 +2,22 @@
/**
/**
* Renders the Monitoring (Metrics) link in environments table.
* Renders the Monitoring (Metrics) link in environments table.
*/
*/
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
export
default
{
components
:
{
Icon
,
},
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
props
:
{
props
:
{
monitoringUrl
:
{
monitoringUrl
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
},
},
computed
:
{
computed
:
{
title
()
{
title
()
{
return
'
Monitoring
'
;
return
'
Monitoring
'
;
...
@@ -33,10 +35,9 @@
...
@@ -33,10 +35,9 @@
:title=
"title"
:title=
"title"
:aria-label=
"title"
:aria-label=
"title"
>
>
<i
<icon
class=
"fa fa-area-chart"
name=
"chart"
aria-hidden=
"true"
:size=
"12"
>
/>
</i>
</a>
</a>
</
template
>
</
template
>
app/assets/javascripts/environments/components/environment_rollback.vue
View file @
c63f510d
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
components
:
{
components
:
{
loadingIcon
,
loadingIcon
,
},
},
props
:
{
props
:
{
retryUrl
:
{
retryUrl
:
{
type
:
String
,
type
:
String
,
...
@@ -24,13 +23,11 @@
...
@@ -24,13 +23,11 @@
default
:
true
,
default
:
true
,
},
},
},
},
data
()
{
data
()
{
return
{
return
{
isLoading
:
false
,
isLoading
:
false
,
};
};
},
},
methods
:
{
methods
:
{
onClick
()
{
onClick
()
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
...
...
app/assets/javascripts/environments/components/environment_terminal_button.vue
View file @
c63f510d
...
@@ -3,14 +3,16 @@
...
@@ -3,14 +3,16 @@
* Renders a terminal button to open a web terminal.
* Renders a terminal button to open a web terminal.
* Used in environments table.
* Used in environments table.
*/
*/
import
terminalIconSvg
from
'
icons/_icon_terminal.svg
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
export
default
{
components
:
{
Icon
,
},
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
props
:
{
props
:
{
terminalPath
:
{
terminalPath
:
{
type
:
String
,
type
:
String
,
...
@@ -18,13 +20,6 @@
...
@@ -18,13 +20,6 @@
default
:
''
,
default
:
''
,
},
},
},
},
data
()
{
return
{
terminalIconSvg
,
};
},
computed
:
{
computed
:
{
title
()
{
title
()
{
return
'
Terminal
'
;
return
'
Terminal
'
;
...
@@ -40,7 +35,10 @@
...
@@ -40,7 +35,10 @@
:title=
"title"
:title=
"title"
:aria-label=
"title"
:aria-label=
"title"
:href=
"terminalPath"
:href=
"terminalPath"
v-html=
"terminalIconSvg"
>
>
<icon
name=
"terminal"
:size=
"12"
/>
</a>
</a>
</
template
>
</
template
>
changelogs/unreleased/update-environment-item-action-buttons-icons.yml
0 → 100644
View file @
c63f510d
---
title
:
Update environment item action buttons icons
merge_request
:
18632
author
:
George Tsiolis
type
:
changed
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