Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
90a494ee
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
90a494ee
编写于
10月 19, 2018
作者:
G
George Tsiolis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Limit flash notice width on fixed and fluid layout
上级
d25a8ed0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
9 deletion
+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
未找到文件。
app/assets/javascripts/flash.js
浏览文件 @
90a494ee
...
...
@@ -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
浏览文件 @
90a494ee
...
...
@@ -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
浏览文件 @
90a494ee
...
...
@@ -6,12 +6,12 @@
.mobile-overlay
.alert-wrapper
=
render
"layouts/broadcast"
=
render
'layouts/header/read_only_banner'
=
render
"layouts/header/read_only_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
浏览文件 @
90a494ee
...
...
@@ -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
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录