diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-31 18:25:40 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:45 +0300 |
| commit | 89875afff62c1e81063ae9fbf3c87fb49c75e0f1 (patch) | |
| tree | 6b8dcc3f261891679086e54bb5ed310eb854ab37 /app/assets/stylesheets/highlight/monokai.scss | |
| parent | c439be58ff389053c892f2a74a72abaaea831a1f (diff) | |
| download | gitlab-ce-89875afff62c1e81063ae9fbf3c87fb49c75e0f1.tar.gz | |
Refactor on diff themes for merge conflicts UI.
Diffstat (limited to 'app/assets/stylesheets/highlight/monokai.scss')
| -rw-r--r-- | app/assets/stylesheets/highlight/monokai.scss | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss index 80a509a7c1a..7de920e074b 100644 --- a/app/assets/stylesheets/highlight/monokai.scss +++ b/app/assets/stylesheets/highlight/monokai.scss @@ -21,6 +21,10 @@ // Diff line .line_holder { + &.match .line_content { + @include dark-diff-match-line; + } + td.diff-line-num.hll:not(.empty-cell), td.line_content.hll:not(.empty-cell) { background-color: #49483e; @@ -36,8 +40,7 @@ } .line_content.match { - color: rgba(255, 255, 255, 0.3); - background: rgba(255, 255, 255, 0.1); + @include dark-diff-match-line; } } |