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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5ddbe836
Commit
5ddbe836
authored
Dec 10, 2018
by
Harry Kiselev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add bottom margin depends on profile tabs visibility.
parent
95491f39
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+5
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
5ddbe836
...
@@ -221,7 +221,11 @@
...
@@ -221,7 +221,11 @@
}
}
.profile-header
{
.profile-header
{
margin
:
0
$gl-padding
10px
;
margin
:
0
$gl-padding
;
&
.with-no-profile-tabs
{
margin-bottom
:
$gl-padding-24
;
}
.avatar-holder
{
.avatar-holder
{
width
:
90px
;
width
:
90px
;
...
...
app/views/users/show.html.haml
View file @
5ddbe836
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'users'
)
=
icon
(
'users'
)
.profile-header
.profile-header
{
class:
[(
'with-no-profile-tabs'
if
profile_tabs
.
empty?
)]
}
.avatar-holder
.avatar-holder
=
link_to
avatar_icon_for_user
(
@user
,
400
),
target:
'_blank'
,
rel:
'noopener noreferrer'
do
=
link_to
avatar_icon_for_user
(
@user
,
400
),
target:
'_blank'
,
rel:
'noopener noreferrer'
do
=
image_tag
avatar_icon_for_user
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
=
image_tag
avatar_icon_for_user
(
@user
,
90
),
class:
"avatar s90"
,
alt:
''
...
...
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