Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
fae8468d
Commit
fae8468d
authored
Sep 08, 2016
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shrink profile info
parent
9498c4d5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
37 deletions
+39
-37
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+3
-3
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+34
-32
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
fae8468d
...
...
@@ -144,12 +144,9 @@
.cover-title
{
color
:
$gl-header-color
;
margin
:
0
;
font-size
:
24px
;
font-weight
:
normal
;
margin-bottom
:
10px
;
color
:
#4c4e54
;
font-size
:
23px
;
line-height
:
1
.1
;
h1
{
color
:
$gl-gray-dark
;
...
...
@@ -213,6 +210,9 @@
}
}
}
&
.user-cover-block
{
padding
:
24px
0
0
;
}
.group-info
{
...
...
app/assets/stylesheets/framework/typography.scss
View file @
fae8468d
...
...
@@ -204,7 +204,7 @@ body {
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
color
:
$gl-
header
-color
;
color
:
$gl-
title
-color
;
font-weight
:
600
;
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
fae8468d
...
...
@@ -102,7 +102,7 @@ $gl-grayish-blue: #7f8fa4;
$gl-gray
:
$gl-text-color
;
$gl-gray-dark
:
#313236
;
$gl-gray-light
:
$gl-placeholder-color
;
$gl-header-color
:
$gl-title-color
;
$gl-header-color
:
#4c4e54
;
/*
* Lists
...
...
app/views/users/show.html.haml
View file @
fae8468d
...
...
@@ -10,7 +10,7 @@
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
.user-profile
.cover-block
.cover-block
.user-cover-block
.cover-controls
-
if
@user
==
current_user
=
link_to
profile_path
,
class:
'btn btn-gray'
do
...
...
@@ -38,44 +38,46 @@
.avatar-holder
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
image_tag
avatar_icon
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
.cover-title
=
@user
.
name
.user-info
.cover-title
=
@user
.
name
%span
@
#{
@user
.
username
}
.cover-desc
%span
.middle-dot-divider
@
#{
@user
.
username
}
%span
.middle-dot-divider
Member since
#{
@user
.
created_at
.
to_s
(
:medium
)
}
.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
-
if
@user
.
bio
.
present?
.cover-desc
%p
.profile-user-bio
=
@user
.
bio
.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
%ul
.nav-links.center.user-profile-nav
%li
.js-activity-tab
=
link_to
user_calendar_activities_path
,
data:
{
target:
'div#activity'
,
action:
'activity'
,
toggle:
'tab'
}
do
...
...
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