Remove white space between nav items
This commit is contained in:
parent
abad9a9b41
commit
8a6b4c1f7a
8 changed files with 22 additions and 23 deletions
|
@ -164,8 +164,7 @@
|
|||
{{state.availableCounter}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li v-bind:class="{ 'active' : scope === 'stopped' }">
|
||||
</li><li v-bind:class="{ 'active' : scope === 'stopped' }">
|
||||
<a :href="projectStoppedEnvironmentsPath">
|
||||
Stopped
|
||||
<span class="badge js-stopped-environments-count">
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
%div{ class: container_class }
|
||||
%ul.nav-links.log-tabs
|
||||
- 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}",
|
||||
'data-toggle' => 'tab'
|
||||
.row-content-block
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
%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
|
||||
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
|
||||
Starred Projects
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
.top-area
|
||||
%ul.nav-links
|
||||
- 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
|
||||
%span
|
||||
To do
|
||||
%span.badge
|
||||
= number_with_delimiter(todos_pending_count)
|
||||
- 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
|
||||
%span
|
||||
Done
|
||||
|
|
|
@ -5,23 +5,23 @@
|
|||
%div{ class: container_class }
|
||||
.top-area
|
||||
%ul.nav-links
|
||||
%li{class: ('active' if @scope.nil?)}
|
||||
%li{class: ('active' if @scope.nil?)}>
|
||||
= link_to project_pipelines_path(@project) do
|
||||
All
|
||||
%span.badge.js-totalbuilds-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
|
||||
Running
|
||||
%span.badge.js-running-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
|
||||
Branches
|
||||
|
||||
%li{class: ('active' if @scope == 'tags')}
|
||||
%li{class: ('active' if @scope == 'tags')}>
|
||||
= link_to project_pipelines_path(@project, scope: :tags) do
|
||||
Tags
|
||||
|
||||
|
|
|
@ -2,17 +2,17 @@
|
|||
- counts = milestone_counts(@project.milestones)
|
||||
|
||||
%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
|
||||
Open
|
||||
- if @project
|
||||
%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
|
||||
Closed
|
||||
- if @project
|
||||
%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
|
||||
All
|
||||
- if @project
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
%ul.nav-links
|
||||
%li{ class: ('active' if scope.nil?) }
|
||||
%li{ class: ('active' if scope.nil?) }>
|
||||
= link_to build_path_proc.call(nil) do
|
||||
All
|
||||
%span.badge.js-totalbuilds-count
|
||||
= 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
|
||||
Pending
|
||||
%span.badge
|
||||
= 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
|
||||
Running
|
||||
%span.badge
|
||||
= 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
|
||||
Finished
|
||||
%span.badge
|
||||
|
|
|
@ -3,23 +3,23 @@
|
|||
- issuables = @issues || @merge_requests
|
||||
|
||||
%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
|
||||
#{issuables_state_counter_text(type, :opened)}
|
||||
|
||||
- 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
|
||||
#{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
|
||||
#{issuables_state_counter_text(type, :closed)}
|
||||
- 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
|
||||
#{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
|
||||
#{issuables_state_counter_text(type, :all)}
|
||||
|
|
Loading…
Reference in a new issue