Commit 2faf991f authored by Phil Hughes's avatar Phil Hughes

Merge branch '43976-fix-access-token-clipboard-button-style' into 'master'

Resolve "Access token copy to clipboard button has wrong style"

Closes #43976

See merge request gitlab-org/gitlab-ce!17978
parents eeaf4aec ec5dae98
...@@ -210,13 +210,8 @@ ...@@ -210,13 +210,8 @@
} }
.created-personal-access-token-container { .created-personal-access-token-container {
#created-personal-access-token {
width: 90%;
display: inline;
}
.btn-clipboard { .btn-clipboard {
margin-left: 5px; border: 1px solid $border-color;
} }
} }
......
...@@ -19,8 +19,10 @@ ...@@ -19,8 +19,10 @@
%h5.prepend-top-0 %h5.prepend-top-0
Your New Personal Access Token Your New Personal Access Token
.form-group .form-group
.input-group
= text_field_tag 'created-personal-access-token', @new_personal_access_token, readonly: true, class: "form-control js-select-on-focus", 'aria-describedby' => "created-personal-access-token-help-block" = text_field_tag 'created-personal-access-token', @new_personal_access_token, readonly: true, class: "form-control js-select-on-focus", 'aria-describedby' => "created-personal-access-token-help-block"
= clipboard_button(text: @new_personal_access_token, title: "Copy personal access token to clipboard", placement: "left") %span.input-group-btn
= clipboard_button(text: @new_personal_access_token, title: "Copy personal access token to clipboard", placement: "left", class: "btn-default btn-clipboard")
%span#created-personal-access-token-help-block.help-block.text-danger Make sure you save it - you won't be able to access it again. %span#created-personal-access-token-help-block.help-block.text-danger Make sure you save it - you won't be able to access it again.
%hr %hr
......
---
title: Fix personal access token clipboard button style
merge_request: 17978
author: Fabian Schneider
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment