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
a46b4f11
Commit
a46b4f11
authored
Jun 11, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Center layout navigation and remove icons
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
3e28d04c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
27 deletions
+3
-27
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+2
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+0
-6
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+0
-10
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+0
-10
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
a46b4f11
...
@@ -69,6 +69,7 @@
...
@@ -69,6 +69,7 @@
}
}
&
.sub-nav
{
&
.sub-nav
{
text-align
:
center
;
background-color
:
$background-color
;
background-color
:
$background-color
;
.container-fluid
{
.container-fluid
{
...
@@ -250,6 +251,7 @@
...
@@ -250,6 +251,7 @@
background
:
$background-color
;
background
:
$background-color
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
transition-duration
:
.3s
;
transition-duration
:
.3s
;
text-align
:
center
;
.container-fluid
{
.container-fluid
{
position
:
relative
;
position
:
relative
;
...
...
app/views/layouts/_page.html.haml
View file @
a46b4f11
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
current_user
.
username
=
current_user
.
username
-
if
defined?
(
nav
)
&&
nav
-
if
defined?
(
nav
)
&&
nav
.layout-nav
.layout-nav
%div
{
class:
(
container_class
)
}
.container-fluid
=
render
"layouts/nav/
#{
nav
}
"
=
render
"layouts/nav/
#{
nav
}
"
.content-wrapper
{
class:
"#{layout_nav_class}"
}
.content-wrapper
{
class:
"#{layout_nav_class}"
}
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
...
...
app/views/layouts/nav/_group.html.haml
View file @
a46b4f11
...
@@ -5,36 +5,30 @@
...
@@ -5,36 +5,30 @@
.fade-left
.fade-left
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
=
navbar_icon
(
'group'
)
%span
%span
Group
Group
=
nav_link
(
path:
'groups#activity'
)
do
=
nav_link
(
path:
'groups#activity'
)
do
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
=
navbar_icon
(
'activity'
)
%span
%span
Activity
Activity
=
nav_link
(
controller:
[
:group
,
:milestones
])
do
=
nav_link
(
controller:
[
:group
,
:milestones
])
do
=
link_to
group_milestones_path
(
@group
),
title:
'Milestones'
do
=
link_to
group_milestones_path
(
@group
),
title:
'Milestones'
do
=
navbar_icon
(
'milestones'
)
%span
%span
Milestones
Milestones
=
nav_link
(
path:
'groups#issues'
)
do
=
nav_link
(
path:
'groups#issues'
)
do
=
link_to
issues_group_path
(
@group
),
title:
'Issues'
do
=
link_to
issues_group_path
(
@group
),
title:
'Issues'
do
=
navbar_icon
(
'issues'
)
%span
%span
Issues
Issues
-
issues
=
IssuesFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
-
issues
=
IssuesFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
%span
.badge.count
=
number_with_delimiter
(
issues
.
count
)
%span
.badge.count
=
number_with_delimiter
(
issues
.
count
)
=
nav_link
(
path:
'groups#merge_requests'
)
do
=
nav_link
(
path:
'groups#merge_requests'
)
do
=
link_to
merge_requests_group_path
(
@group
),
title:
'Merge Requests'
do
=
link_to
merge_requests_group_path
(
@group
),
title:
'Merge Requests'
do
=
navbar_icon
(
'mr'
)
%span
%span
Merge Requests
Merge Requests
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
).
execute
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
=
nav_link
(
controller:
[
:group_members
])
do
=
nav_link
(
controller:
[
:group_members
])
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
=
navbar_icon
(
'members'
)
%span
%span
Members
Members
.fade-right
.fade-right
app/views/layouts/nav/_profile.html.haml
View file @
a46b4f11
...
@@ -2,51 +2,41 @@
...
@@ -2,51 +2,41 @@
.fade-left
.fade-left
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
=
icon
(
'user fw'
)
%span
%span
Profile
Profile
=
nav_link
(
controller:
[
:accounts
,
:two_factor_auths
])
do
=
nav_link
(
controller:
[
:accounts
,
:two_factor_auths
])
do
=
link_to
profile_account_path
,
title:
'Account'
do
=
link_to
profile_account_path
,
title:
'Account'
do
=
icon
(
'gear fw'
)
%span
%span
Account
Account
-
if
current_application_settings
.
user_oauth_applications?
-
if
current_application_settings
.
user_oauth_applications?
=
nav_link
(
controller:
'oauth/applications'
)
do
=
nav_link
(
controller:
'oauth/applications'
)
do
=
link_to
applications_profile_path
,
title:
'Applications'
do
=
link_to
applications_profile_path
,
title:
'Applications'
do
=
icon
(
'cloud fw'
)
%span
%span
Applications
Applications
=
nav_link
(
controller: :emails
)
do
=
nav_link
(
controller: :emails
)
do
=
link_to
profile_emails_path
,
title:
'Emails'
do
=
link_to
profile_emails_path
,
title:
'Emails'
do
=
icon
(
'envelope-o fw'
)
%span
%span
Emails
Emails
-
unless
current_user
.
ldap_user?
-
unless
current_user
.
ldap_user?
=
nav_link
(
controller: :passwords
)
do
=
nav_link
(
controller: :passwords
)
do
=
link_to
edit_profile_password_path
,
title:
'Password'
do
=
link_to
edit_profile_password_path
,
title:
'Password'
do
=
icon
(
'lock fw'
)
%span
%span
Password
Password
=
nav_link
(
controller: :notifications
)
do
=
nav_link
(
controller: :notifications
)
do
=
link_to
profile_notifications_path
,
title:
'Notifications'
do
=
link_to
profile_notifications_path
,
title:
'Notifications'
do
=
icon
(
'inbox fw'
)
%span
%span
Notifications
Notifications
=
nav_link
(
controller: :keys
)
do
=
nav_link
(
controller: :keys
)
do
=
link_to
profile_keys_path
,
title:
'SSH Keys'
do
=
link_to
profile_keys_path
,
title:
'SSH Keys'
do
=
icon
(
'key fw'
)
%span
%span
SSH Keys
SSH Keys
=
nav_link
(
controller: :preferences
)
do
=
nav_link
(
controller: :preferences
)
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
-# TODO (rspeicher): Better icon?
=
icon
(
'image fw'
)
%span
%span
Preferences
Preferences
=
nav_link
(
path:
'profiles#audit_log'
)
do
=
nav_link
(
path:
'profiles#audit_log'
)
do
=
link_to
audit_log_profile_path
,
title:
'Audit Log'
do
=
link_to
audit_log_profile_path
,
title:
'Audit Log'
do
=
icon
(
'history fw'
)
%span
%span
Audit Log
Audit Log
.fade-right
.fade-right
app/views/layouts/nav/_project.html.haml
View file @
a46b4f11
...
@@ -24,48 +24,41 @@
...
@@ -24,48 +24,41 @@
.fade-left
.fade-left
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
=
navbar_icon
(
'project'
)
%span
%span
Project
Project
=
nav_link
(
path:
'projects#activity'
)
do
=
nav_link
(
path:
'projects#activity'
)
do
=
link_to
activity_project_path
(
@project
),
title:
'Activity'
,
class:
'shortcuts-project-activity'
do
=
link_to
activity_project_path
(
@project
),
title:
'Activity'
,
class:
'shortcuts-project-activity'
do
=
navbar_icon
(
'activity'
)
%span
%span
Activity
Activity
-
if
project_nav_tab?
:files
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)
)
do
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)
)
do
=
link_to
project_files_path
(
@project
),
title:
'Code'
,
class:
'shortcuts-tree'
do
=
link_to
project_files_path
(
@project
),
title:
'Code'
,
class:
'shortcuts-tree'
do
=
icon
(
'code fw'
)
%span
%span
Code
Code
-
if
project_nav_tab?
:pipelines
-
if
project_nav_tab?
:pipelines
=
nav_link
(
controller: :pipelines
)
do
=
nav_link
(
controller: :pipelines
)
do
=
link_to
project_pipelines_path
(
@project
),
title:
'Pipelines'
,
class:
'shortcuts-pipelines'
do
=
link_to
project_pipelines_path
(
@project
),
title:
'Pipelines'
,
class:
'shortcuts-pipelines'
do
=
navbar_icon
(
'pipelines'
)
%span
%span
Pipelines
Pipelines
-
if
project_nav_tab?
:container_registry
-
if
project_nav_tab?
:container_registry
=
nav_link
(
controller:
%w(container_registry)
)
do
=
nav_link
(
controller:
%w(container_registry)
)
do
=
link_to
project_container_registry_path
(
@project
),
title:
'Container Registry'
,
class:
'shortcuts-container-registry'
do
=
link_to
project_container_registry_path
(
@project
),
title:
'Container Registry'
,
class:
'shortcuts-container-registry'
do
=
icon
(
'hdd-o fw'
)
%span
%span
Registry
Registry
-
if
project_nav_tab?
:graphs
-
if
project_nav_tab?
:graphs
=
nav_link
(
controller:
%w(graphs)
)
do
=
nav_link
(
controller:
%w(graphs)
)
do
=
link_to
namespace_project_graph_path
(
@project
.
namespace
,
@project
,
current_ref
),
title:
'Graphs'
,
class:
'shortcuts-graphs'
do
=
link_to
namespace_project_graph_path
(
@project
.
namespace
,
@project
,
current_ref
),
title:
'Graphs'
,
class:
'shortcuts-graphs'
do
=
icon
(
'area-chart fw'
)
%span
%span
Graphs
Graphs
-
if
project_nav_tab?
:issues
-
if
project_nav_tab?
:issues
=
nav_link
(
controller:
[
:issues
,
:labels
,
:milestones
])
do
=
nav_link
(
controller:
[
:issues
,
:labels
,
:milestones
])
do
=
link_to
url_for_project_issues
(
@project
,
only_path:
true
),
title:
'Issues'
,
class:
'shortcuts-issues'
do
=
link_to
url_for_project_issues
(
@project
,
only_path:
true
),
title:
'Issues'
,
class:
'shortcuts-issues'
do
=
navbar_icon
(
'issues'
)
%span
%span
Issues
Issues
-
if
@project
.
default_issues_tracker?
-
if
@project
.
default_issues_tracker?
...
@@ -74,7 +67,6 @@
...
@@ -74,7 +67,6 @@
-
if
project_nav_tab?
:merge_requests
-
if
project_nav_tab?
:merge_requests
=
nav_link
(
controller: :merge_requests
)
do
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
=
link_to
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
=
navbar_icon
(
'mr'
)
%span
%span
Merge Requests
Merge Requests
%span
.badge.count.merge_counter
=
number_with_delimiter
(
@project
.
merge_requests
.
opened
.
count
)
%span
.badge.count.merge_counter
=
number_with_delimiter
(
@project
.
merge_requests
.
opened
.
count
)
...
@@ -82,14 +74,12 @@
...
@@ -82,14 +74,12 @@
-
if
project_nav_tab?
:wiki
-
if
project_nav_tab?
:wiki
=
nav_link
(
controller: :wikis
)
do
=
nav_link
(
controller: :wikis
)
do
=
link_to
get_project_wiki_path
(
@project
),
title:
'Wiki'
,
class:
'shortcuts-wiki'
do
=
link_to
get_project_wiki_path
(
@project
),
title:
'Wiki'
,
class:
'shortcuts-wiki'
do
=
navbar_icon
(
'wiki'
)
%span
%span
Wiki
Wiki
-
if
project_nav_tab?
:snippets
-
if
project_nav_tab?
:snippets
=
nav_link
(
controller: :snippets
)
do
=
nav_link
(
controller: :snippets
)
do
=
link_to
namespace_project_snippets_path
(
@project
.
namespace
,
@project
),
title:
'Snippets'
,
class:
'shortcuts-snippets'
do
=
link_to
namespace_project_snippets_path
(
@project
.
namespace
,
@project
),
title:
'Snippets'
,
class:
'shortcuts-snippets'
do
=
icon
(
'clipboard fw'
)
%span
%span
Snippets
Snippets
...
...
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