diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 00:07:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 00:07:54 +0300 |
| commit | c4db541c1b2c97ab1eda354ea3899489fe5c33e5 (patch) | |
| tree | 45d5d381232179082ea11136e3b53211b37349d5 /app/assets/stylesheets/pages | |
| parent | 603c7d4cac5e28bc1c75e50c23ed2cbe56f1aafc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/pages')
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 991ee841398..0c043e4f3fb 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -69,11 +69,6 @@ } } - .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 { |