Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e49aaf83
Commit
e49aaf83
authored
Apr 16, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds padding to the error block
parent
4b2ff003
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+4
-0
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-2
app/views/discussions/_diff_with_notes.html.haml
app/views/discussions/_diff_with_notes.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/diff.scss
View file @
e49aaf83
...
@@ -160,6 +160,10 @@
...
@@ -160,6 +160,10 @@
}
}
}
}
}
}
.diff-loading-error-block
{
padding
:
$gl-padding
$gl-padding
*
2
;
}
}
}
.image
{
.image
{
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
e49aaf83
...
@@ -768,7 +768,6 @@
...
@@ -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 @@
...
@@ -781,4 +780,4 @@
text-decoration
:
none
;
text-decoration
:
none
;
}
}
}
}
}
}
\ No newline at end of file
app/views/discussions/_diff_with_notes.html.haml
View file @
e49aaf83
...
@@ -30,7 +30,7 @@
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment