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
Boxiang Sun
gitlab-ce
Commits
8a6b4c1f
Commit
8a6b4c1f
authored
Dec 13, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove white space between nav items
parent
abad9a9b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
22 additions
and
23 deletions
+22
-23
app/assets/javascripts/environments/components/environment.js.es6
...ts/javascripts/environments/components/environment.js.es6
+1
-2
app/views/admin/logs/show.html.haml
app/views/admin/logs/show.html.haml
+1
-1
app/views/dashboard/_activity_head.html.haml
app/views/dashboard/_activity_head.html.haml
+2
-2
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+2
-2
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+4
-4
app/views/shared/_milestones_filter.html.haml
app/views/shared/_milestones_filter.html.haml
+3
-3
app/views/shared/builds/_tabs.html.haml
app/views/shared/builds/_tabs.html.haml
+4
-4
app/views/shared/issuable/_nav.html.haml
app/views/shared/issuable/_nav.html.haml
+5
-5
No files found.
app/assets/javascripts/environments/components/environment.js.es6
View file @
8a6b4c1f
...
@@ -164,8 +164,7 @@
...
@@ -164,8 +164,7 @@
{{state.availableCounter}}
{{state.availableCounter}}
</span>
</span>
</a>
</a>
</li>
</li><li v-bind:class="{ 'active' : scope === 'stopped' }">
<li v-bind:class="{ 'active' : scope === 'stopped' }">
<a :href="projectStoppedEnvironmentsPath">
<a :href="projectStoppedEnvironmentsPath">
Stopped
Stopped
<span class="badge js-stopped-environments-count">
<span class="badge js-stopped-environments-count">
...
...
app/views/admin/logs/show.html.haml
View file @
8a6b4c1f
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
%div
{
class:
container_class
}
%div
{
class:
container_class
}
%ul
.nav-links.log-tabs
%ul
.nav-links.log-tabs
-
loggers
.
each
do
|
klass
|
-
loggers
.
each
do
|
klass
|
%li
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
)
}
%li
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
)
}
>
=
link_to
klass
::
file_name
,
"#
#{
klass
::
file_name_noext
}
"
,
=
link_to
klass
::
file_name
,
"#
#{
klass
::
file_name_noext
}
"
,
'data-toggle'
=>
'tab'
'data-toggle'
=>
'tab'
.row-content-block
.row-content-block
...
...
app/views/dashboard/_activity_head.html.haml
View file @
8a6b4c1f
%ul
.nav-links
%ul
.nav-links
%li
{
class:
(
"active"
unless
params
[
:filter
])
}
%li
{
class:
(
"active"
unless
params
[
:filter
])
}
>
=
link_to
activity_dashboard_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
=
link_to
activity_dashboard_path
,
class:
'shortcuts-activity'
,
data:
{
placement:
'right'
}
do
Your Projects
Your Projects
%li
{
class:
(
"active"
if
params
[
:filter
]
==
'starred'
)
}
%li
{
class:
(
"active"
if
params
[
:filter
]
==
'starred'
)
}
>
=
link_to
activity_dashboard_path
(
filter:
'starred'
),
data:
{
placement:
'right'
}
do
=
link_to
activity_dashboard_path
(
filter:
'starred'
),
data:
{
placement:
'right'
}
do
Starred Projects
Starred Projects
app/views/dashboard/todos/index.html.haml
View file @
8a6b4c1f
...
@@ -5,14 +5,14 @@
...
@@ -5,14 +5,14 @@
.top-area
.top-area
%ul
.nav-links
%ul
.nav-links
-
todo_pending_active
=
(
'active'
if
params
[
:state
].
blank?
||
params
[
:state
]
==
'pending'
)
-
todo_pending_active
=
(
'active'
if
params
[
:state
].
blank?
||
params
[
:state
]
==
'pending'
)
%li
{
class:
"todos-pending #{todo_pending_active}"
}
%li
{
class:
"todos-pending #{todo_pending_active}"
}
>
=
link_to
todos_filter_path
(
state:
'pending'
)
do
=
link_to
todos_filter_path
(
state:
'pending'
)
do
%span
%span
To do
To do
%span
.badge
%span
.badge
=
number_with_delimiter
(
todos_pending_count
)
=
number_with_delimiter
(
todos_pending_count
)
-
todo_done_active
=
(
'active'
if
params
[
:state
]
==
'done'
)
-
todo_done_active
=
(
'active'
if
params
[
:state
]
==
'done'
)
%li
{
class:
"todos-done #{todo_done_active}"
}
%li
{
class:
"todos-done #{todo_done_active}"
}
>
=
link_to
todos_filter_path
(
state:
'done'
)
do
=
link_to
todos_filter_path
(
state:
'done'
)
do
%span
%span
Done
Done
...
...
app/views/projects/pipelines/index.html.haml
View file @
8a6b4c1f
...
@@ -5,23 +5,23 @@
...
@@ -5,23 +5,23 @@
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.top-area
.top-area
%ul
.nav-links
%ul
.nav-links
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
>
=
link_to
project_pipelines_path
(
@project
)
do
=
link_to
project_pipelines_path
(
@project
)
do
All
All
%span
.badge.js-totalbuilds-count
%span
.badge.js-totalbuilds-count
=
number_with_delimiter
(
@pipelines_count
)
=
number_with_delimiter
(
@pipelines_count
)
%li
{
class:
(
'active'
if
@scope
==
'running'
)}
%li
{
class:
(
'active'
if
@scope
==
'running'
)}
>
=
link_to
project_pipelines_path
(
@project
,
scope: :running
)
do
=
link_to
project_pipelines_path
(
@project
,
scope: :running
)
do
Running
Running
%span
.badge.js-running-count
%span
.badge.js-running-count
=
number_with_delimiter
(
@running_or_pending_count
)
=
number_with_delimiter
(
@running_or_pending_count
)
%li
{
class:
(
'active'
if
@scope
==
'branches'
)}
%li
{
class:
(
'active'
if
@scope
==
'branches'
)}
>
=
link_to
project_pipelines_path
(
@project
,
scope: :branches
)
do
=
link_to
project_pipelines_path
(
@project
,
scope: :branches
)
do
Branches
Branches
%li
{
class:
(
'active'
if
@scope
==
'tags'
)}
%li
{
class:
(
'active'
if
@scope
==
'tags'
)}
>
=
link_to
project_pipelines_path
(
@project
,
scope: :tags
)
do
=
link_to
project_pipelines_path
(
@project
,
scope: :tags
)
do
Tags
Tags
...
...
app/views/shared/_milestones_filter.html.haml
View file @
8a6b4c1f
...
@@ -2,17 +2,17 @@
...
@@ -2,17 +2,17 @@
-
counts
=
milestone_counts
(
@project
.
milestones
)
-
counts
=
milestone_counts
(
@project
.
milestones
)
%ul
.nav-links
%ul
.nav-links
%li
{
class:
milestone_class_for_state
(
params
[
:state
],
'opened'
,
true
)}
%li
{
class:
milestone_class_for_state
(
params
[
:state
],
'opened'
,
true
)}
>
=
link_to
milestones_filter_path
(
state:
'opened'
)
do
=
link_to
milestones_filter_path
(
state:
'opened'
)
do
Open
Open
-
if
@project
-
if
@project
%span
.badge
#{
counts
[
:opened
]
}
%span
.badge
#{
counts
[
:opened
]
}
%li
{
class:
milestone_class_for_state
(
params
[
:state
],
'closed'
)}
%li
{
class:
milestone_class_for_state
(
params
[
:state
],
'closed'
)}
>
=
link_to
milestones_filter_path
(
state:
'closed'
)
do
=
link_to
milestones_filter_path
(
state:
'closed'
)
do
Closed
Closed
-
if
@project
-
if
@project
%span
.badge
#{
counts
[
:closed
]
}
%span
.badge
#{
counts
[
:closed
]
}
%li
{
class:
milestone_class_for_state
(
params
[
:state
],
'all'
)}
%li
{
class:
milestone_class_for_state
(
params
[
:state
],
'all'
)}
>
=
link_to
milestones_filter_path
(
state:
'all'
)
do
=
link_to
milestones_filter_path
(
state:
'all'
)
do
All
All
-
if
@project
-
if
@project
...
...
app/views/shared/builds/_tabs.html.haml
View file @
8a6b4c1f
%ul
.nav-links
%ul
.nav-links
%li
{
class:
(
'active'
if
scope
.
nil?
)
}
%li
{
class:
(
'active'
if
scope
.
nil?
)
}
>
=
link_to
build_path_proc
.
call
(
nil
)
do
=
link_to
build_path_proc
.
call
(
nil
)
do
All
All
%span
.badge.js-totalbuilds-count
%span
.badge.js-totalbuilds-count
=
number_with_delimiter
(
all_builds
.
count
(
:id
))
=
number_with_delimiter
(
all_builds
.
count
(
:id
))
%li
{
class:
(
'active'
if
scope
==
'pending'
)
}
%li
{
class:
(
'active'
if
scope
==
'pending'
)
}
>
=
link_to
build_path_proc
.
call
(
'pending'
)
do
=
link_to
build_path_proc
.
call
(
'pending'
)
do
Pending
Pending
%span
.badge
%span
.badge
=
number_with_delimiter
(
all_builds
.
pending
.
count
(
:id
))
=
number_with_delimiter
(
all_builds
.
pending
.
count
(
:id
))
%li
{
class:
(
'active'
if
scope
==
'running'
)
}
%li
{
class:
(
'active'
if
scope
==
'running'
)
}
>
=
link_to
build_path_proc
.
call
(
'running'
)
do
=
link_to
build_path_proc
.
call
(
'running'
)
do
Running
Running
%span
.badge
%span
.badge
=
number_with_delimiter
(
all_builds
.
running
.
count
(
:id
))
=
number_with_delimiter
(
all_builds
.
running
.
count
(
:id
))
%li
{
class:
(
'active'
if
scope
==
'finished'
)
}
%li
{
class:
(
'active'
if
scope
==
'finished'
)
}
>
=
link_to
build_path_proc
.
call
(
'finished'
)
do
=
link_to
build_path_proc
.
call
(
'finished'
)
do
Finished
Finished
%span
.badge
%span
.badge
...
...
app/views/shared/issuable/_nav.html.haml
View file @
8a6b4c1f
...
@@ -3,23 +3,23 @@
...
@@ -3,23 +3,23 @@
-
issuables
=
@issues
||
@merge_requests
-
issuables
=
@issues
||
@merge_requests
%ul
.nav-links.issues-state-filters
%ul
.nav-links.issues-state-filters
%li
{
class:
(
"active"
if
params
[
:state
]
==
'opened'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'opened'
)}
>
=
link_to
page_filter_path
(
state:
'opened'
,
label:
true
),
id:
'state-opened'
,
title:
"Filter by
#{
page_context_word
}
that are currently opened."
do
=
link_to
page_filter_path
(
state:
'opened'
,
label:
true
),
id:
'state-opened'
,
title:
"Filter by
#{
page_context_word
}
that are currently opened."
do
#{
issuables_state_counter_text
(
type
,
:opened
)
}
#{
issuables_state_counter_text
(
type
,
:opened
)
}
-
if
type
==
:merge_requests
-
if
type
==
:merge_requests
%li
{
class:
(
"active"
if
params
[
:state
]
==
'merged'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'merged'
)}
>
=
link_to
page_filter_path
(
state:
'merged'
,
label:
true
),
id:
'state-merged'
,
title:
'Filter by merge requests that are currently merged.'
do
=
link_to
page_filter_path
(
state:
'merged'
,
label:
true
),
id:
'state-merged'
,
title:
'Filter by merge requests that are currently merged.'
do
#{
issuables_state_counter_text
(
type
,
:merged
)
}
#{
issuables_state_counter_text
(
type
,
:merged
)
}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
>
=
link_to
page_filter_path
(
state:
'closed'
,
label:
true
),
id:
'state-closed'
,
title:
'Filter by merge requests that are currently closed and unmerged.'
do
=
link_to
page_filter_path
(
state:
'closed'
,
label:
true
),
id:
'state-closed'
,
title:
'Filter by merge requests that are currently closed and unmerged.'
do
#{
issuables_state_counter_text
(
type
,
:closed
)
}
#{
issuables_state_counter_text
(
type
,
:closed
)
}
-
else
-
else
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
>
=
link_to
page_filter_path
(
state:
'closed'
,
label:
true
),
id:
'state-all'
,
title:
'Filter by issues that are currently closed.'
do
=
link_to
page_filter_path
(
state:
'closed'
,
label:
true
),
id:
'state-all'
,
title:
'Filter by issues that are currently closed.'
do
#{
issuables_state_counter_text
(
type
,
:closed
)
}
#{
issuables_state_counter_text
(
type
,
:closed
)
}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'all'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'all'
)}
>
=
link_to
page_filter_path
(
state:
'all'
,
label:
true
),
id:
'state-all'
,
title:
"Show all
#{
page_context_word
}
."
do
=
link_to
page_filter_path
(
state:
'all'
,
label:
true
),
id:
'state-all'
,
title:
"Show all
#{
page_context_word
}
."
do
#{
issuables_state_counter_text
(
type
,
:all
)
}
#{
issuables_state_counter_text
(
type
,
:all
)
}
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