Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
99c37390
Commit
99c37390
authored
Sep 16, 2016
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up profile
parent
fae8468d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
82 additions
and
56 deletions
+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
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
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
View file @
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
View file @
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment