Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
e05a33fec9f4
Commit
9fca7b43
authored
Jun 23, 2017
by
Phil Hughes
Committed by
Annabel Dunstone Gray
Jun 23, 2017
Browse files
Limit the width of commit & snippet comment sections
parent
4b644d1831ea
Changes
7
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/pages/issuable.scss
View file @
e05a33fe
...
...
@@ -11,7 +11,9 @@
.commit-box
,
.info-well
,
.commit-ci-menu
,
.files-changed
{
.files-changed
,
.limited-header-width
,
.limited-width-notes
{
@extend
.fixed-width-container
;
}
...
...
app/views/projects/commit/show.html.haml
View file @
e05a33fe
-
@no_container
=
true
-
container_class
=
!
fluid_layout
&&
diff_view
==
:inline
?
'container-limited'
:
''
-
limited_container_width
=
fluid_layout
||
diff_view
==
:inline
?
''
:
'limit-container-width'
-
limited_container_width
=
fluid_layout
?
''
:
'limit-container-width'
-
page_title
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
,
"Commits"
-
page_description
@commit
.
description
=
render
"projects/commits/head"
...
...
@@ -13,7 +13,8 @@
.block-connector
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
true
-
if
can_collaborate_with_project?
-
%w(revert cherry-pick)
.
each
do
|
type
|
=
render
"projects/commit/change"
,
type:
type
,
commit:
@commit
,
title:
@commit
.
title
.limited-width-notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
true
-
if
can_collaborate_with_project?
-
%w(revert cherry-pick)
.
each
do
|
type
|
=
render
"projects/commit/change"
,
type:
type
,
commit:
@commit
,
title:
@commit
.
title
app/views/projects/snippets/show.html.haml
View file @
e05a33fe
-
@content_class
=
"limit-container-width limited-inner-width-container"
unless
fluid_layout
-
page_title
"
#{
@snippet
.
title
}
(
#{
@snippet
.
to_reference
}
)"
,
"Snippets"
=
render
'shared/snippets/header'
...
...
@@ -9,4 +10,4 @@
.row-content-block.top-block.content-component-block
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
#notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
true
#notes
.limited-width-notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
true
app/views/shared/snippets/_header.html.haml
View file @
e05a33fe
...
...
@@ -16,7 +16,7 @@
-
else
=
render
"snippets/actions"
.snippet-header
.snippet-header
.limited-header-width
%h2
.snippet-title.prepend-top-0.append-bottom-0
=
markdown_field
(
@snippet
,
:title
)
...
...
app/views/snippets/show.html.haml
View file @
e05a33fe
-
@content_class
=
"limit-container-width limited-inner-width-container"
unless
fluid_layout
-
page_title
"
#{
@snippet
.
title
}
(
#{
@snippet
.
to_reference
}
)"
,
"Snippets"
=
render
'shared/snippets/header'
...
...
@@ -9,4 +10,4 @@
.row-content-block.top-block.content-component-block
=
render
'award_emoji/awards_block'
,
awardable:
@snippet
,
inline:
true
#notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
false
#notes
.limited-width-notes
=
render
"shared/notes/notes_with_form"
,
:autocomplete
=>
false
changelogs/unreleased/commit-comments-limited-width.yml
0 → 100644
View file @
e05a33fe
---
title
:
Limit commit & snippets comments width
merge_request
:
author
:
spec/views/projects/commit/show.html.haml_spec.rb
View file @
e05a33fe
...
...
@@ -21,24 +21,26 @@
context
'inline diff view'
do
before
do
allow
(
view
).
to
receive
(
:diff_view
).
and_return
(
:inline
)
allow
(
view
).
to
receive
(
:diff_view
).
and_return
(
:inline
)
render
end
it
'
keeps container-
limited'
do
expect
(
rendered
).
not_
to
have_selector
(
'.limit-container-width'
)
it
'
has
limited
width
'
do
expect
(
rendered
).
to
have_selector
(
'.limit-container-width'
)
end
end
context
'parallel diff view'
do
before
do
allow
(
view
).
to
receive
(
:diff_view
).
and_return
(
:parallel
)
allow
(
view
).
to
receive
(
:fluid_layout
).
and_return
(
true
)
render
end
it
'spans full width'
do
expect
(
rendered
).
to
have_selector
(
'.limit-container-width'
)
expect
(
rendered
).
not_
to
have_selector
(
'.limit-container-width'
)
end
end
end
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