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
03090a88
Commit
03090a88
authored
Jan 13, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace all navigation menu with nav-links class
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8c3debb1
Changes
38
Show whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
80 additions
and
73 deletions
+80
-73
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+11
-1
app/assets/stylesheets/framework/mobile.scss
app/assets/stylesheets/framework/mobile.scss
+1
-1
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+3
-2
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+1
-1
app/assets/stylesheets/pages/detail_page.scss
app/assets/stylesheets/pages/detail_page.scss
+0
-3
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+0
-2
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+2
-2
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-7
app/views/admin/builds/index.html.haml
app/views/admin/builds/index.html.haml
+1
-1
app/views/dashboard/_activities.html.haml
app/views/dashboard/_activities.html.haml
+2
-2
app/views/dashboard/_activity_head.html.haml
app/views/dashboard/_activity_head.html.haml
+1
-1
app/views/dashboard/_groups_head.html.haml
app/views/dashboard/_groups_head.html.haml
+1
-1
app/views/dashboard/_projects_head.html.haml
app/views/dashboard/_projects_head.html.haml
+1
-1
app/views/dashboard/_snippets_head.html.haml
app/views/dashboard/_snippets_head.html.haml
+1
-1
app/views/dashboard/milestones/show.html.haml
app/views/dashboard/milestones/show.html.haml
+1
-1
app/views/dashboard/snippets/index.html.haml
app/views/dashboard/snippets/index.html.haml
+26
-22
app/views/groups/milestones/show.html.haml
app/views/groups/milestones/show.html.haml
+1
-1
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+2
-2
app/views/projects/_activity.html.haml
app/views/projects/_activity.html.haml
+2
-2
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
app/views/projects/blob/edit.html.haml
app/views/projects/blob/edit.html.haml
+1
-1
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+1
-1
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+1
-1
app/views/projects/commit/_ci_menu.html.haml
app/views/projects/commit/_ci_menu.html.haml
+1
-1
app/views/projects/commit/show.html.haml
app/views/projects/commit/show.html.haml
+3
-1
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+1
-1
app/views/projects/graphs/_head.html.haml
app/views/projects/graphs/_head.html.haml
+1
-1
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
app/views/projects/wikis/_nav.html.haml
app/views/projects/wikis/_nav.html.haml
+1
-1
app/views/shared/_milestones_filter.html.haml
app/views/shared/_milestones_filter.html.haml
+1
-1
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
app/views/sherlock/queries/show.html.haml
app/views/sherlock/queries/show.html.haml
+1
-1
app/views/sherlock/transactions/show.html.haml
app/views/sherlock/transactions/show.html.haml
+1
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
03090a88
...
...
@@ -20,7 +20,7 @@
.content-block
,
.gray-content-block
{
margin-top
:
-
$gl-padding
;
margin-top
:
0
;
margin-bottom
:
-
$gl-padding
;
background-color
:
$background-color
;
padding
:
$gl-padding
;
...
...
@@ -134,3 +134,13 @@
.block-connector
{
margin-top
:
-1px
;
}
.nav-block
{
.controls
{
float
:
right
;
.btn
{
margin-top
:
7px
;
}
}
}
app/assets/stylesheets/framework/mobile.scss
View file @
03090a88
...
...
@@ -81,7 +81,7 @@
display
:
none
;
}
.
center-top-menu
,
.left-top-menu
{
.
nav-links
,
.nav-links
{
li
a
{
font-size
:
14px
;
padding
:
19px
10px
;
...
...
app/assets/stylesheets/framework/nav.scss
View file @
03090a88
...
...
@@ -2,7 +2,7 @@
padding
:
0
;
margin
:
0
;
list-style
:
none
;
height
:
56px
;
height
:
auto
;
border-bottom
:
1px
solid
$border-color
;
li
{
...
...
@@ -10,6 +10,7 @@
a
{
display
:
inline-block
;
padding
:
14px
;
padding-top
:
$gl-padding
;
padding-bottom
:
11px
;
margin-bottom
:
-1px
;
...
...
@@ -25,7 +26,7 @@
}
&
.active
a
{
color
:
#
61606
0
;
color
:
#
00000
0
;
border-bottom
:
2px
solid
#4688f1
;
}
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
03090a88
...
...
@@ -24,7 +24,7 @@
.container-fluid
{
background
:
#FFF
;
padding
:
$gl-padding
;
padding
:
0
$gl-padding
;
&
.container-blank
{
background
:
none
;
...
...
app/assets/stylesheets/pages/detail_page.scss
View file @
03090a88
.detail-page-header
{
margin-top
:
-
$gl-padding
;
margin-bottom
:
-
$gl-padding
;
padding
:
7px
0
;
margin-bottom
:
0px
;
border-bottom
:
1px
solid
$border-color
;
color
:
#5c5d5e
;
font-size
:
16px
;
...
...
app/assets/stylesheets/pages/diff.scss
View file @
03090a88
// Common
.diff-file
{
margin-left
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
border
:
none
;
border-bottom
:
1px
solid
#E7E9EE
;
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
03090a88
...
...
@@ -30,7 +30,7 @@
margin-top
:
7px
;
}
.
center-top-menu
{
.
nav-links
{
text-align
:
left
;
}
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
03090a88
...
...
@@ -3,9 +3,9 @@
*
*/
.mr-state-widget
{
background
:
#F7F8FA
;
background
:
$background-color
;
color
:
$gl-gray
;
border
:
1px
solid
#dce0e6
;
border
:
1px
solid
$border-color
;
@include
border-radius
(
2px
);
form
{
...
...
app/assets/stylesheets/pages/projects.scss
View file @
03090a88
...
...
@@ -228,7 +228,6 @@
}
.projects-search-form
{
.input-group
.form-control
{
height
:
42px
;
}
...
...
@@ -418,9 +417,8 @@ ul.nav.nav-projects-tabs {
.top-area
{
border-bottom
:
1px
solid
#EEE
;
height
:
42px
;
ul
.
left-top-menu
{
ul
.
nav-links
{
display
:
inline-block
;
width
:
50%
;
margin-bottom
:
0px
;
...
...
@@ -523,8 +521,7 @@ pre.light-well {
}
.projects-search-form
{
margin
:
-
$gl-padding
;
padding
:
$gl-padding
;
padding
:
$gl-padding
0
;
padding-bottom
:
0
;
margin-bottom
:
0px
;
...
...
@@ -660,8 +657,6 @@ pre.light-well {
}
.project-show-readme
.readme-holder
{
margin-left
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
padding
:
(
$gl-padding
+
7px
);
border-top
:
0
;
...
...
app/views/admin/builds/index.html.haml
View file @
03090a88
...
...
@@ -4,7 +4,7 @@
-
if
@all_builds
.
running_or_pending
.
any?
=
link_to
'Cancel all'
,
cancel_all_admin_builds_path
,
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
%ul
.
center-top-menu
%ul
.
nav-links
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
admin_builds_path
do
All
...
...
app/views/dashboard/_activities.html.haml
View file @
03090a88
.hidden-xs
=
render
"events/event_last_push"
,
event:
@last_push
.
gray-content
-block
.
nav
-block
-
if
current_user
.
pull-right
.
controls
=
link_to
dashboard_projects_path
(
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'btn rss-btn'
do
%i
.fa.fa-rss
=
render
'shared/event_filter'
...
...
app/views/dashboard/_activity_head.html.haml
View file @
03090a88
%ul
.
center-top-menu
%ul
.
nav-links
%li
{
class:
(
"active"
unless
params
[
:filter
])
}
=
link_to
activity_dashboard_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
Your Projects
...
...
app/views/dashboard/_groups_head.html.haml
View file @
03090a88
%ul
.
center-top-menu
%ul
.
nav-links
=
nav_link
(
page:
dashboard_groups_path
)
do
=
link_to
dashboard_groups_path
,
title:
'Your groups'
,
data:
{
placement:
'right'
}
do
Your Groups
...
...
app/views/dashboard/_projects_head.html.haml
View file @
03090a88
=
content_for
:flash_message
do
=
render
'shared/project_limit'
.top-area
%ul
.
left-top-menu
%ul
.
nav-links
=
nav_link
(
page:
[
dashboard_projects_path
,
root_path
])
do
=
link_to
dashboard_projects_path
,
title:
'Home'
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
Your Projects
...
...
app/views/dashboard/_snippets_head.html.haml
View file @
03090a88
%ul
.
center-top-menu
%ul
.
nav-links
=
nav_link
(
page:
dashboard_snippets_path
,
html_options:
{
class:
'home'
})
do
=
link_to
dashboard_snippets_path
,
title:
'Your snippets'
,
data:
{
placement:
'right'
}
do
Your Snippets
...
...
app/views/dashboard/milestones/show.html.haml
View file @
03090a88
...
...
@@ -48,7 +48,7 @@
#{
@milestone
.
open_items_count
}
open
=
milestone_progress_bar
(
@milestone
)
%ul
.
center-top-menu
.no-top.no-bottom
%ul
.
nav-links
.no-top.no-bottom
%li
.active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
Issues
...
...
app/views/dashboard/snippets/index.html.haml
View file @
03090a88
...
...
@@ -3,29 +3,33 @@
=
render
'dashboard/snippets_head'
.
gray-content
-block
.
pull-right
.
nav
-block
.
controls
=
link_to
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New Snippet"
do
=
icon
(
'plus'
)
New Snippet
.btn-group.btn-group-next.snippet-scope-menu
=
link_to
dashboard_snippets_path
,
class:
"btn btn-default
#{
"active"
unless
params
[
:scope
]
}
"
do
.nav-links.snippet-scope-menu
%li
{
class:
(
"active"
unless
params
[
:scope
])
}
=
link_to
dashboard_snippets_path
do
All
%span
.badge
=
current_user
.
snippets
.
count
=
link_to
dashboard_snippets_path
(
scope:
'are_private'
),
class:
"btn btn-default
#{
"active"
if
params
[
:scope
]
==
"are_private"
}
"
do
%li
{
class:
(
"active"
if
params
[
:scope
]
==
"are_private"
)
}
=
link_to
dashboard_snippets_path
(
scope:
'are_private'
)
do
Private
%span
.badge
=
current_user
.
snippets
.
are_private
.
count
=
link_to
dashboard_snippets_path
(
scope:
'are_internal'
),
class:
"btn btn-default
#{
"active"
if
params
[
:scope
]
==
"are_internal"
}
"
do
%li
{
class:
(
"active"
if
params
[
:scope
]
==
"are_internal"
)
}
=
link_to
dashboard_snippets_path
(
scope:
'are_internal'
)
do
Internal
%span
.badge
=
current_user
.
snippets
.
are_internal
.
count
=
link_to
dashboard_snippets_path
(
scope:
'are_public'
),
class:
"btn btn-default
#{
"active"
if
params
[
:scope
]
==
"are_public"
}
"
do
%li
{
class:
(
"active"
if
params
[
:scope
]
==
"are_public"
)
}
=
link_to
dashboard_snippets_path
(
scope:
'are_public'
)
do
Public
%span
.badge
=
current_user
.
snippets
.
are_public
.
count
...
...
app/views/groups/milestones/show.html.haml
View file @
03090a88
...
...
@@ -54,7 +54,7 @@
#{
@milestone
.
open_items_count
}
open
=
milestone_progress_bar
(
@milestone
)
%ul
.
center-top-menu
.no-top.no-bottom
%ul
.
nav-links
.no-top.no-bottom
%li
.active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
Issues
...
...
app/views/groups/show.html.haml
View file @
03090a88
...
...
@@ -56,5 +56,5 @@
=
render
"projects"
,
projects:
@projects
-
else
%p
.
center-top-menu
.no-top
%p
.
nav-links
.no-top
No projects to show
app/views/help/ui.html.haml
View file @
03090a88
...
...
@@ -139,9 +139,9 @@
%h2
#navs
Navigation
%h4
%code
.
center-top-menu
%code
.
nav-links
.example
%ul
.
center-top-menu
%ul
.
nav-links
%li
.active
%a
Open
%li
...
...
app/views/projects/_activity.html.haml
View file @
03090a88
.activity-filter-block
.
nav-block.
activity-filter-block
-
if
current_user
.
pull-right
.
controls
=
link_to
namespace_project_path
(
@project
.
namespace
,
@project
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"Feed"
,
class:
'btn rss-btn'
do
%i
.fa.fa-rss
...
...
app/views/projects/_md_preview.html.haml
View file @
03090a88
.md-area
.md-header.clearfix
%ul
.
center-top-menu
%ul
.
nav-links
%li
.active
%a
.js-md-write-button
(
href=
"#md-write-holder"
tabindex=
"-1"
)
Write
...
...
app/views/projects/blob/edit.html.haml
View file @
03090a88
...
...
@@ -2,7 +2,7 @@
=
render
"header_title"
.file-editor
%ul
.
center-top-menu
.no-bottom.js-edit-mode
%ul
.
nav-links
.no-bottom.js-edit-mode
%li
.active
=
link_to
'#editor'
do
=
icon
(
'edit'
)
...
...
app/views/projects/builds/index.html.haml
View file @
03090a88
...
...
@@ -8,7 +8,7 @@
-
if
@all_builds
.
running_or_pending
.
any?
=
link_to
'Cancel running'
,
cancel_all_namespace_project_builds_path
(
@project
.
namespace
,
@project
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
%ul
.
center-top-menu
%ul
.
nav-links
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
project_builds_path
(
@project
)
do
All
...
...
app/views/projects/builds/show.html.haml
View file @
03090a88
...
...
@@ -14,7 +14,7 @@
#up-build-trace
-
if
@commit
.
matrix_for_ref?
(
@build
.
ref
)
%ul
.
center-top-menu
.no-top.no-bottom
%ul
.
nav-links
.no-top.no-bottom
-
@commit
.
latest_builds_for_ref
(
@build
.
ref
).
each
do
|
build
|
%li
{
class:
(
'active'
if
build
==
@build
)
}
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
)
do
...
...
app/views/projects/commit/_ci_menu.html.haml
View file @
03090a88
%ul
.
center-top-menu
.no-top.no-bottom.commit-ci-menu
%ul
.
nav-links
.no-top.no-bottom.commit-ci-menu
=
nav_link
(
path:
'commit#show'
)
do
=
link_to
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
)
do
Changes
...
...
app/views/projects/commit/show.html.haml
View file @
03090a88
...
...
@@ -2,7 +2,9 @@
-
page_description
@commit
.
description
=
render
"projects/commits/header_title"
=
render
"commit_box"
.prepend-top-default
=
render
"commit_box"
-
if
@ci_commit
=
render
"ci_menu"
-
else
...
...
app/views/projects/commits/_head.html.haml
View file @
03090a88
%ul
.
center-top-menu
%ul
.
nav-links
=
nav_link
(
controller:
[
:commit
,
:commits
])
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
current_ref
)
do
Commits
...
...
app/views/projects/graphs/_head.html.haml
View file @
03090a88
%ul
.
center-top-menu
%ul
.
nav-links
=
nav_link
(
action: :show
)
do
=
link_to
'Contributors'
,
namespace_project_graph_path
=
nav_link
(
action: :commits
)
do
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
03090a88
...
...
@@ -18,7 +18,7 @@
=
f
.
hidden_field
:target_branch
.mr-compare.merge-request
%ul
.merge-request-tabs.
center-top-menu
.no-top.no-bottom
%ul
.merge-request-tabs.
nav-links
.no-top.no-bottom
%li
.commits-tab
=
link_to
url_for
(
params
),
data:
{
target:
'div#commits'
,
action:
'commits'
,
toggle:
'tab'
}
do
Commits
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
03090a88
...
...
@@ -45,7 +45,7 @@
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
-
if
@commits
.
present?
%ul
.merge-request-tabs.
center-top-menu
.no-top.no-bottom
%ul
.merge-request-tabs.
nav-links
.no-top.no-bottom
%li
.notes-tab
=
link_to
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
data:
{
target:
'div#notes'
,
action:
'notes'
,
toggle:
'tab'
}
do
Discussion
...
...
app/views/projects/milestones/show.html.haml
View file @
03090a88
...
...
@@ -57,7 +57,7 @@
%span
.pull-right
=
@milestone
.
expires_at
=
milestone_progress_bar
(
@milestone
)
%ul
.
center-top-menu
.no-top.no-bottom
%ul
.
nav-links
.no-top.no-bottom
%li
.active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
Issues
...
...
app/views/projects/wikis/_nav.html.haml
View file @
03090a88
...
...
@@ -7,7 +7,7 @@
=
render
'projects/wikis/new'
%ul
.
center-top-menu
%ul
.
nav-links
=
nav_link
(
html_options:
{
class:
params
[
:id
]
==
'home'
?
'active'
:
''
})
do
=
link_to
'Home'
,
namespace_project_wiki_path
(
@project
.
namespace
,
@project
,
:home
)
...
...
app/views/shared/_milestones_filter.html.haml
View file @
03090a88
.milestones-filters
%ul
.
center-top-menu
%ul
.
nav-links
%li
{
class:
(
"active"
if
params
[
:state
].
blank?
||
params
[
:state
]
==
'opened'
)}
=
link_to
milestones_filter_path
(
state:
'opened'
)
do
Open
...
...
app/views/shared/issuable/_filter.html.haml
View file @
03090a88
.issues-filters
.issues-state-filters
%ul
.
center-top-menu
%ul
.
nav-links
-
if
defined?
(
type
)
&&
type
==
:merge_requests
-
page_context_word
=
'merge requests'
-
else
...
...
app/views/sherlock/queries/show.html.haml
View file @
03090a88
-
page_title
t
(
'sherlock.title'
),
t
(
'sherlock.transaction'
),
t
(
'sherlock.query'
)
-
header_title
t
(
'sherlock.title'
),
sherlock_transactions_path
%ul
.
center-top-menu
%ul
.
nav-links
%li
.active
%a
(
href=
"#tab-general"
data-toggle=
"tab"
)
=
t
(
'sherlock.general'
)
...
...
app/views/sherlock/transactions/show.html.haml
View file @
03090a88
-
page_title
t
(
'sherlock.title'
),
t
(
'sherlock.transaction'
)
-
header_title
t
(
'sherlock.title'
),
sherlock_transactions_path
%ul
.
center-top-menu
%ul
.
nav-links
%li
.active
%a
(
href=
"#tab-general"
data-toggle=
"tab"
)
=
t
(
'sherlock.general'
)
...
...
app/views/users/show.html.haml
View file @
03090a88
...
...
@@ -74,7 +74,7 @@
.user-calendar-activities
%ul
.
center-top-menu
.no-top.no-bottom.bottom-border.wide
%ul
.
nav-links
.no-top.no-bottom.bottom-border.wide
%li
.active
=
link_to
"#activity"
,
'data-toggle'
=>
'tab'
do
Activity
...
...
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