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/white.scss | |
parent | c439be58ff389053c892f2a74a72abaaea831a1f (diff) |
Refactor on diff themes for merge conflicts UI.
Diffstat (limited to 'app/assets/stylesheets/highlight/white.scss')
-rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 31a4e3deaac..36a80a916b2 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -1,4 +1,10 @@ /* https://github.com/aahan/pygments-github-style */ + +@mixin matchLine { + color: $black-transparent; + background-color: $match-line; +} + .code.white { // Line numbers .line-numbers, .diff-line-num { @@ -22,6 +28,10 @@ // Diff line .line_holder { + &.match .line_content { + @include matchLine; + } + .diff-line-num { &.old { background-color: $line-number-old; @@ -57,8 +67,7 @@ } &.match { - color: $black-transparent; - background-color: $match-line; + @include matchLine; } &.hll:not(.empty-cell) { |