Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a56f8fdd
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,发现更多精彩内容 >>
提交
a56f8fdd
编写于
3月 24, 2017
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'projects-list-line-breaks' into 'master'
Fixes project list lines breaking Closes #29018 See merge request !10178
上级
eee409e0
4b08d892
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
70 addition
and
65 deletion
+70
-65
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+35
-34
app/views/shared/projects/_list.html.haml
app/views/shared/projects/_list.html.haml
+1
-1
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+30
-30
changelogs/unreleased/projects-list-line-breaks.yml
changelogs/unreleased/projects-list-line-breaks.yml
+4
-0
未找到文件。
app/assets/stylesheets/pages/projects.scss
浏览文件 @
a56f8fdd
...
...
@@ -582,54 +582,55 @@ pre.light-well {
/*
* Projects list rendered on dashboard and user page
*/
.projects-list
{
@include
basic-list
;
display
:
flex
;
flex-direction
:
column
;
.project-row
{
border-color
:
$white-normal
;
.project-full-name
{
@include
str-truncated
;
display
:
flex
;
align-items
:
center
;
}
@media
(
max-width
:
$screen-xs-max
)
{
max-width
:
50%
;
h3
{
font-size
:
$gl-font-size
;
}
a
{
color
:
$gl-text-color
;
}
.avatar-container
,
.controls
{
line-height
:
$list-text-height
;
.badge
{
@media
(
max-width
:
$screen-xs-max
)
{
display
:
none
;
}
flex
:
0
0
auto
;
}
a
:hov
er
{
text-decoration
:
none
;
.avatar-contain
er
{
align-self
:
flex-start
;
}
>
span
{
margin-left
:
10px
;
}
.project-details
{
min-width
:
0
;
svg
{
position
:
relative
;
top
:
2px
;
p
,
.commit-row-message
{
@include
str-truncated
(
100%
);
margin-bottom
:
0
;
}
}
.description
p
{
@media
(
max-width
:
$screen-xs-max
)
{
max-width
:
50%
;
}
}
.controls
{
margin-left
:
auto
;
}
.bottom
{
padding-top
:
$gl-padding
;
padding-bottom
:
0
;
.ci-status-link
{
display
:
inline-block
;
line-height
:
17px
;
vertical-align
:
middle
;
&
:hover
{
text-decoration
:
none
;
}
}
}
...
...
app/views/shared/projects/_list.html.haml
浏览文件 @
a56f8fdd
...
...
@@ -10,7 +10,7 @@
.js-projects-list-holder
-
if
projects
.
any?
%ul
.projects-list
.content-list
%ul
.projects-list
-
projects
.
each_with_index
do
|
project
,
i
|
-
css_class
=
(
i
>=
projects_limit
)
?
'hide'
:
nil
=
render
"shared/projects/project"
,
project:
project
,
skip_namespace:
skip_namespace
,
...
...
app/views/shared/projects/_project.html.haml
浏览文件 @
a56f8fdd
...
...
@@ -10,32 +10,15 @@
%li
.project-row
{
class:
css_class
}
=
cache
(
cache_key
)
do
.controls
-
if
project
.
archived
%span
.label.label-warning
archived
-
if
project
.
pipeline_status
.
has_status?
%span
=
render_project_pipeline_status
(
project
.
pipeline_status
)
-
if
forks
%span
=
icon
(
'code-fork'
)
=
number_with_delimiter
(
project
.
forks_count
)
-
if
stars
%span
=
icon
(
'star'
)
=
number_with_delimiter
(
project
.
star_count
)
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
,
placement:
'left'
},
title:
visibility_icon_description
(
project
)
}
=
visibility_level_icon
(
project
.
visibility_level
,
fw:
true
)
.title
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
-
if
avatar
.dash-project-avatar
.avatar-container.s40
-
if
use_creator_avatar
=
image_tag
avatar_icon
(
project
.
creator
.
email
,
40
),
class:
"avatar s40"
,
alt
:''
-
else
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
.project-details
%h3
.prepend-top-0.append-bottom-0
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
%span
.project-full-name
%span
.namespace-name
-
if
project
.
namespace
&&
!
skip_namespace
...
...
@@ -45,9 +28,26 @@
=
project
.
name
-
if
show_last_commit_as_description
.description
.description.prepend-top-5
=
link_to_gfm
project
.
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
project
.
commit
),
class:
"commit-row-message"
-
elsif
project
.
description
.
present?
.description
.description.prepend-top-5
=
markdown_field
(
project
,
:description
)
.controls
-
if
project
.
archived
%span
.prepend-left-10.label.label-warning
archived
-
if
project
.
pipeline_status
.
has_status?
%span
.prepend-left-10
=
render_project_pipeline_status
(
project
.
pipeline_status
)
-
if
forks
%span
.prepend-left-10
=
icon
(
'code-fork'
)
=
number_with_delimiter
(
project
.
forks_count
)
-
if
stars
%span
.prepend-left-10
=
icon
(
'star'
)
=
number_with_delimiter
(
project
.
star_count
)
%span
.prepend-left-10.visibility-icon.has-tooltip
{
data:
{
container:
'body'
,
placement:
'left'
},
title:
visibility_icon_description
(
project
)
}
=
visibility_level_icon
(
project
.
visibility_level
,
fw:
true
)
changelogs/unreleased/projects-list-line-breaks.yml
0 → 100644
浏览文件 @
a56f8fdd
---
title
:
Fixed projects list lines breaking
merge_request
:
author
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录