Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
99c37390
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,发现更多精彩内容 >>
提交
99c37390
编写于
9月 16, 2016
作者:
T
tauriedavis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
clean up profile
上级
fae8468d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
82 addition
and
56 deletion
+82
-56
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+0
-5
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+37
-4
app/views/users/show.html.haml
app/views/users/show.html.haml
+45
-47
未找到文件。
app/assets/stylesheets/framework/blocks.scss
浏览文件 @
99c37390
...
...
@@ -129,8 +129,6 @@
position
:
relative
;
.avatar-holder
{
margin-bottom
:
16px
;
.avatar
,
.identicon
{
margin
:
0
auto
;
float
:
none
;
...
...
@@ -143,9 +141,6 @@
.cover-title
{
color
:
$gl-header-color
;
margin
:
0
;
font-weight
:
normal
;
margin-bottom
:
10px
;
font-size
:
23px
;
h1
{
...
...
app/assets/stylesheets/pages/profile.scss
浏览文件 @
99c37390
...
...
@@ -93,8 +93,9 @@
.profile-user-bio
{
// Limits the width of the user bio for readability.
max-width
:
750px
;
margin
:
auto
;
max-width
:
600px
;
margin
:
15px
auto
0
;
padding
:
0
16px
;
}
.user-avatar-button
{
...
...
@@ -212,6 +213,28 @@
}
.user-profile
{
.cover-controls
a
{
margin-left
:
5px
;
}
.profile-header
{
margin
:
0
auto
;
.avatar-holder
{
width
:
90px
;
display
:
inline-block
;
}
.user-info
{
display
:
inline-block
;
text-align
:
left
;
vertical-align
:
middle
;
margin-left
:
15px
;
.handle
{
color
:
$gl-gray-light
;
}
.member-date
{
margin-bottom
:
4px
;
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
.cover-block
{
padding-top
:
20px
;
...
...
@@ -219,16 +242,26 @@
.cover-controls
{
position
:
static
;
padding
:
0
16px
;
margin-bottom
:
20px
;
display
:
-
webkit-flex
;
display
:
flex
;
.btn
{
display
:
inline-block
;
width
:
46%
;
-webkit-flex-grow
:
1
;
flex-grow
:
1
;
&
:first-child
{
margin-left
:
0
;
}
}
}
}
}
.user-profile-nav
{
margin-top
:
15px
;
}
table
.u2f-registrations
{
th
:not
(
:last-child
),
td
:not
(
:last-child
)
{
border-right
:
solid
1px
transparent
;
...
...
app/views/users/show.html.haml
浏览文件 @
99c37390
...
...
@@ -16,62 +16,60 @@
=
link_to
profile_path
,
class:
'btn btn-gray'
do
=
icon
(
'pencil'
)
-
elsif
current_user
%span
.report-abuse
-
if
@user
.
abuse_report
%button
.btn.btn-danger
{
title:
'Already reported for abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
,
container:
'body'
}}
=
icon
(
'exclamation-circle'
)
-
else
=
link_to
new_abuse_report_path
(
user_id:
@user
.
id
,
ref_url:
request
.
referrer
),
class:
'btn btn-gray'
,
title:
'Report abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
,
container:
'body'
}
do
=
icon
(
'exclamation-circle'
)
-
if
@user
.
abuse_report
%button
.btn.btn-danger
{
title:
'Already reported for abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}}
=
icon
(
'exclamation-circle'
)
-
else
=
link_to
new_abuse_report_path
(
user_id:
@user
.
id
,
ref_url:
request
.
referrer
),
class:
'btn btn-gray'
,
title:
'Report abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'exclamation-circle'
)
-
if
current_user
=
link_to
user_path
(
@user
,
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'btn btn-gray'
do
=
icon
(
'rss'
)
-
if
current_user
.
admin?
=
link_to
[
:admin
,
@user
],
class:
'btn btn-gray'
,
title:
'View user in admin area'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'users'
)
.avatar-holder
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
image_tag
avatar_icon
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
.profile-header
.avatar-holder
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
image_tag
avatar_icon
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
.user-info
.cover-title
=
@user
.
name
%span
@
#{
@user
.
username
}
.cover-desc
%span
.middle-dot-divider
Member since
#{
@user
.
created_at
.
to_s
(
:medium
)
}
.cover-desc
-
unless
@user
.
public_email
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
@user
.
public_email
,
"mailto:
#{
@user
.
public_email
}
"
-
unless
@user
.
skype
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
"skype:
#{
@user
.
skype
}
"
,
title:
"Skype"
do
=
icon
(
'skype'
)
-
unless
@user
.
linkedin
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
"https://www.linkedin.com/in/
#{
@user
.
linkedin
}
"
,
title:
"LinkedIn"
do
=
icon
(
'linkedin-square'
)
-
unless
@user
.
twitter
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
"https://twitter.com/
#{
@user
.
twitter
}
"
,
title:
"Twitter"
do
=
icon
(
'twitter-square'
)
-
unless
@user
.
website_url
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
@user
.
short_website_url
,
@user
.
full_website_url
-
unless
@user
.
location
.
blank?
.profile-link-holder.middle-dot-divider
=
icon
(
'map-marker'
)
=
@user
.
location
.user-info
.cover-title
=
@user
.
name
%span
.handle
@
#{
@user
.
username
}
.cover-desc.member-date
%span
.middle-dot-divider
Member since
#{
@user
.
created_at
.
to_s
(
:medium
)
}
.cover-desc
-
unless
@user
.
public_email
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
@user
.
public_email
,
"mailto:
#{
@user
.
public_email
}
"
-
unless
@user
.
skype
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
"skype:
#{
@user
.
skype
}
"
,
title:
"Skype"
do
=
icon
(
'skype'
)
-
unless
@user
.
linkedin
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
"https://www.linkedin.com/in/
#{
@user
.
linkedin
}
"
,
title:
"LinkedIn"
do
=
icon
(
'linkedin-square'
)
-
unless
@user
.
twitter
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
"https://twitter.com/
#{
@user
.
twitter
}
"
,
title:
"Twitter"
do
=
icon
(
'twitter-square'
)
-
unless
@user
.
website_url
.
blank?
.profile-link-holder.middle-dot-divider
=
link_to
@user
.
short_website_url
,
@user
.
full_website_url
-
unless
@user
.
location
.
blank?
.profile-link-holder.middle-dot-divider
=
icon
(
'map-marker'
)
=
@user
.
location
-
if
@user
.
bio
.
present?
.cover-desc
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录