diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-16 18:48:53 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-16 18:48:53 +0100 |
| commit | e49aaf838a017d576b27d117cc298a99a313c0ac (patch) | |
| tree | 3281a3523bc7e48f2fe8375157f42a4a75ad1c91 | |
| parent | 4b2ff003920cff431ef4e3e8b0436aa924b34fda (diff) | |
| download | gitlab-ce-e49aaf838a017d576b27d117cc298a99a313c0ac.tar.gz | |
Adds padding to the error block
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 3 | ||||
| -rw-r--r-- | app/views/discussions/_diff_with_notes.html.haml | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 679f783b1b6..a304e019ef1 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -160,6 +160,10 @@ } } } + + .diff-loading-error-block { + padding: $gl-padding $gl-padding*2; + } } .image { diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 85beba92da4..eec1946d879 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -768,7 +768,6 @@ // wich causes a blank button when it's disabled and hovering // The css in here is the boostrap one .btn-link-retry { - &[disabled] { cursor: not-allowed; filter: alpha(opacity=65); @@ -781,4 +780,4 @@ text-decoration: none; } } -}
\ No newline at end of file +} diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index b27d73c803c..646e89e9bd1 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -30,7 +30,7 @@ %td.new_line.diff-line-num %td.line_content.js-success-lazy-load .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") = _("Unable to load the diff. %{button_try_again}").html_safe % { button_try_again: button} = render "discussions/diff_discussion", discussions: [discussion], expanded: true |