diff options
| author | Adam Butler <adam@littlebigmedia.co.uk> | 2016-04-06 20:37:09 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-18 11:15:10 -0500 |
| commit | 8a8b5497c5142f225fb4fa3f5441526a0652869a (patch) | |
| tree | d93b1a519d0454139e4cc1c51150d51ccd7af8d8 /app/assets | |
| parent | 636b3ebb011d7bc58c70a642c7b6920ab99c0b6d (diff) | |
| download | gitlab-ce-8a8b5497c5142f225fb4fa3f5441526a0652869a.tar.gz | |
Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 16 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 3 |
3 files changed, 11 insertions, 16 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 61d9954c6c8..8c96c7a9c31 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -36,22 +36,6 @@ } } - .filename { - &.old { - display: inline-block; - span.idiff { - background-color: #f8cbcb; - } - } - - &.new { - display: inline-block; - span.idiff { - background-color: #a6f3a6; - } - } - } - a:not(.btn) { color: $gl-dark-link-color; } diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 2779cd56788..487081c3c7c 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -269,3 +269,11 @@ h1, h2, h3, h4 { text-align: right; } } + +.idiff.deletion { + background: $gl-idiff-deletion; +} + +.idiff.addition { + background: $gl-idiff-addition; +} diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 5fa4c266607..b7d8f611621 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -178,6 +178,9 @@ $table-border-gray: #f0f0f0; $line-target-blue: #eaf3fc; $line-select-yellow: #fcf8e7; $line-select-yellow-dark: #f0e2bd; +$gl-idiff-deletion: #f8cbcb; +$gl-idiff-addition: #a6f3a6; + /* * Fonts */ |