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
beece83a
Commit
beece83a
authored
Mar 20, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve header with avatar for group and user pages
parent
f0d052b6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
30 deletions
+45
-30
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+19
-0
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+0
-5
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+8
-7
app/views/users/_profile.html.haml
app/views/users/_profile.html.haml
+0
-4
app/views/users/show.html.haml
app/views/users/show.html.haml
+18
-14
No files found.
app/assets/stylesheets/generic/common.scss
View file @
beece83a
...
@@ -355,3 +355,22 @@ table {
...
@@ -355,3 +355,22 @@ table {
bottom
:
20px
!
important
;
bottom
:
20px
!
important
;
left
:
20px
!
important
;
left
:
20px
!
important
;
}
}
.header-with-avatar
{
h3
{
margin
:
0
;
font-weight
:
bold
;
}
.username
{
font-size
:
18px
;
color
:
#666
;
margin-top
:
8px
;
}
.description
{
font-size
:
16px
;
color
:
#666
;
margin-top
:
8px
;
}
}
app/assets/stylesheets/pages/profile.scss
View file @
beece83a
...
@@ -41,11 +41,6 @@
...
@@ -41,11 +41,6 @@
}
}
}
}
.user-show-username
{
font-weight
:
200
;
color
:
#666
;
}
/*
/*
* Appearance settings
* Appearance settings
*
*
...
...
app/views/groups/show.html.haml
View file @
beece83a
.dashboard
.dashboard
%div
.header-with-avatar.clearfix
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s90"
=
image_tag
group_icon
(
@group
),
class:
"avatar group-avatar s90"
.clearfix
%h3
%h2
=
@group
.
name
=
@group
.
name
.username
@
#{
@group
.
path
}
-
if
@group
.
description
.
present?
-
if
@group
.
description
.
present?
%p
.description
=
escaped_autolink
(
@group
.
description
)
=
escaped_autolink
(
@group
.
description
)
%hr
%hr
.row
.row
...
...
app/views/users/_profile.html.haml
View file @
beece83a
...
@@ -25,7 +25,3 @@
...
@@ -25,7 +25,3 @@
%li
%li
%span
.light
Location:
%span
.light
Location:
%strong
=
user
.
location
%strong
=
user
.
location
-
unless
user
.
bio
.
blank?
%li
%span
.light
Bio:
%span
=
user
.
bio
app/views/users/show.html.haml
View file @
beece83a
...
@@ -2,21 +2,25 @@
...
@@ -2,21 +2,25 @@
=
link_to
'#aside'
,
class:
'show-aside'
do
=
link_to
'#aside'
,
class:
'show-aside'
do
%i
.fa.fa-angle-left
%i
.fa.fa-angle-left
%section
.col-md-8
%section
.col-md-8
%h3
.page-title
.header-with-avatar
=
image_tag
avatar_icon
(
@user
.
email
,
90
),
class:
"avatar avatar-tile s90"
,
alt:
''
=
image_tag
avatar_icon
(
@user
.
email
,
90
),
class:
"avatar avatar-tile s90"
,
alt:
''
%h3
=
@user
.
name
=
@user
.
name
-
if
@user
==
current_user
-
if
@user
==
current_user
.pull-right
.pull-right
=
link_to
profile_path
,
class:
'btn
'
do
=
link_to
profile_path
,
class:
'btn btn-sm
'
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
Edit Profile settings
Edit Profile settings
%br
.username
%span
.user-show-username
#{
@user
.
username
}
@
#{
@user
.
username
}
%br
.description
%small
member since
#{
@user
.
created_at
.
stamp
(
"Nov 12, 2031"
)
}
-
if
@user
.
bio
.
present?
=
@user
.
bio
.clearfix
.clearfix
-
if
@groups
.
any?
-
if
@groups
.
any?
.prepend-top-20
%h4
Groups
%h4
Groups
=
render
'groups'
,
groups:
@groups
=
render
'groups'
,
groups:
@groups
%hr
%hr
...
...
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