BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 141c6a02 by Dmitriy Zaporozhets
Options

Merge pull request #8719 from jvanbaarsen/diff-colors

Made diff colors a little less In Your Face
parents e9fad8cf ae5743e9
Showing with 10 additions and 10 deletions
app/assets/stylesheets/sections/diff.scss
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
font-size: $code_font_size; font-size: $code_font_size;
.old { .old {
span.idiff { span.idiff {
background-color: #F99; background-color: #f8cbcb;
} }
} }
.new { .new {
span.idiff { span.idiff {
background-color: #8F8; background-color: #a6f3a6;
} }
} }
.unfold { .unfold {
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
padding: 0px; padding: 0px;
border: none; border: none;
background: #F5F5F5; background: #F5F5F5;
color: #666; color: rgba(0,0,0,0.3);
padding: 0px 5px; padding: 0px 5px;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
text-align: right; text-align: right;
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
float: left; float: left;
width: 35px; width: 35px;
font-weight: normal; font-weight: normal;
color: #666; color: rgba(0,0,0,0.3);
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
} }
...@@ -114,13 +114,13 @@ ...@@ -114,13 +114,13 @@
.line_holder { .line_holder {
&.old .old_line, &.old .old_line,
&.old .new_line { &.old .new_line {
background: #FCC; background: #ffdddd;
border-color: #E7BABA; border-color: #f1c0c0;
} }
&.new .old_line, &.new .old_line,
&.new .new_line { &.new .new_line {
background: #CFC; background: #dbffdb;
border-color: #B9ECB9; border-color: #c1e9c1;
} }
} }
.line_content { .line_content {
...@@ -129,10 +129,10 @@ ...@@ -129,10 +129,10 @@
padding: 0px 0.5em; padding: 0px 0.5em;
border: none; border: none;
&.new { &.new {
background: #CFD; background: #eaffea;
} }
&.old { &.old {
background: #FDD; background: #ffecec;
} }
&.matched { &.matched {
color: #ccc; color: #ccc;
......
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