Commit 763e9d16 authored by Phil Hughes's avatar Phil Hughes

Merge branch '262073-fix-merge-conflict-none-button-text' into 'master'

"None" style: fix merge conflict button text

See merge request gitlab-org/gitlab!44427
parents fc519f04 5d0ee1dd
......@@ -226,6 +226,14 @@ $colors: (
.solarized-dark {
@include color-scheme('solarized-dark'); }
.none {
.line_content.header {
button {
color: $gray-900;
}
}
}
.diff-wrap-lines .line_content {
white-space: normal;
min-height: 19px;
......
---
title: Fix merge conflict button text if "None" code style selected
merge_request: 44427
author: David Barr @davebarr
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment