diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2013-04-21 05:20:56 -0300 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2013-04-21 05:20:56 -0300 |
| commit | a2be79568feb52fd743327fe99cfc8c54f882152 (patch) | |
| tree | b78b21358201f4ae312d2279611a0c02e5f13fe8 /app | |
| parent | 44d63b4ceaed168f7e468cc6784618690e64fb84 (diff) | |
| download | gitlab-ce-a2be79568feb52fd743327fe99cfc8c54f882152.tar.gz | |
Diff with better colors and some spacing on the corners
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/commits.scss | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 12 | ||||
| -rw-r--r-- | app/views/commits/_text_file.html.haml | 2 |
3 files changed, 25 insertions, 3 deletions
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 51a307e4d4e..812587a2ee6 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -99,12 +99,24 @@ } } } + .line_holder { + &.old .old_line, + &.old .new_line { + background: #FCC; + border-color: #E7BABA; + } + &.new .old_line, + &.new .new_line { + background: #CFC; + border-color: #B9ECB9; + } + } .line_content { display: block; white-space: pre; height: 18px; margin: 0px; - padding: 0px; + padding: 0px 0.5em; border: none; &.new { background: #CFD; diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index a8628fc58f2..a86384dc2ef 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -213,7 +213,17 @@ ul.notes { .reply-btn { @extend .btn-primary; } -.file .content tr.line_holder:hover > td { background: $hover !important; } +.file .content tr.line_holder:hover { + &> td.line_content { + background: $hover !important; + border-color: darken($hover, 10%) !important; + } + &> td.new_line, + &> td.old_line { + background: darken($hover, 4%) !important; + border-color: darken($hover, 10%) !important; + } +} .file .content tr.line_holder:hover > td .line_note_link { opacity: 1.0; filter: alpha(opacity=100); diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml index 760fd07ed8b..8f737e43887 100644 --- a/app/views/commits/_text_file.html.haml +++ b/app/views/commits/_text_file.html.haml @@ -4,7 +4,7 @@ %table.text-file{class: "#{'hide' if too_big}"} - each_diff_line(diff, index) do |line, type, line_code, line_new, line_old| - %tr.line_holder{ id: line_code } + %tr.line_holder{ id: line_code, class: "#{type}" } - if type == "match" %td.old_line= "..." %td.new_line= "..." |