Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0ff56434
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,发现更多精彩内容 >>
提交
0ff56434
编写于
1月 05, 2017
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Keep max width on MR content on side by side view
上级
3b8c81fe
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
52 addition
and
3 deletion
+52
-3
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+49
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-2
未找到文件。
app/assets/stylesheets/pages/issuable.scss
浏览文件 @
0ff56434
// Limit MR description for side-by-side diff view
.fixed-width-container
{
max-width
:
$limited-layout-width
-
(
$gl-padding
*
2
);
margin-left
:
auto
;
margin-right
:
auto
;
}
.limit-container-width
{
.detail-page-header
{
@extend
.fixed-width-container
;
}
.issuable-details
{
.detail-page-description
,
.mr-source-target
,
.mr-state-widget
,
.merge-manually
{
@extend
.fixed-width-container
;
}
.merge-request-tabs-holder
{
&
.affix
{
border-bottom
:
1px
solid
$border-color
;
.nav-links
{
border
:
0
;
}
}
.container-fluid
{
@extend
.fixed-width-container
;
}
}
}
.merge-request-details
{
.emoji-list-container
{
@extend
.fixed-width-container
;
}
}
.diffs
{
.mr-version-controls
,
.files-changed
{
@extend
.fixed-width-container
;
}
}
}
.issuable-details
{
.issuable-details
{
section
{
section
{
.issuable-discussion
{
.issuable-discussion
{
...
...
app/views/projects/issues/show.html.haml
浏览文件 @
0ff56434
-
@content_class
=
"limit-container-width"
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
"
#{
@issue
.
title
}
(
#{
@issue
.
to_reference
}
)"
,
"Issues"
-
page_title
"
#{
@issue
.
title
}
(
#{
@issue
.
to_reference
}
)"
,
"Issues"
-
page_description
@issue
.
description
-
page_description
@issue
.
description
-
page_card_attributes
@issue
.
card_attributes
-
page_card_attributes
@issue
.
card_attributes
...
...
app/views/projects/merge_requests/_show.html.haml
浏览文件 @
0ff56434
-
@content_class
=
"limit-container-width"
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
-
page_card_attributes
@merge_request
.
card_attributes
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
=
succeed
'.'
do
=
succeed
'.'
do
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
.content-block.content-block-small
.content-block.content-block-small
.emoji-list-container
=
render
'award_emoji/awards_block'
,
awardable:
@merge_request
,
inline:
true
=
render
'award_emoji/awards_block'
,
awardable:
@merge_request
,
inline:
true
-
if
@commits_count
.
nonzero?
-
if
@commits_count
.
nonzero?
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录