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
iv
gitlab-ce
Commits
1a942111
Commit
1a942111
authored
Dec 07, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove pointless explanation for user tabs
parent
dddfbb65
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
16 deletions
+8
-16
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+7
-3
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-13
No files found.
app/assets/stylesheets/framework/common.scss
View file @
1a942111
...
...
@@ -377,10 +377,9 @@ table {
.center-top-menu
{
@include
nav-menu
;
text-align
:
center
;
margin-top
:
5px
;
margin-bottom
:
$gl-padding
;
height
:
56px
;
margin-top
:
-
$gl-padding
;
margin
:
-
$gl-padding
;
margin-bottom
:
$gl-padding
;
padding-top
:
$gl-padding
;
&
.no-bottom
{
...
...
@@ -390,6 +389,11 @@ table {
&
.no-top
{
margin-top
:
0
;
}
&
.bottom-border
{
border-bottom
:
1px
solid
$border-color
;
height
:
57px
;
}
}
.center-middle-menu
{
...
...
app/views/users/show.html.haml
View file @
1a942111
...
...
@@ -73,7 +73,7 @@
.user-calendar-activities
%ul
.center-top-menu.no-top.no-bottom
%ul
.center-top-menu.no-top.no-bottom
.bottom-border
%li
.active
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
Activity
...
...
@@ -92,26 +92,17 @@
.tab-content
.tab-pane.active
#activity
.gray-content-block.middle-block
Public activity by
#{
@user
.
name
}
.content_list
=
spinner
-
if
@groups
.
any?
.tab-pane
#groups
.gray-content-block.middle-block
Groups
#{
@user
.
name
}
is a member of
%ul
.content-list
-
@groups
.
each
do
|
group
|
=
render
'shared/groups/group'
,
group:
group
-
if
@contributed_projects
.
present?
.tab-pane
#contributed
.gray-content-block.middle-block
Projects
#{
@user
.
name
}
has contributed to
.contributed-projects
=
render
'shared/projects/list'
,
projects:
@contributed_projects
.
sort_by
(
&
:star_count
).
reverse
,
...
...
@@ -119,9 +110,6 @@
-
if
@projects
.
present?
.tab-pane
#personal
.gray-content-block.middle-block
Projects owned by
#{
@user
.
name
}
.personal-projects
=
render
'shared/projects/list'
,
projects:
@projects
.
sort_by
(
&
:star_count
).
reverse
,
...
...
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