summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-13 16:31:32 +0100
committerPhil Hughes <me@iamphill.com>2016-07-13 16:31:32 +0100
commitba07fa0798e592fbf71f0e37f01db38b38c53903 (patch)
treeeb2e5ce3f2cc9757f73691aea1c4117b0a73983f
parent050e4848a27cb2b8c6fff14403adef927c616a5b (diff)
downloadgitlab-ce-ba07fa0798e592fbf71f0e37f01db38b38c53903.tar.gz
Changed CSS for emails to be mostly single class selectors
-rw-r--r--app/assets/stylesheets/mailers/repository_push_email.scss41
1 files changed, 15 insertions, 26 deletions
diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss
index 2b61a9d4c73..847e4578baa 100644
--- a/app/assets/stylesheets/mailers/repository_push_email.scss
+++ b/app/assets/stylesheets/mailers/repository_push_email.scss
@@ -10,7 +10,7 @@
// preference): plain class selectors, type (element name) selectors, or
// explicit child selectors.
-table.code {
+.code {
font-family: monospace;
font-size: $code_font_size;
-premailer-cellpadding: 0;
@@ -20,34 +20,16 @@ table.code {
tr {
line-height: $code_line_height;
}
-
- .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;
- }
}
-.line-numbers, .diff-line-num {
- background-color: $background-color;
-}
-
-.diff-line-num, .diff-line-num a {
+.diff-line-num {
+ padding: 0 5px;
+ text-align: right;
+ max-width: 50px;
+ width: 35px;
color: $black-transparent;
-}
-
-pre.code, .diff-line-num {
border-right: 1px solid $table-border-gray;
-}
-.diff-line-num {
&.old {
background-color: $line-number-old;
border-right-color: $line-removed-dark;
@@ -60,12 +42,14 @@ pre.code, .diff-line-num {
}
.line_content {
+ white-space: pre;
background-color: #fff;
&.old {
background-color: $line-removed;
- > .line > span.idiff, > .line > span > span.idiff {
+ > .line > span.idiff,
+ > .line > span > span.idiff {
background-color: $line-removed-dark;
}
}
@@ -73,7 +57,8 @@ pre.code, .diff-line-num {
&.new {
background-color: $line-added;
- > .line > span.idiff, > .line > span > span.idiff {
+ > .line > span.idiff,
+ > .line > span > span.idiff {
background-color: $line-added-dark;
}
}
@@ -84,6 +69,10 @@ pre.code, .diff-line-num {
}
}
+.diff-line-num {
+ background-color: $background-color;
+}
+
span.highlight_word {
background-color: #fafe3d !important;
}