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
Jérome Perrin
gitlab-ce
Commits
51b88741
Commit
51b88741
authored
Mar 05, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes btn-transparent and btn-clipboard as default classes for clipboard button component
Changes after review
parent
35f6efae
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
2 deletions
+13
-2
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+1
-1
app/assets/javascripts/notes/components/diff_file_header.vue
app/assets/javascripts/notes/components/diff_file_header.vue
+2
-0
app/assets/javascripts/registry/components/collapsible_container.vue
...javascripts/registry/components/collapsible_container.vue
+1
-0
app/assets/javascripts/registry/components/table_registry.vue
...assets/javascripts/registry/components/table_registry.vue
+1
-0
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
.../vue_merge_request_widget/components/mr_widget_header.vue
+1
-0
app/assets/javascripts/vue_shared/components/clipboard_button.vue
...ts/javascripts/vue_shared/components/clipboard_button.vue
+2
-1
spec/javascripts/vue_shared/components/clipboard_button_spec.js
...avascripts/vue_shared/components/clipboard_button_spec.js
+5
-0
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
51b88741
...
@@ -186,7 +186,7 @@
...
@@ -186,7 +186,7 @@
<clipboard-button
<clipboard-button
:text=
"ingressExternalIp"
:text=
"ingressExternalIp"
:title=
"s__('ClusterIntegration|Copy Ingress IP Address to clipboard')"
:title=
"s__('ClusterIntegration|Copy Ingress IP Address to clipboard')"
c
ss-class=
"btn btn-default
js-clipboard-btn"
c
lass=
"
js-clipboard-btn"
/>
/>
</span>
</span>
</div>
</div>
...
...
app/assets/javascripts/notes/components/diff_file_header.vue
View file @
51b88741
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
<clipboard-button
<clipboard-button
title=
"Copy file path to clipboard"
title=
"Copy file path to clipboard"
:text=
"diffFile.submoduleLink"
:text=
"diffFile.submoduleLink"
css-class=
"btn-default btn-transparent btn-clipboard"
/>
/>
</span>
</span>
</div>
</div>
...
@@ -79,6 +80,7 @@
...
@@ -79,6 +80,7 @@
<clipboard-button
<clipboard-button
title=
"Copy file path to clipboard"
title=
"Copy file path to clipboard"
:text=
"diffFile.filePath"
:text=
"diffFile.filePath"
css-class=
"btn-default btn-transparent btn-clipboard"
/>
/>
<small
<small
...
...
app/assets/javascripts/registry/components/collapsible_container.vue
View file @
51b88741
...
@@ -86,6 +86,7 @@
...
@@ -86,6 +86,7 @@
v-if=
"repo.location"
v-if=
"repo.location"
:text=
"clipboardText"
:text=
"clipboardText"
:title=
"repo.location"
:title=
"repo.location"
css-class=
"btn-default btn-transparent btn-clipboard"
/>
/>
<div
class=
"controls hidden-xs pull-right"
>
<div
class=
"controls hidden-xs pull-right"
>
...
...
app/assets/javascripts/registry/components/table_registry.vue
View file @
51b88741
...
@@ -90,6 +90,7 @@
...
@@ -90,6 +90,7 @@
v-if=
"item.location"
v-if=
"item.location"
:title=
"item.location"
:title=
"item.location"
:text=
"clipboardText(item.location)"
:text=
"clipboardText(item.location)"
css-class=
"btn-default btn-transparent btn-clipboard"
/>
/>
</td>
</td>
<td>
<td>
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
View file @
51b88741
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
<clipboard-button
<clipboard-button
:text=
"branchNameClipboardData"
:text=
"branchNameClipboardData"
:title=
"__('Copy branch name to clipboard')"
:title=
"__('Copy branch name to clipboard')"
css-class=
"btn-default btn-transparent btn-clipboard"
/>
/>
{{
s__
(
"
mrWidget|into
"
)
}}
{{
s__
(
"
mrWidget|into
"
)
}}
...
...
app/assets/javascripts/vue_shared/components/clipboard_button.vue
View file @
51b88741
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
cssClass
:
{
cssClass
:
{
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
default
:
'
btn
btn-default btn-transparent btn-clipboard
'
,
default
:
'
btn
-default
'
,
},
},
},
},
};
};
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
<
template
>
<
template
>
<button
<button
type=
"button"
type=
"button"
class=
"btn"
:class=
"cssClass"
:class=
"cssClass"
:title=
"title"
:title=
"title"
:data-clipboard-text=
"text"
:data-clipboard-text=
"text"
...
...
spec/javascripts/vue_shared/components/clipboard_button_spec.js
View file @
51b88741
...
@@ -10,6 +10,7 @@ describe('clipboard button', () => {
...
@@ -10,6 +10,7 @@ describe('clipboard button', () => {
vm
=
mountComponent
(
Component
,
{
vm
=
mountComponent
(
Component
,
{
text
:
'
copy me
'
,
text
:
'
copy me
'
,
title
:
'
Copy this value into Clipboard!
'
,
title
:
'
Copy this value into Clipboard!
'
,
cssClass
:
'
btn-danger
'
,
});
});
});
});
...
@@ -28,4 +29,8 @@ describe('clipboard button', () => {
...
@@ -28,4 +29,8 @@ describe('clipboard button', () => {
expect
(
vm
.
$el
.
getAttribute
(
'
data-placement
'
)).
toEqual
(
'
top
'
);
expect
(
vm
.
$el
.
getAttribute
(
'
data-placement
'
)).
toEqual
(
'
top
'
);
expect
(
vm
.
$el
.
getAttribute
(
'
data-container
'
)).
toEqual
(
null
);
expect
(
vm
.
$el
.
getAttribute
(
'
data-container
'
)).
toEqual
(
null
);
});
});
it
(
'
should render provided classname
'
,
()
=>
{
expect
(
vm
.
$el
.
classList
).
toContain
(
'
btn-danger
'
);
});
});
});
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