Commit 58634dfb6a5d8218ccf7f1680bac5c201f80ac9a
1 parent
71d44746
Exists in
spb-stable
and in
3 other branches
New class names in notes css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
23 additions
and
20 deletions
Show diff stats
app/assets/javascripts/main.js.coffee
@@ -117,11 +117,11 @@ $ -> | @@ -117,11 +117,11 @@ $ -> | ||
117 | 117 | ||
118 | 118 | ||
119 | # Commit show suppressed diff | 119 | # Commit show suppressed diff |
120 | - $(".content").on "click", ".supp_diff_link", -> | 120 | + $(".diff-content").on "click", ".supp_diff_link", -> |
121 | $(@).next('table').show() | 121 | $(@).next('table').show() |
122 | $(@).remove() | 122 | $(@).remove() |
123 | 123 | ||
124 | - $(".content").on "click", ".js-details-expand", -> | 124 | + $(".diff-content").on "click", ".js-details-expand", -> |
125 | $(@).next('.js-details-contain').removeClass("hide") | 125 | $(@).next('.js-details-contain').removeClass("hide") |
126 | $(@).remove() | 126 | $(@).remove() |
127 | 127 |
app/assets/stylesheets/sections/notes.scss
@@ -47,13 +47,13 @@ ul.notes { | @@ -47,13 +47,13 @@ ul.notes { | ||
47 | .discussion-body { | 47 | .discussion-body { |
48 | margin-left: 50px; | 48 | margin-left: 50px; |
49 | 49 | ||
50 | - .file, | 50 | + .diff-file, |
51 | .discussion-hidden, | 51 | .discussion-hidden, |
52 | .notes { | 52 | .notes { |
53 | @extend .borders; | 53 | @extend .borders; |
54 | background-color: #F9F9F9; | 54 | background-color: #F9F9F9; |
55 | } | 55 | } |
56 | - .file .notes { | 56 | + .diff-file .notes { |
57 | /* reset */ | 57 | /* reset */ |
58 | background: inherit; | 58 | background: inherit; |
59 | border: none; | 59 | border: none; |
@@ -114,7 +114,7 @@ ul.notes { | @@ -114,7 +114,7 @@ ul.notes { | ||
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||
117 | -.file .notes_holder { | 117 | +.diff-file .notes_holder { |
118 | font-size: 13px; | 118 | font-size: 13px; |
119 | line-height: 18px; | 119 | line-height: 18px; |
120 | font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; | 120 | font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; |
@@ -184,7 +184,7 @@ ul.notes { | @@ -184,7 +184,7 @@ ul.notes { | ||
184 | } | 184 | } |
185 | } | 185 | } |
186 | } | 186 | } |
187 | -.file .note .note-actions { | 187 | +.diff-file .note .note-actions { |
188 | right: 0; | 188 | right: 0; |
189 | top: 0; | 189 | top: 0; |
190 | } | 190 | } |
@@ -195,7 +195,7 @@ ul.notes { | @@ -195,7 +195,7 @@ ul.notes { | ||
195 | * Line note button on the side of diffs | 195 | * Line note button on the side of diffs |
196 | */ | 196 | */ |
197 | 197 | ||
198 | -.file tr.line_holder { | 198 | +.diff-file tr.line_holder { |
199 | .add-diff-note { | 199 | .add-diff-note { |
200 | background: url("diff_note_add.png") no-repeat left 0; | 200 | background: url("diff_note_add.png") no-repeat left 0; |
201 | height: 22px; | 201 | height: 22px; |
@@ -235,22 +235,25 @@ ul.notes { | @@ -235,22 +235,25 @@ ul.notes { | ||
235 | .reply-btn { | 235 | .reply-btn { |
236 | @extend .btn-primary; | 236 | @extend .btn-primary; |
237 | } | 237 | } |
238 | -.file .content tr.line_holder:hover { | ||
239 | - &> td.line_content { | ||
240 | - background: $hover !important; | ||
241 | - border-color: darken($hover, 10%) !important; | 238 | +.diff-file .diff-content { |
239 | + tr.line_holder:hover { | ||
240 | + &> td.line_content { | ||
241 | + background: $hover !important; | ||
242 | + border-color: darken($hover, 10%) !important; | ||
243 | + } | ||
244 | + &> td.new_line, | ||
245 | + &> td.old_line { | ||
246 | + background: darken($hover, 4%) !important; | ||
247 | + border-color: darken($hover, 10%) !important; | ||
248 | + } | ||
242 | } | 249 | } |
243 | - &> td.new_line, | ||
244 | - &> td.old_line { | ||
245 | - background: darken($hover, 4%) !important; | ||
246 | - border-color: darken($hover, 10%) !important; | 250 | + |
251 | + tr.line_holder:hover > td .line_note_link { | ||
252 | + opacity: 1.0; | ||
253 | + filter: alpha(opacity=100); | ||
247 | } | 254 | } |
248 | } | 255 | } |
249 | -.file .content tr.line_holder:hover > td .line_note_link { | ||
250 | - opacity: 1.0; | ||
251 | - filter: alpha(opacity=100); | ||
252 | -} | ||
253 | -.file, | 256 | +.diff-file, |
254 | .discussion { | 257 | .discussion { |
255 | .new_note { | 258 | .new_note { |
256 | margin: 0; | 259 | margin: 0; |