diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:42 +0000 |
| commit | 580622bdb3c762a8e89facd8a3946881ee480442 (patch) | |
| tree | 3ac9d759da23f78f95f50684bd238a9f76839538 /app/assets/stylesheets | |
| parent | b211a4ea14d5e9ed9b0c248a4e8c5c1d85b542cb (diff) | |
| download | gitlab-ce-580622bdb3c762a8e89facd8a3946881ee480442.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 13 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 38cef3de777..6257ee3ae8e 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -447,6 +447,7 @@ font-weight: normal; border-radius: 0; border-color: transparent; + border-width: 0; &:hover, &:active, diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index d61fbae81f2..c48f4b0622e 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -187,7 +187,6 @@ .btn-link { color: inherit; - outline: none; } .issuable-header-text { @@ -261,15 +260,10 @@ color: rgba($gray-normal, 0.2); } - .lock-edit, // uses same style, different js behaviour + .confidential-edit, + .lock-edit, .edit-link { - @extend .btn-blank; - color: $gl-text-color; - - &:hover { - text-decoration: underline; - color: $blue-800; - } + @extend .btn-link; } } @@ -689,7 +683,6 @@ } .btn-link { - outline: none; padding: 0; } |