Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fb99a430
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,发现更多精彩内容 >>
提交
fb99a430
编写于
10月 31, 2016
作者:
T
tauriedavis
提交者:
Annabel Dunstone Gray
11月 01, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
23545 Fix distorted project and group avatars
上级
aba94f65
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
77 addition
and
43 deletion
+77
-43
app/assets/stylesheets/framework/avatar.scss
app/assets/stylesheets/framework/avatar.scss
+43
-20
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-4
app/assets/stylesheets/pages/dashboard.scss
app/assets/stylesheets/pages/dashboard.scss
+0
-4
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+9
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-2
app/views/admin/groups/_group.html.haml
app/views/admin/groups/_group.html.haml
+2
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+2
-1
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+2
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+2
-1
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+2
-1
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+2
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+2
-1
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+2
-1
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+5
-4
app/views/users/_groups.html.haml
app/views/users/_groups.html.haml
+2
-1
未找到文件。
app/assets/stylesheets/framework/avatar.scss
浏览文件 @
fb99a430
.avatar
{
@mixin
avatar-size
(
$size
,
$margin-right
)
{
width
:
$size
;
height
:
$size
;
margin-right
:
$margin-right
;
}
.avatar-container
{
float
:
left
;
margin-right
:
12px
;
margin-right
:
15px
;
border-radius
:
$avatar_radius
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.1
);
&
.s16
{
@include
avatar-size
(
16px
,
6px
);
}
&
.s20
{
@include
avatar-size
(
20px
,
7px
);
}
&
.s24
{
@include
avatar-size
(
24px
,
8px
);
}
&
.s26
{
@include
avatar-size
(
26px
,
8px
);
}
&
.s32
{
@include
avatar-size
(
32px
,
10px
);
}
&
.s36
{
@include
avatar-size
(
36px
,
10px
);
}
&
.s40
{
@include
avatar-size
(
40px
,
10px
);
}
&
.s46
{
@include
avatar-size
(
46px
,
15px
);
}
&
.s48
{
@include
avatar-size
(
48px
,
10px
);
}
&
.s60
{
@include
avatar-size
(
60px
,
12px
);
}
&
.s70
{
@include
avatar-size
(
70px
,
14px
);
}
&
.s90
{
@include
avatar-size
(
90px
,
15px
);
}
&
.s110
{
@include
avatar-size
(
110px
,
15px
);
}
&
.s140
{
@include
avatar-size
(
140px
,
15px
);
}
&
.s160
{
@include
avatar-size
(
160px
,
20px
);
}
}
.avatar
{
@extend
.avatar-container
;
width
:
40px
;
height
:
40px
;
padding
:
0
;
border-radius
:
$avatar_radius
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
.1
);
&
.avatar-inline
{
float
:
none
;
...
...
@@ -20,22 +45,6 @@
border-radius
:
0
;
border
:
none
;
}
&
.s16
{
width
:
16px
;
height
:
16px
;
margin-right
:
6px
;
}
&
.s20
{
width
:
20px
;
height
:
20px
;
margin-right
:
7px
;
}
&
.s24
{
width
:
24px
;
height
:
24px
;
margin-right
:
8px
;
}
&
.s26
{
width
:
26px
;
height
:
26px
;
margin-right
:
8px
;
}
&
.s32
{
width
:
32px
;
height
:
32px
;
margin-right
:
10px
;
}
&
.s36
{
width
:
36px
;
height
:
36px
;
margin-right
:
10px
;
}
&
.s40
{
width
:
40px
;
height
:
40px
;
margin-right
:
10px
;
}
&
.s46
{
width
:
46px
;
height
:
46px
;
margin-right
:
15px
;
}
&
.s48
{
width
:
48px
;
height
:
48px
;
margin-right
:
10px
;
}
&
.s60
{
width
:
60px
;
height
:
60px
;
margin-right
:
12px
;
}
&
.s70
{
width
:
70px
;
height
:
70px
;
margin-right
:
14px
;
}
&
.s90
{
width
:
90px
;
height
:
90px
;
margin-right
:
15px
;
}
&
.s110
{
width
:
110px
;
height
:
110px
;
margin-right
:
15px
;
}
&
.s140
{
width
:
140px
;
height
:
140px
;
margin-right
:
20px
;
}
&
.s160
{
width
:
160px
;
height
:
160px
;
margin-right
:
20px
;
}
}
.identicon
{
...
...
@@ -54,3 +63,17 @@
&
.s140
{
font-size
:
72px
;
line-height
:
138px
;
}
&
.s160
{
font-size
:
96px
;
line-height
:
158px
;
}
}
.image-container
{
@extend
.avatar-container
;
overflow
:
hidden
;
display
:
flex
;
.avatar
{
border-radius
:
0
;
border
:
none
;
height
:
auto
;
margin
:
0
;
align-self
:
center
;
}
}
\ No newline at end of file
app/assets/stylesheets/framework/lists.scss
浏览文件 @
fb99a430
...
...
@@ -142,10 +142,6 @@ ul.content-list {
}
}
.avatar
{
margin-right
:
15px
;
}
.controls
{
float
:
right
;
...
...
app/assets/stylesheets/pages/dashboard.scss
浏览文件 @
fb99a430
...
...
@@ -36,10 +36,6 @@
}
}
.dash-project-avatar
{
float
:
left
;
}
.dash-project-access-icon
{
float
:
left
;
margin-right
:
5px
;
...
...
app/assets/stylesheets/pages/groups.scss
浏览文件 @
fb99a430
...
...
@@ -3,12 +3,14 @@
}
.dashboard
.side
.panel
.panel-heading
.input-group
{
.form-control
{
height
:
42px
;
}
}
.group-row
{
.stats
{
float
:
right
;
line-height
:
$list-text-height
;
...
...
@@ -21,12 +23,14 @@
}
.ldap-group-links
{
.form-actions
{
margin-bottom
:
$gl-padding
;
}
}
.groups-cover-block
{
.container-fluid
{
position
:
relative
;
}
...
...
@@ -41,9 +45,14 @@
background-color
:
$background-color
;
}
}
.group-avatar
{
border
:
0
;
}
}
.groups-header
{
@media
(
min-width
:
$screen-sm-min
)
{
.nav-links
{
width
:
35%
;
...
...
app/assets/stylesheets/pages/projects.scss
浏览文件 @
fb99a430
...
...
@@ -96,8 +96,8 @@
.project-avatar
{
float
:
none
;
margin
-left
:
auto
;
margin-right
:
auto
;
margin
:
0
auto
;
border
:
none
;
&
.identicon
{
border-radius
:
50%
;
...
...
app/views/admin/groups/_group.html.haml
浏览文件 @
fb99a430
...
...
@@ -16,7 +16,8 @@
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
,
placement:
'left'
},
title:
visibility_icon_description
(
group
)}
=
visibility_level_icon
(
group
.
visibility_level
,
fw:
false
)
=
image_tag
group_icon
(
group
),
class:
"avatar s40 hidden-xs"
.image-container.s40
=
image_tag
group_icon
(
group
),
class:
"avatar s40 hidden-xs"
.title
=
link_to
[
:admin
,
group
],
class:
'group-name'
do
=
group
.
name
...
...
app/views/admin/groups/show.html.haml
浏览文件 @
fb99a430
...
...
@@ -13,7 +13,8 @@
Group info:
%ul
.well-list
%li
=
image_tag
group_icon
(
@group
),
class:
"avatar s60"
.image-container.s60
=
image_tag
group_icon
(
@group
),
class:
"avatar s60"
%li
%span
.light
Name:
%strong
=
@group
.
name
...
...
app/views/admin/projects/index.html.haml
浏览文件 @
fb99a430
...
...
@@ -76,7 +76,8 @@
.title
=
link_to
[
:admin
,
project
.
namespace
.
becomes
(
Namespace
),
project
]
do
.dash-project-avatar
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
.image-container.s40
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
%span
.project-full-name
%span
.namespace-name
-
if
project
.
namespace
...
...
app/views/groups/edit.html.haml
浏览文件 @
fb99a430
...
...
@@ -8,7 +8,8 @@
.form-group
.col-sm-offset-2.col-sm-10
=
image_tag
group_icon
(
@group
),
alt:
''
,
class:
'avatar group-avatar s160'
.image-container.s160
=
image_tag
group_icon
(
@group
),
alt:
''
,
class:
'avatar group-avatar s160'
%p
.light
-
if
@group
.
avatar?
You can change your group avatar here
...
...
app/views/groups/show.html.haml
浏览文件 @
fb99a430
...
...
@@ -6,7 +6,8 @@
.cover-block.groups-cover-block
%div
{
class:
container_class
}
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s70 avatar-tile"
.image-container.s70.group-avatar
=
image_tag
group_icon
(
@group
),
class:
"avatar s70 avatar-tile"
.group-info
.cover-title
%h1
...
...
app/views/projects/_home_panel.html.haml
浏览文件 @
fb99a430
-
empty_repo
=
@project
.
empty_repo?
.project-home-panel.text-center
{
class:
(
"empty-project"
if
empty_repo
)
}
%div
{
class:
container_class
}
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'project-avatar avatar s70 avatar-tile'
)
.image-container.s70.project-avatar
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s70 avatar-tile'
)
%h1
.project-title
=
@project
.
name
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@project
)}
...
...
app/views/projects/edit.html.haml
浏览文件 @
fb99a430
...
...
@@ -118,7 +118,8 @@
Project avatar
.form-group
-
if
@project
.
avatar?
=
project_icon
(
"
#{
@project
.
namespace
.
to_param
}
/
#{
@project
.
to_param
}
"
,
alt:
''
,
class:
'avatar project-avatar s160'
)
.image-container.s160
=
project_icon
(
"
#{
@project
.
namespace
.
to_param
}
/
#{
@project
.
to_param
}
"
,
alt:
''
,
class:
'avatar project-avatar s160'
)
%p
.light
-
if
@project
.
avatar_in_git
Project avatar in repository:
#{
@project
.
avatar_in_git
}
...
...
app/views/shared/groups/_group.html.haml
浏览文件 @
fb99a430
...
...
@@ -24,7 +24,8 @@
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
,
placement:
'left'
},
title:
visibility_icon_description
(
group
)}
=
visibility_level_icon
(
group
.
visibility_level
,
fw:
false
)
=
image_tag
group_icon
(
group
),
class:
"avatar s40 hidden-xs"
.image-container.s40
=
image_tag
group_icon
(
group
),
class:
"avatar s40 hidden-xs"
.title
=
link_to
group
,
class:
'group-name'
do
=
group
.
name
...
...
app/views/shared/projects/_project.html.haml
浏览文件 @
fb99a430
...
...
@@ -32,10 +32,11 @@
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
-
if
avatar
.dash-project-avatar
-
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'
)
.image-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'
)
%span
.project-full-name
%span
.namespace-name
-
if
project
.
namespace
&&
!
skip_namespace
...
...
app/views/users/_groups.html.haml
浏览文件 @
fb99a430
.clearfix
-
groups
.
each
do
|
group
|
=
link_to
group
,
class:
'profile-groups-avatars inline'
,
title:
group
.
name
do
=
image_tag
group_icon
(
group
),
class:
'avatar group-avatar s40'
.image-container.s40
=
image_tag
group_icon
(
group
),
class:
'avatar group-avatar s40'
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录