diff options
Diffstat (limited to 'app/assets/stylesheets/highlight/white_base.scss')
| -rw-r--r-- | app/assets/stylesheets/highlight/white_base.scss | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/app/assets/stylesheets/highlight/white_base.scss b/app/assets/stylesheets/highlight/white_base.scss index 20a36d2e8b1..b984c194033 100644 --- a/app/assets/stylesheets/highlight/white_base.scss +++ b/app/assets/stylesheets/highlight/white_base.scss @@ -77,6 +77,22 @@ $white-gc-bg: #eaf2f5; background-color: $gray-light; } +@mixin diff-match-line { + &.expansion { + &.match .diff-td { + color: $gray-400; + } + + .diff-td { + background-color: $gray-50; + + &:first-child { + border-color: $gray-100; + } + } + } +} + // Line numbers .file-line-num { @include line-number-link($black-transparent); @@ -117,8 +133,8 @@ pre.code, color: $white-code-color; } -.line_expansion { - @include diff-expansion($gray-light, $border-color, $blue-600); +.old-line_expansion { + @include old-diff-expansion($gray-light, $border-color, $blue-600); &.diff-tr:last-child { border-bottom-right-radius: 4px; @@ -130,6 +146,10 @@ pre.code, } } +.diff-line-expand-button { + @include diff-expansion($gray-100, $gray-700, $gray-200, $gray-800); +} + // Diff line .line_holder { &.match .line_content, @@ -138,6 +158,10 @@ pre.code, @include match-line; } + &.diff-grid-row { + @include diff-match-line; + } + &:not(.match) .diff-grid-left:hover, &:not(.match) .diff-grid-right:hover, &.code-search-line:hover { |