summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/diff.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
-rw-r--r--app/assets/stylesheets/pages/diff.scss14
1 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 1557c243db5..487b600e31d 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -1,6 +1,8 @@
.diff-file {
- border: 1px solid $border-color;
- margin-bottom: 1em;
+ margin-left: -16px;
+ margin-right: -16px;
+ border: none;
+ border-bottom: 1px solid #E7E9EE;
.diff-header {
position: relative;
@@ -45,7 +47,7 @@
overflow-y: hidden;
background: #FFF;
color: #333;
- font-size: $code_font_size;
+
.old {
span.idiff {
background-color: #f8cbcb;
@@ -82,7 +84,7 @@
border: none;
margin: 0px;
padding: 0px;
- td {
+ .line_holder td {
line-height: $code_line_height;
font-size: $code_font_size;
}
@@ -367,3 +369,7 @@
white-space: pre-wrap;
}
+.inline-parallel-buttons {
+ float: right;
+ margin-top: -5px;
+}