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
08f511c8
Commit
08f511c8
authored
Oct 19, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Limit flash notice width on fixed and fluid layout
parent
288cb1a9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
9 deletions
+10
-9
app/assets/javascripts/flash.js
app/assets/javascripts/flash.js
+5
-4
app/views/layouts/_flash.html.haml
app/views/layouts/_flash.html.haml
+1
-1
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+2
-2
spec/javascripts/flash_spec.js
spec/javascripts/flash_spec.js
+2
-2
No files found.
app/assets/javascripts/flash.js
View file @
08f511c8
...
...
@@ -30,12 +30,12 @@ const createAction = config => `
</a>
`
;
const
createFlashEl
=
(
message
,
type
,
is
InContentWrapper
=
false
)
=>
`
const
createFlashEl
=
(
message
,
type
,
is
FixedLayout
=
false
)
=>
`
<div
class="flash-
${
type
}
"
>
<div
class="flash-text
${
is
InContentWrapper
?
'
container-fluid container-limited
'
:
''
}
"
class="flash-text
${
is
FixedLayout
?
'
container-fluid container-limited limit-container-width
'
:
''
}
"
>
${
_
.
escape
(
message
)}
</div>
...
...
@@ -69,12 +69,13 @@ const createFlash = function createFlash(
addBodyClass
=
false
,
)
{
const
flashContainer
=
parent
.
querySelector
(
'
.flash-container
'
);
const
navigation
=
parent
.
querySelector
(
'
.content
'
);
if
(
!
flashContainer
)
return
null
;
const
is
InContentWrapper
=
flashContainer
.
parentNode
.
classList
.
contains
(
'
content-wrapper
'
)
;
const
is
FixedLayout
=
navigation
?
navigation
.
parentNode
.
classList
.
contains
(
'
container-limited
'
)
:
true
;
flashContainer
.
innerHTML
=
createFlashEl
(
message
,
type
,
is
InContentWrapper
);
flashContainer
.
innerHTML
=
createFlashEl
(
message
,
type
,
is
FixedLayout
);
const
flashEl
=
flashContainer
.
querySelector
(
`.flash-
${
type
}
`
);
removeFlashClickListener
(
flashEl
,
fadeTransition
);
...
...
app/views/layouts/_flash.html.haml
View file @
08f511c8
...
...
@@ -6,5 +6,5 @@
-# Don't show a flash message if the message is nil
-
if
value
%div
{
class:
"flash-#{key}"
}
%div
{
class:
"#{
container_class} #{extra_flash
_class}"
}
%div
{
class:
"#{
(container_class unless fluid_layout)} #{(extra_flash_class unless @no_container)} #{@content
_class}"
}
%span
=
value
app/views/layouts/_page.html.haml
View file @
08f511c8
...
...
@@ -7,13 +7,13 @@
.alert-wrapper
=
render
"layouts/header/ee_license_banner"
=
render
"layouts/broadcast"
=
render
'layouts/header/read_only_banner'
=
render
"layouts/header/read_only_banner"
=
render
"layouts/nav/ee/classification_level_banner"
=
yield
:flash_message
=
render
"shared/ping_consent"
-
unless
@hide_breadcrumbs
=
render
"layouts/nav/breadcrumbs"
=
render
"layouts/flash"
=
render
"layouts/flash"
,
extra_flash_class:
'limit-container-width'
.d-flex
%div
{
class:
"#{(container_class unless @no_container)} #{@content_class}"
}
.content
{
id:
"content-body"
}
...
...
spec/javascripts/flash_spec.js
View file @
08f511c8
...
...
@@ -172,7 +172,7 @@ describe('Flash', () => {
flash
(
'
test
'
);
expect
(
document
.
querySelector
(
'
.flash-text
'
).
className
).
toBe
(
'
flash-text container-fluid container-limited
'
,
'
flash-text container-fluid container-limited
limit-container-width
'
,
);
});
...
...
@@ -180,7 +180,7 @@ describe('Flash', () => {
document
.
querySelector
(
'
.content-wrapper
'
).
className
=
'
js-content-wrapper
'
;
flash
(
'
test
'
);
expect
(
document
.
querySelector
(
'
.flash-text
'
).
className
.
trim
()).
to
Be
(
'
flash-text
'
);
expect
(
document
.
querySelector
(
'
.flash-text
'
).
className
.
trim
()).
to
Contain
(
'
flash-text
'
);
});
it
(
'
removes element after clicking
'
,
()
=>
{
...
...
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