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
Léo-Paul Géneau
gitlab-ce
Commits
46641888
Commit
46641888
authored
Nov 03, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update avatar container name so it doesnt conflict with other image containers
parent
651bdd7c
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
15 additions
and
15 deletions
+15
-15
app/assets/stylesheets/framework/avatar.scss
app/assets/stylesheets/framework/avatar.scss
+5
-5
app/views/admin/groups/_group.html.haml
app/views/admin/groups/_group.html.haml
+1
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-1
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-1
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+1
-1
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+1
-1
app/views/users/_groups.html.haml
app/views/users/_groups.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/avatar.scss
View file @
46641888
...
...
@@ -4,7 +4,7 @@
margin-right
:
$margin-right
;
}
.avatar-c
ontainer
{
.avatar-c
ircle
{
float
:
left
;
margin-right
:
15px
;
border-radius
:
$avatar_radius
;
...
...
@@ -27,7 +27,7 @@
}
.avatar
{
@extend
.avatar-c
ontainer
;
@extend
.avatar-c
ircle
;
width
:
40px
;
height
:
40px
;
padding
:
0
;
...
...
@@ -64,8 +64,8 @@
&
.s160
{
font-size
:
96px
;
line-height
:
158px
;
}
}
.
image
-container
{
@extend
.avatar-c
ontainer
;
.
avatar
-container
{
@extend
.avatar-c
ircle
;
overflow
:
hidden
;
display
:
flex
;
...
...
app/views/admin/groups/_group.html.haml
View file @
46641888
...
...
@@ -16,7 +16,7 @@
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
,
placement:
'left'
},
title:
visibility_icon_description
(
group
)}
=
visibility_level_icon
(
group
.
visibility_level
,
fw:
false
)
.
image
-container.s40
.
avatar
-container.s40
=
image_tag
group_icon
(
group
),
class:
"avatar s40 hidden-xs"
.title
=
link_to
[
:admin
,
group
],
class:
'group-name'
do
...
...
app/views/admin/groups/show.html.haml
View file @
46641888
...
...
@@ -13,7 +13,7 @@
Group info:
%ul
.well-list
%li
.
image
-container.s60
.
avatar
-container.s60
=
image_tag
group_icon
(
@group
),
class:
"avatar s60"
%li
%span
.light
Name:
...
...
app/views/admin/projects/index.html.haml
View file @
46641888
...
...
@@ -76,7 +76,7 @@
.title
=
link_to
[
:admin
,
project
.
namespace
.
becomes
(
Namespace
),
project
]
do
.dash-project-avatar
.
image
-container.s40
.
avatar
-container.s40
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
%span
.project-full-name
%span
.namespace-name
...
...
app/views/groups/edit.html.haml
View file @
46641888
...
...
@@ -8,7 +8,7 @@
.form-group
.col-sm-offset-2.col-sm-10
.
image
-container.s160
.
avatar
-container.s160
=
image_tag
group_icon
(
@group
),
alt:
''
,
class:
'avatar group-avatar s160'
%p
.light
-
if
@group
.
avatar?
...
...
app/views/groups/show.html.haml
View file @
46641888
...
...
@@ -6,7 +6,7 @@
.cover-block.groups-cover-block
%div
{
class:
container_class
}
.
image
-container.s70.group-avatar
.
avatar
-container.s70.group-avatar
=
image_tag
group_icon
(
@group
),
class:
"avatar s70 avatar-tile"
.group-info
.cover-title
...
...
app/views/projects/_home_panel.html.haml
View file @
46641888
-
empty_repo
=
@project
.
empty_repo?
.project-home-panel.text-center
{
class:
(
"empty-project"
if
empty_repo
)
}
%div
{
class:
container_class
}
.
image
-container.s70.project-avatar
.
avatar
-container.s70.project-avatar
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s70 avatar-tile'
)
%h1
.project-title
=
@project
.
name
...
...
app/views/projects/edit.html.haml
View file @
46641888
...
...
@@ -118,7 +118,7 @@
Project avatar
.form-group
-
if
@project
.
avatar?
.
image
-container.s160
.
avatar
-container.s160
=
project_icon
(
"
#{
@project
.
namespace
.
to_param
}
/
#{
@project
.
to_param
}
"
,
alt:
''
,
class:
'avatar project-avatar s160'
)
%p
.light
-
if
@project
.
avatar_in_git
...
...
app/views/shared/groups/_group.html.haml
View file @
46641888
...
...
@@ -24,7 +24,7 @@
%span
.visibility-icon.has-tooltip
{
data:
{
container:
'body'
,
placement:
'left'
},
title:
visibility_icon_description
(
group
)}
=
visibility_level_icon
(
group
.
visibility_level
,
fw:
false
)
.
image
-container.s40
.
avatar
-container.s40
=
image_tag
group_icon
(
group
),
class:
"avatar s40 hidden-xs"
.title
=
link_to
group
,
class:
'group-name'
do
...
...
app/views/shared/projects/_project.html.haml
View file @
46641888
...
...
@@ -32,7 +32,7 @@
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
-
if
avatar
.dash-project-avatar
.
image
-container.s40
.
avatar
-container.s40
-
if
use_creator_avatar
=
image_tag
avatar_icon
(
project
.
creator
.
email
,
40
),
class:
"avatar s40"
,
alt
:''
-
else
...
...
app/views/users/_groups.html.haml
View file @
46641888
.clearfix
-
groups
.
each
do
|
group
|
=
link_to
group
,
class:
'profile-groups-avatars inline'
,
title:
group
.
name
do
.
image
-container.s40
.
avatar
-container.s40
=
image_tag
group_icon
(
group
),
class:
'avatar group-avatar s40'
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