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
cad0e848
Commit
cad0e848
authored
Jul 23, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix and style the "Changes suppressed" link.
parent
7e262ebf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
5 deletions
+18
-5
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+4
-3
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-1
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+11
-0
app/views/projects/diffs/_text_file.html.haml
app/views/projects/diffs/_text_file.html.haml
+2
-1
No files found.
app/assets/javascripts/application.js.coffee
View file @
cad0e848
...
...
@@ -164,9 +164,10 @@ $ ->
$
(
'.account-box'
).
hover
->
$
(
@
).
toggleClass
(
'hover'
)
# Commit show suppressed diff
$
(
".diff-content"
).
on
"click"
,
".supp_diff_link"
,
->
$
(
@
).
next
(
'table'
).
show
()
$
(
@
).
remove
()
$
(
document
).
on
'click'
,
'.diff-content .js-show-suppressed-diff'
,
->
$container
=
$
(
@
).
parent
()
$container
.
next
(
'table'
).
show
()
$container
.
remove
()
$
(
'.navbar-toggle'
).
on
'click'
,
->
$
(
'.header-content .title'
).
toggle
()
...
...
app/assets/stylesheets/generic/common.scss
View file @
cad0e848
...
...
@@ -184,7 +184,7 @@ li.note {
}
}
.s
upp_diff_link
,
.s
how-suppressed-diff
,
.show-all-commits
{
cursor
:
pointer
;
}
...
...
app/assets/stylesheets/pages/diff.scss
View file @
cad0e848
...
...
@@ -65,6 +65,17 @@
color
:
#777
;
}
.suppressed-container
{
padding
:
(
$padding-base-vertical
+
5px
)
$padding-base-horizontal
;
text-align
:
center
;
// "Changes suppressed. Click to show." link
.show-suppressed-diff
{
font-size
:
110%
;
font-weight
:
bold
;
}
}
table
{
width
:
100%
;
font-family
:
$monospace_font
;
...
...
app/views/projects/diffs/_text_file.html.haml
View file @
cad0e848
-
too_big
=
diff_file
.
diff_lines
.
count
>
Commit
::
DIFF_SAFE_LINES
-
if
too_big
%a
.supp_diff_link
Changes suppressed. Click to show
.suppressed-container
%a
.show-suppressed-diff.js-show-suppressed-diff
Changes suppressed. Click to show.
%table
.text-file
{
class:
"#{'hide' if too_big}"
}
-
last_line
=
0
...
...
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