diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-25 11:35:41 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-25 11:35:41 +0300 |
commit | b54b22cdf258f5cb9f3aefd857cec6c514d4b5ab (patch) | |
tree | 89ebe7e756985966bb498850a4ac573f40fac2bd /app/assets/stylesheets | |
parent | 5c6477fb4c9c8e324c228e39cb6a6cbb2a8bc2a0 (diff) | |
parent | 3cc20e7024d030aa173a8d1458d43327c9c156ac (diff) |
Merge branch '10535-buttons-css' into 'master'
Removes EE differences for buttons.scss
Closes gitlab-ee#10535
See merge request gitlab-org/gitlab-ce!26358
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index a4af84f8d27..695ce014659 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -443,7 +443,8 @@ border-color: transparent; } - &.btn-secondary-hover-link { + &.btn-secondary-hover-link, + &.btn-default-hover-link { color: $gl-text-color-secondary; &:hover, |