kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Adds padding to the error block

Browse source
This commit is contained in:
Filipa Lacerda 2018-04-16 18:48:53 +01:00
parent 4b2ff00392
commit e49aaf838a
No known key found for this signature in database
GPG key ID: 9CA3FDE4D1E2F1C8
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/pages/diff.scss
View file

@ -160,6 +160,10 @@
} }
} }
} }
.diff-loading-error-block {
padding: $gl-padding $gl-padding*2;
}
} }
.image { .image {

3
app/assets/stylesheets/pages/merge_requests.scss
View file

@ -768,7 +768,6 @@
// wich causes a blank button when it's disabled and hovering // wich causes a blank button when it's disabled and hovering
// The css in here is the boostrap one // The css in here is the boostrap one
.btn-link-retry { .btn-link-retry {
&[disabled] { &[disabled] {
cursor: not-allowed; cursor: not-allowed;
filter: alpha(opacity=65); filter: alpha(opacity=65);
@ -781,4 +780,4 @@
text-decoration: none; text-decoration: none;
} }
} }
} }

2
app/views/discussions/_diff_with_notes.html.haml
View file

@ -30,7 +30,7 @@
%td.new_line.diff-line-num %td.new_line.diff-line-num
%td.line_content.js-success-lazy-load %td.line_content.js-success-lazy-load
.js-code-placeholder .js-code-placeholder
%td.line_content.js-error-lazy-load-diff.hidden %td.js-error-lazy-load-diff.hidden.diff-loading-error-block
- button = button_tag(_("Try again"), class: "btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button") - button = button_tag(_("Try again"), class: "btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button")
= _("Unable to load the diff. %{button_try_again}").html_safe % { button_try_again: button} = _("Unable to load the diff. %{button_try_again}").html_safe % { button_try_again: button}
= render "discussions/diff_discussion", discussions: [discussion], expanded: true = render "discussions/diff_discussion", discussions: [discussion], expanded: true