diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 18:09:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 18:09:25 +0000 |
| commit | 967812838c7e7742729a4c7aeb9859f98a509622 (patch) | |
| tree | 22db2e6642be51cb12535db7863331457e5523c3 /app/assets/stylesheets | |
| parent | 074d013e1eb3f6e0c27f96a3be8b9361254c8a98 (diff) | |
| download | gitlab-ce-967812838c7e7742729a4c7aeb9859f98a509622.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 0c043e4f3fb..991ee841398 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -69,6 +69,11 @@ } } + .file-title.is-active, + .file-title-flex-parent.is-active { + background-color: $gray-200; + } + @media (min-width: map-get($grid-breakpoints, md)) { &.conflict .file-title, &.conflict .file-title-flex-parent { |