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
448966c9
Commit
448966c9
authored
Oct 31, 2020
by
Jeremy Elder
Committed by
Scott Hampton
Oct 31, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate button to GlButton in …/pipeline_schedules_callout.vue
parent
5a8f9821
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
12 deletions
+18
-12
app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
...chedules/shared/components/pipeline_schedules_callout.vue
+9
-5
app/assets/stylesheets/page_bundles/pipeline_schedules.scss
app/assets/stylesheets/page_bundles/pipeline_schedules.scss
+1
-5
changelogs/unreleased/229308-migrate-bootstrap-button-to-gitlab-ui-glbutton-in-app-assets-javas.yml
...trap-button-to-gitlab-ui-glbutton-in-app-assets-javas.yml
+5
-0
spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
...dules/shared/components/pipeline_schedule_callout_spec.js
+3
-2
No files found.
app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
View file @
448966c9
<
script
>
import
Vue
from
'
vue
'
;
import
Cookies
from
'
js-cookie
'
;
import
{
Gl
Ic
on
}
from
'
@gitlab/ui
'
;
import
{
Gl
Butt
on
}
from
'
@gitlab/ui
'
;
import
Translate
from
'
../../../../../vue_shared/translate
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
...
...
@@ -12,7 +12,7 @@ const cookieKey = 'pipeline_schedules_callout_dismissed';
export
default
{
name
:
'
PipelineSchedulesCallout
'
,
components
:
{
Gl
Ic
on
,
Gl
Butt
on
,
},
data
()
{
return
{
...
...
@@ -32,9 +32,13 @@ export default {
<
template
>
<div
v-if=
"!calloutDismissed"
class=
"pipeline-schedules-user-callout user-callout"
>
<div
class=
"bordered-box landing content-block"
>
<button
id=
"dismiss-callout-btn"
class=
"btn btn-default close"
@
click=
"dismissCallout"
>
<gl-icon
name=
"close"
aria-hidden=
"true"
/>
</button>
<gl-button
category=
"tertiary"
icon=
"close"
:aria-label=
"__('Dismiss')"
class=
"gl-absolute gl-top-2 gl-right-2"
@
click=
"dismissCallout"
/>
<div
class=
"svg-container"
>
<img
:src=
"imageUrl"
/>
</div>
...
...
app/assets/stylesheets/page_bundles/pipeline_schedules.scss
View file @
448966c9
...
...
@@ -50,11 +50,7 @@
.bordered-box.content-block
{
border
:
1px
solid
var
(
--
border-color
,
$border-color
);
background-color
:
transparent
;
padding
:
16px
;
}
#dismiss-callout-btn
{
color
:
var
(
--
gl-text-color
,
$gl-text-color
);
padding
:
$gl-spacing-scale-5
;
}
}
...
...
changelogs/unreleased/229308-migrate-bootstrap-button-to-gitlab-ui-glbutton-in-app-assets-javas.yml
0 → 100644
View file @
448966c9
---
title
:
Replace close button in Scheduling Pipelines user notice with GlButton
merge_request
:
46264
author
:
type
:
other
spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
View file @
448966c9
import
Vue
from
'
vue
'
;
import
Cookies
from
'
js-cookie
'
;
import
{
getByRole
}
from
'
@testing-library/dom
'
;
import
PipelineSchedulesCallout
from
'
~/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
'
;
const
PipelineSchedulesCalloutComponent
=
Vue
.
extend
(
PipelineSchedulesCallout
);
...
...
@@ -80,7 +81,7 @@ describe('Pipeline Schedule Callout', () => {
});
it
(
'
updates calloutDismissed when close button is clicked
'
,
done
=>
{
calloutComponent
.
$el
.
querySelector
(
'
#dismiss-callout-btn
'
).
click
();
getByRole
(
calloutComponent
.
$el
,
'
button
'
,
/dismiss/i
).
click
();
Vue
.
nextTick
(()
=>
{
expect
(
calloutComponent
.
calloutDismissed
).
toBe
(
true
);
...
...
@@ -98,7 +99,7 @@ describe('Pipeline Schedule Callout', () => {
});
it
(
'
is hidden when close button is clicked
'
,
done
=>
{
calloutComponent
.
$el
.
querySelector
(
'
#dismiss-callout-btn
'
).
click
();
getByRole
(
calloutComponent
.
$el
,
'
button
'
,
/dismiss/i
).
click
();
Vue
.
nextTick
(()
=>
{
expect
(
calloutComponent
.
$el
.
childNodes
.
length
).
toBe
(
0
);
...
...
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