Commit d191658c authored by Fatih Acet's avatar Fatih Acet

Merge branch 'diff-email-css' into 'master'

Reduced diff email CSS

## What does this MR do?

Reduces the amount of inline CSS on the diff emails.

## What are the relevant issue numbers?

#15178 

See merge request !5203
parents 7ce3fe27 27a44694
...@@ -10,83 +10,48 @@ ...@@ -10,83 +10,48 @@
// preference): plain class selectors, type (element name) selectors, or // preference): plain class selectors, type (element name) selectors, or
// explicit child selectors. // explicit child selectors.
table.code { .code {
width: 100%; background-color: #fff;
font-family: monospace; font-family: monospace;
border: none; font-size: $code_font_size;
border-collapse: separate;
margin: 0;
padding: 0;
-premailer-cellpadding: 0; -premailer-cellpadding: 0;
-premailer-cellspacing: 0; -premailer-cellspacing: 0;
-premailer-width: 100%; -premailer-width: 100%;
> tr > td { > tr {
line-height: $code_line_height; line-height: $code_line_height;
font-family: monospace; }
font-size: $code_font_size; }
&.diff-line-num { .diff-line-num {
margin: 0;
padding: 0;
border: none;
padding: 0 5px; padding: 0 5px;
border-right: 1px solid;
text-align: right; text-align: right;
min-width: 35px;
max-width: 50px;
width: 35px; width: 35px;
}
&.line_content {
display: block;
margin: 0;
padding: 0 0.5em;
border: none;
white-space: pre;
}
}
}
.line-numbers, .diff-line-num {
background-color: $background-color; background-color: $background-color;
}
.diff-line-num, .diff-line-num a {
color: $black-transparent; color: $black-transparent;
} border-right: 1px solid $table-border-gray;
pre.code, .diff-line-num {
border-color: $table-border-gray;
}
.code.white, pre.code, .line_content {
background-color: #fff;
color: #333;
}
.diff-line-num {
&.old { &.old {
background-color: $line-number-old; background-color: $line-number-old;
border-color: $line-removed-dark; border-right-color: $line-removed-dark;
} }
&.new { &.new {
background-color: $line-number-new; background-color: $line-number-new;
border-color: $line-added-dark; border-right-color: $line-added-dark;
}
&.hll:not(.empty-cell) {
background-color: $line-number-select;
border-color: $line-select-yellow-dark;
} }
} }
.line_content { .line_content {
padding-left: 0.5em;
padding-right: 0.5em;
white-space: pre;
&.old { &.old {
background-color: $line-removed; background-color: $line-removed;
> .line > span.idiff, > .line > span > span.idiff { > .line > span.idiff,
> .line > span > span.idiff {
background-color: $line-removed-dark; background-color: $line-removed-dark;
} }
} }
...@@ -94,7 +59,8 @@ pre.code, .diff-line-num { ...@@ -94,7 +59,8 @@ pre.code, .diff-line-num {
&.new { &.new {
background-color: $line-added; background-color: $line-added;
> .line > span.idiff, > .line > span > span.idiff { > .line > span.idiff,
> .line > span > span.idiff {
background-color: $line-added-dark; background-color: $line-added-dark;
} }
} }
...@@ -103,14 +69,6 @@ pre.code, .diff-line-num { ...@@ -103,14 +69,6 @@ pre.code, .diff-line-num {
color: $black-transparent; color: $black-transparent;
background-color: $match-line; background-color: $match-line;
} }
&.hll:not(.empty-cell) {
background-color: $line-select-yellow;
}
}
pre > .hll {
background-color: #f8eec7 !important;
} }
span.highlight_word { span.highlight_word {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment