diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-14 13:39:20 +0100 |
---|---|---|
committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-14 14:15:47 +0100 |
commit | 9ec3c32f98f9548b4aa756c8fba74159b12492a7 (patch) | |
tree | fb3190e8534a6de9ac2d9bb6070c4d3f65e53b5a /app/assets | |
parent | aef739605987dc70424b83c56ba393462520af52 (diff) | |
download | gitlab-ce-9ec3c32f98f9548b4aa756c8fba74159b12492a7.tar.gz |
Improved specifity of toggleable file headers23147-file-viewer-header-has-hover-style
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/files.scss | 9 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 8 |
3 files changed, 21 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 81520500594..76a3c083697 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -26,15 +26,6 @@ padding: 10px $gl-padding; word-wrap: break-word; border-radius: 3px 3px 0 0; - cursor: pointer; - - &:hover { - background-color: $dark-background-color; - } - - .diff-toggle-caret { - padding-right: 6px; - } &.file-title-clear { padding-left: 0; diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index b8ef76cc74e..84094b0cb1b 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -33,6 +33,19 @@ font-size: smaller; } } + + .file-title { + cursor: pointer; + + &:hover { + background-color: $dark-background-color; + } + + .diff-toggle-caret { + padding-right: 6px; + } + } + .diff-content { overflow: auto; overflow-y: hidden; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index d399f84a2ff..efeea96373f 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -147,6 +147,14 @@ ul.notes { // Diff code in discussion view .discussion-body .diff-file { + .file-title { + cursor: default; + + &:hover { + background-color: $gray-light; + } + } + .diff-header > span { margin-right: 10px; } |