diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
commit | aa2a7dad59c0db8b15aadbb58a861237a36c95ee (patch) | |
tree | d55ab82ba5c5195b003f9b29c2c17646fffbdae6 /app/assets/stylesheets/framework/typography.scss | |
parent | b99471ca5de6e867c44ea21bf85252cd174ccec7 (diff) | |
parent | c002a560afae7db6a5c778bc78028243c2fc945a (diff) | |
download | gitlab-ce-aa2a7dad59c0db8b15aadbb58a861237a36c95ee.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
# app/assets/stylesheets/pages/issuable.scss
Diffstat (limited to 'app/assets/stylesheets/framework/typography.scss')
-rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 2779cd56788..3575984b229 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: $line-removed-dark; +} + +.idiff.addition { + background: $line-added-dark; +} |