diff options
Diffstat (limited to 'app/assets/stylesheets/highlight/white_base.scss')
-rw-r--r-- | app/assets/stylesheets/highlight/white_base.scss | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/stylesheets/highlight/white_base.scss b/app/assets/stylesheets/highlight/white_base.scss index 80052f4a4d5..91d8f4a1ba5 100644 --- a/app/assets/stylesheets/highlight/white_base.scss +++ b/app/assets/stylesheets/highlight/white_base.scss @@ -18,6 +18,7 @@ $white-cm: #998; $white-cp: #999; $white-c1: #998; $white-cs: #999; +$white-cd: #998; $white-gd: $black; $white-gd-bg: #fdd; $white-gd-x: $black; @@ -118,6 +119,15 @@ pre.code, .line_expansion { @include diff-expansion($gray-light, $border-color, $blue-600); + + &.diff-tr:last-child { + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + + .diff-td { + border-bottom: 0; + } + } } // Diff line @@ -128,8 +138,8 @@ pre.code, @include match-line; } - .diff-grid-left:hover, - .diff-grid-right:hover, + &:not(.match) .diff-grid-left:hover, + &:not(.match) .diff-grid-right:hover, &.code-search-line:hover { .diff-line-num:not(.empty-cell):not(.conflict_marker_their):not(.conflict_marker_our) { @include line-number-hover; @@ -281,6 +291,9 @@ span.highlight_word { font-weight: $gl-font-weight-bold; font-style: italic; } +.cd { color: $white-cd; + font-style: italic; } + .gd { color: $white-gd; background-color: $white-gd-bg; |