Download as
Browse Code »

Commit a2be79568feb52fd743327fe99cfc8c54f882152

Authored by Gabriel Mazetto
1 parent 44d63b4c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Diff with better colors and some spacing on the corners

Showing 3 changed files with 25 additions and 3 deletions   Show diff stats
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @a2be795
... ... @@ -99,12 +99,24 @@
99 99 }
100 100 }
101 101 }
  102 + .line_holder {
  103 + &.old .old_line,
  104 + &.old .new_line {
  105 + background: #FCC;
  106 + border-color: #E7BABA;
  107 + }
  108 + &.new .old_line,
  109 + &.new .new_line {
  110 + background: #CFC;
  111 + border-color: #B9ECB9;
  112 + }
  113 + }
102 114 .line_content {
103 115 display: block;
104 116 white-space: pre;
105 117 height: 18px;
106 118 margin: 0px;
107   - padding: 0px;
  119 + padding: 0px 0.5em;
108 120 border: none;
109 121 &.new {
110 122 background: #CFD;
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @a2be795
... ... @@ -213,7 +213,17 @@ ul.notes {
213 213 .reply-btn {
214 214 @extend .btn-primary;
215 215 }
216   -.file .content tr.line_holder:hover > td { background: $hover !important; }
  216 +.file .content tr.line_holder:hover {
  217 + &> td.line_content {
  218 + background: $hover !important;
  219 + border-color: darken($hover, 10%) !important;
  220 + }
  221 + &> td.new_line,
  222 + &> td.old_line {
  223 + background: darken($hover, 4%) !important;
  224 + border-color: darken($hover, 10%) !important;
  225 + }
  226 +}
217 227 .file .content tr.line_holder:hover > td .line_note_link {
218 228 opacity: 1.0;
219 229 filter: alpha(opacity=100);
... ...
app/views/commits/_text_file.html.haml
  Diff comments   View file @a2be795
... ... @@ -4,7 +4,7 @@
4 4  
5 5 %table.text-file{class: "#{'hide' if too_big}"}
6 6 - each_diff_line(diff, index) do |line, type, line_code, line_new, line_old|
7   - %tr.line_holder{ id: line_code }
  7 + %tr.line_holder{ id: line_code, class: "#{type}" }
8 8 - if type == "match"
9 9 %td.old_line= "..."
10 10 %td.new_line= "..."
... ...