root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Phil Hughes 2018-04-06 08:24:50 +00:00
parent eeaf4aec2e ec5dae98cf
commit 2faf991f31
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/pages/profile.scss
View File

@ -210,13 +210,8 @@
}
.created-personal-access-token-container {
#created-personal-access-token {
width: 90%;
display: inline;
}
.btn-clipboard {
margin-left: 5px;
border: 1px solid $border-color;
}
}

6
app/views/profiles/personal_access_tokens/index.html.haml
View File

@ -19,8 +19,10 @@
%h5.prepend-top-0
Your New Personal Access Token
.form-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"
= clipboard_button(text: @new_personal_access_token, title: "Copy personal access token to clipboard", placement: "left")
.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"
%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.
%hr

5
changelogs/unreleased/43976-fix-access-token-clipboard-button-style.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix personal access token clipboard button style
merge_request: 17978
author: Fabian Schneider
type: fixed