diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-09 20:04:05 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-09 20:04:05 +0300 |
commit | aa4942a2132652ccca52a583c78f7aa92ff7d256 (patch) | |
tree | bbc0b70bd2bec3d420c0c883a3ba0a03c7024fb1 /app/assets/stylesheets/pages/settings.scss | |
parent | 3ae87eef064b019ee7944595cb33741de8805d24 (diff) | |
parent | 91a3a4b526214f4174f4f12de23dfb5baf033211 (diff) |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/helpers/issuables_helper.rb
# app/views/projects/_home_panel.html.haml
# app/views/projects/commits/_commit.html.haml
Diffstat (limited to 'app/assets/stylesheets/pages/settings.scss')
-rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 574cd36b213..fa495c9ecf0 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -284,3 +284,23 @@ .deprecated-service { cursor: default; } + +.personal-access-tokens-never-expires-label { + color: $note-disabled-comment-color; +} + +.created-deploy-token-container { + .deploy-token-field { + width: 90%; + display: inline; + } + + .btn-clipboard { + margin-left: 5px; + } + + .deploy-token-help-block { + display: block; + margin-bottom: 0; + } +} |