Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
639b25e3
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,体验更适合开发者的 AI 搜索 >>
提交
639b25e3
编写于
2月 02, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve UI consistency between projects and groups lists
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
bb51e9c6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
49 addition
and
20 deletion
+49
-20
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+19
-1
app/views/dashboard/_groups_head.html.haml
app/views/dashboard/_groups_head.html.haml
+13
-7
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+0
-9
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+16
-3
未找到文件。
CHANGELOG
浏览文件 @
639b25e3
...
...
@@ -25,6 +25,7 @@ v 8.5.0 (unreleased)
- Deprecate API "merge_request/:merge_request_id/...". Use "merge_requests/:merge_request_id/..." instead
- Mark inline difference between old and new paths when a file is renamed
- Support Akismet spam checking for creation of issues via API (Stan Hu)
- Improve UI consistency between projects and groups lists
v 8.4.3
- Increase lfs_objects size column to 8-byte integer to allow files larger
...
...
app/assets/stylesheets/pages/groups.scss
浏览文件 @
639b25e3
...
...
@@ -4,7 +4,7 @@
input
[
type
=
'search'
]
{
width
:
225px
;
vertical-align
:
bottom
;
@media
(
max-width
:
$screen-xs-max
)
{
width
:
100px
;
vertical-align
:
bottom
;
...
...
@@ -21,3 +21,21 @@
height
:
42px
;
}
}
.group-row
{
&
.no-description
{
.group-name
{
line-height
:
44px
;
}
}
.stats
{
float
:
right
;
line-height
:
44px
;
color
:
$gl-gray
;
span
{
margin-right
:
15px
;
}
}
}
app/views/dashboard/_groups_head.html.haml
浏览文件 @
639b25e3
%ul
.nav-links
=
nav_link
(
page:
dashboard_groups_path
)
do
=
link_to
dashboard_groups_path
,
title:
'Your groups'
,
data:
{
placement:
'right'
}
do
Your Groups
=
nav_link
(
page:
explore_groups_path
)
do
=
link_to
explore_groups_path
,
title:
'Explore groups'
,
data:
{
placement:
'bottom'
}
do
Explore Groups
.top-area
%ul
.nav-links
=
nav_link
(
page:
dashboard_groups_path
)
do
=
link_to
dashboard_groups_path
,
title:
'Your groups'
,
data:
{
placement:
'right'
}
do
Your Groups
=
nav_link
(
page:
explore_groups_path
)
do
=
link_to
explore_groups_path
,
title:
'Explore groups'
,
data:
{
placement:
'bottom'
}
do
Explore Groups
-
if
current_user
.
can_create_group?
.projects-search-form
=
link_to
new_group_path
,
class:
"btn btn-new"
do
=
icon
(
'plus'
)
New Group
app/views/dashboard/groups/index.html.haml
浏览文件 @
639b25e3
...
...
@@ -2,15 +2,6 @@
-
header_title
"Groups"
,
dashboard_groups_path
=
render
'dashboard/groups_head'
.gray-content-block
-
if
current_user
.
can_create_group?
%span
.pull-right.hidden-xs
=
link_to
new_group_path
,
class:
"btn btn-new"
do
%i
.fa.fa-plus
New Group
.oneline
Group members have access to all group projects.
%ul
.content-list
-
@group_members
.
each
do
|
group_member
|
-
group
=
group_member
.
group
...
...
app/views/shared/groups/_group.html.haml
浏览文件 @
639b25e3
-
group_member
=
local_assigns
[
:group_member
]
%li
-
css_class
=
''
unless
local_assigns
[
:css_class
]
-
css_class
+=
" no-description"
if
group
.
description
.
blank?
%li
.group-row
{
class:
css_class
}
-
if
group_member
.controls.hidden-xs
-
if
can?
(
current_user
,
:admin_group
,
group
)
...
...
@@ -9,6 +12,15 @@
=
link_to
leave_group_group_members_path
(
group
),
data:
{
confirm:
leave_group_message
(
group
.
name
)
},
method: :delete
,
class:
"btn-sm btn btn-grouped"
,
title:
'Leave this group'
do
%i
.fa.fa-sign-out
.stats
%span
=
icon
(
'home'
)
=
group
.
projects
.
count
%span
=
icon
(
'users'
)
=
group
.
users
.
count
=
image_tag
group_icon
(
group
),
class:
"avatar s46 hidden-xs"
=
link_to
group
,
class:
'group-name'
do
%span
.item-title
=
group
.
name
...
...
@@ -17,5 +29,6 @@
as
%span
#{
group_member
.
human_access
}
%div
.light
#{
pluralize
(
group
.
projects
.
count
,
"project"
)
}
,
#{
pluralize
(
group
.
users
.
count
,
"user"
)
}
-
if
group
.
description
.
present?
.light
=
markdown
(
group
.
description
,
pipeline: :description
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录