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
d92e3759
Commit
d92e3759
authored
Aug 19, 2020
by
Marcel Amirault
Committed by
Sarah Groff Hennigh-Palermo
Aug 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade gldeprecatedbutton to glbutton
Using new tertiary category to get borderless style
parent
e78a4382
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
12 deletions
+21
-12
app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
...ripts/ci_variable_list/components/ci_variable_popover.vue
+11
-10
changelogs/unreleased/marcel-update-deprecated-button-1.yml
changelogs/unreleased/marcel-update-deprecated-button-1.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
...d/ci_variable_list/components/ci_variable_popover_spec.js
+2
-2
No files found.
app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
View file @
d92e3759
<
script
>
<
script
>
import
{
GlPopover
,
Gl
Icon
,
GlDeprecated
Button
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlPopover
,
GlButton
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
export
default
{
export
default
{
maxTextLength
:
95
,
maxTextLength
:
95
,
components
:
{
components
:
{
GlPopover
,
GlPopover
,
GlIcon
,
GlButton
,
GlDeprecatedButton
,
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
...
@@ -39,16 +38,18 @@ export default {
...
@@ -39,16 +38,18 @@ export default {
<
template
>
<
template
>
<div
id=
"popover-container"
>
<div
id=
"popover-container"
>
<gl-popover
:target=
"target"
triggers=
"hover"
placement=
"top"
container=
"popover-container"
>
<gl-popover
:target=
"target"
triggers=
"hover"
placement=
"top"
container=
"popover-container"
>
<div
class=
"d-flex justify-content-between position-relative"
>
<div
class=
"gl-display-flex gl-justify-content-space-between gl-align-items-center"
>
<div
class=
"pr-5 w-100 ci-popover-value"
>
{{
displayValue
}}
</div>
<div
class=
"ci-popover-value gl-pr-3"
>
<gl-deprecated-button
{{
displayValue
}}
</div>
<gl-button
v-gl-tooltip
v-gl-tooltip
class=
"btn-transparent btn-clipboard position-absolute position-top-0 position-right-0"
category=
"tertiary"
icon=
"copy-to-clipboard"
:title=
"tooltipText"
:title=
"tooltipText"
:data-clipboard-text=
"value"
:data-clipboard-text=
"value"
>
:aria-label=
"__('Copy to clipboard')"
<gl-icon
name=
"copy-to-clipboard"
/>
/>
</gl-deprecated-button>
</div>
</div>
</gl-popover>
</gl-popover>
</div>
</div>
...
...
changelogs/unreleased/marcel-update-deprecated-button-1.yml
0 → 100644
View file @
d92e3759
---
title
:
Change to glbutton component in CI variables list
merge_request
:
38757
author
:
type
:
other
locale/gitlab.pot
View file @
d92e3759
...
@@ -6931,6 +6931,9 @@ msgstr ""
...
@@ -6931,6 +6931,9 @@ msgstr ""
msgid "Copy the code below to implement tracking in your application:"
msgid "Copy the code below to implement tracking in your application:"
msgstr ""
msgstr ""
msgid "Copy to clipboard"
msgstr ""
msgid "Copy token"
msgid "Copy token"
msgstr ""
msgstr ""
...
...
spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
View file @
d92e3759
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
CiVariablePopover
from
'
~/ci_variable_list/components/ci_variable_popover.vue
'
;
import
CiVariablePopover
from
'
~/ci_variable_list/components/ci_variable_popover.vue
'
;
import
mockData
from
'
../services/mock_data
'
;
import
mockData
from
'
../services/mock_data
'
;
...
@@ -18,7 +18,7 @@ describe('Ci Variable Popover', () => {
...
@@ -18,7 +18,7 @@ describe('Ci Variable Popover', () => {
});
});
};
};
const
findButton
=
()
=>
wrapper
.
find
(
Gl
Deprecated
Button
);
const
findButton
=
()
=>
wrapper
.
find
(
GlButton
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createComponent
();
createComponent
();
...
...
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