diff options
author | Phil Hughes <me@iamphill.com> | 2016-07-12 11:33:10 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-07-12 15:01:08 +0100 |
commit | 050e4848a27cb2b8c6fff14403adef927c616a5b (patch) | |
tree | 938ae74823a87dad29782b3ba5b0637e51eb34f9 | |
parent | 850bb6db2facf570a7e0933bbf555f764aeac601 (diff) | |
download | gitlab-ce-050e4848a27cb2b8c6fff14403adef927c616a5b.tar.gz |
Reduced diff email CSS
-rw-r--r-- | app/assets/stylesheets/mailers/repository_push_email.scss | 67 |
1 files changed, 19 insertions, 48 deletions
diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss index 7f645d3089d..2b61a9d4c73 100644 --- a/app/assets/stylesheets/mailers/repository_push_email.scss +++ b/app/assets/stylesheets/mailers/repository_push_email.scss @@ -11,40 +11,27 @@ // explicit child selectors. table.code { - width: 100%; font-family: monospace; - border: none; - border-collapse: separate; - margin: 0; - padding: 0; + font-size: $code_font_size; -premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; - > tr > td { + tr { line-height: $code_line_height; - font-family: monospace; - font-size: $code_font_size; - - &.diff-line-num { - margin: 0; - padding: 0; - border: none; - padding: 0 5px; - border-right: 1px solid; - text-align: right; - min-width: 35px; - max-width: 50px; - width: 35px; - } + } - &.line_content { - display: block; - margin: 0; - padding: 0 0.5em; - border: none; - white-space: pre; - } + .diff-line-num { + padding: 0 5px; + text-align: right; + max-width: 50px; + width: 35px; + border-right-width: 1px; + border-right-style: solid; + } + + .line_content { + white-space: pre; } } @@ -57,32 +44,24 @@ table.code { } pre.code, .diff-line-num { - border-color: $table-border-gray; -} - -.code.white, pre.code, .line_content { - background-color: #fff; - color: #333; + border-right: 1px solid $table-border-gray; } .diff-line-num { &.old { background-color: $line-number-old; - border-color: $line-removed-dark; + border-right-color: $line-removed-dark; } &.new { background-color: $line-number-new; - border-color: $line-added-dark; - } - - &.hll:not(.empty-cell) { - background-color: $line-number-select; - border-color: $line-select-yellow-dark; + border-right-color: $line-added-dark; } } .line_content { + background-color: #fff; + &.old { background-color: $line-removed; @@ -103,14 +82,6 @@ pre.code, .diff-line-num { color: $black-transparent; background-color: $match-line; } - - &.hll:not(.empty-cell) { - background-color: $line-select-yellow; - } -} - -pre > .hll { - background-color: #f8eec7 !important; } span.highlight_word { |