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
d041fe34
Commit
d041fe34
authored
Oct 21, 2020
by
Marcel Amirault
Committed by
Simon Knox
Oct 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update bootstrap buttons to GlButton
parent
08d6b67f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
app/assets/javascripts/ide/components/jobs/detail.vue
app/assets/javascripts/ide/components/jobs/detail.vue
+5
-4
app/assets/javascripts/ide/components/jobs/item.vue
app/assets/javascripts/ide/components/jobs/item.vue
+4
-2
No files found.
app/assets/javascripts/ide/components/jobs/detail.vue
View file @
d041fe34
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
/* eslint-disable vue/no-v-html */
/* eslint-disable vue/no-v-html */
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
throttle
}
from
'
lodash
'
;
import
{
throttle
}
from
'
lodash
'
;
import
{
Gl
Icon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
Gl
TooltipDirective
,
GlButton
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
../../../locale
'
;
import
{
__
}
from
'
../../../locale
'
;
import
ScrollButton
from
'
./detail/scroll_button.vue
'
;
import
ScrollButton
from
'
./detail/scroll_button.vue
'
;
import
JobDescription
from
'
./detail/description.vue
'
;
import
JobDescription
from
'
./detail/description.vue
'
;
...
@@ -17,6 +17,7 @@ export default {
...
@@ -17,6 +17,7 @@ export default {
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
},
},
components
:
{
components
:
{
GlButton
,
GlIcon
,
GlIcon
,
ScrollButton
,
ScrollButton
,
JobDescription
,
JobDescription
,
...
@@ -75,9 +76,9 @@ export default {
...
@@ -75,9 +76,9 @@ export default {
<
template
>
<
template
>
<div
class=
"ide-pipeline build-page d-flex flex-column flex-fill"
>
<div
class=
"ide-pipeline build-page d-flex flex-column flex-fill"
>
<header
class=
"ide-job-header d-flex align-items-center"
>
<header
class=
"ide-job-header d-flex align-items-center"
>
<
button
class=
"btn btn-default btn-sm d-flex
"
@
click=
"setDetailJob(null)"
>
<
gl-button
category=
"secondary"
icon=
"chevron-left"
size=
"small
"
@
click=
"setDetailJob(null)"
>
<gl-icon
name=
"chevron-left"
/>
{{
__
(
'
View jobs
'
)
}}
{{
__
(
'
View jobs
'
)
}}
</button>
</
gl-
button>
</header>
</header>
<div
class=
"top-bar d-flex border-left-0 mr-3"
>
<div
class=
"top-bar d-flex border-left-0 mr-3"
>
<job-description
:job=
"detailJob"
/>
<job-description
:job=
"detailJob"
/>
...
...
app/assets/javascripts/ide/components/jobs/item.vue
View file @
d041fe34
<
script
>
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
JobDescription
from
'
./detail/description.vue
'
;
import
JobDescription
from
'
./detail/description.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
JobDescription
,
JobDescription
,
GlButton
,
},
},
props
:
{
props
:
{
job
:
{
job
:
{
...
@@ -28,9 +30,9 @@ export default {
...
@@ -28,9 +30,9 @@ export default {
<div
class=
"ide-job-item"
>
<div
class=
"ide-job-item"
>
<job-description
:job=
"job"
class=
"gl-mr-3"
/>
<job-description
:job=
"job"
class=
"gl-mr-3"
/>
<div
class=
"ml-auto align-self-center"
>
<div
class=
"ml-auto align-self-center"
>
<
button
v-if=
"job.started"
type=
"button"
class=
"btn btn-default btn-sm
"
@
click=
"clickViewLog"
>
<
gl-button
v-if=
"job.started"
category=
"secondary"
size=
"small
"
@
click=
"clickViewLog"
>
{{
__
(
'
View log
'
)
}}
{{
__
(
'
View log
'
)
}}
</button>
</
gl-
button>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
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