Remove unnecessary extra margin on issues, mr and todo pages
This commit is contained in:
parent
6a5a5d0ec0
commit
27a794914e
5 changed files with 40 additions and 47 deletions
|
@ -15,6 +15,4 @@
|
|||
= render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue"
|
||||
|
||||
= render 'shared/issuable/filter', type: :issues
|
||||
|
||||
.prepend-top-default
|
||||
= render 'shared/issues'
|
||||
= render 'shared/issues'
|
||||
|
|
|
@ -7,6 +7,4 @@
|
|||
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New Merge Request"
|
||||
|
||||
= render 'shared/issuable/filter', type: :merge_requests
|
||||
|
||||
.prepend-top-default
|
||||
= render 'shared/merge_requests'
|
||||
= render 'shared/merge_requests'
|
||||
|
|
|
@ -67,41 +67,40 @@
|
|||
= sort_title_oldest_created
|
||||
|
||||
|
||||
.prepend-top-default
|
||||
- if @todos.any?
|
||||
.js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} }
|
||||
.panel.panel-default.panel-small.panel-without-border
|
||||
%ul.content-list.todos-list
|
||||
= render @todos
|
||||
= paginate @todos, theme: "gitlab"
|
||||
- if @todos.any?
|
||||
.js-todos-options{ data: {per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages} }
|
||||
.panel.panel-default.panel-small.panel-without-border
|
||||
%ul.content-list.todos-list
|
||||
= render @todos
|
||||
= paginate @todos, theme: "gitlab"
|
||||
|
||||
- elsif current_user.todos.any?
|
||||
.todos-all-done
|
||||
= render "shared/empty_states/todos_all_done.svg"
|
||||
- if todos_filter_empty?
|
||||
%h4.text-center
|
||||
= Gitlab.config.gitlab.no_todos_messages.sample
|
||||
%p.text-center
|
||||
Are you looking for things to do? Take a look at
|
||||
= succeed "," do
|
||||
= link_to "the opened issues", issues_dashboard_path
|
||||
contribute to
|
||||
= link_to "merge requests", merge_requests_dashboard_path
|
||||
or mention someone in a comment to assign a new todo automatically.
|
||||
- else
|
||||
%h4.text-center
|
||||
There are no todos to show.
|
||||
- else
|
||||
.todos-empty
|
||||
.todos-empty-hero
|
||||
= render "shared/empty_states/todos_empty.svg"
|
||||
.todos-empty-content
|
||||
%h4
|
||||
Todos let you see what you should do next.
|
||||
%p
|
||||
When an issue or merge request is assigned to you, or when you
|
||||
%strong
|
||||
@mention
|
||||
in a comment, this will trigger a new item in your todo list, automatically.
|
||||
%p
|
||||
You will always know what to work on next.
|
||||
- elsif current_user.todos.any?
|
||||
.todos-all-done
|
||||
= render "shared/empty_states/todos_all_done.svg"
|
||||
- if todos_filter_empty?
|
||||
%h4.text-center
|
||||
= Gitlab.config.gitlab.no_todos_messages.sample
|
||||
%p.text-center
|
||||
Are you looking for things to do? Take a look at
|
||||
= succeed "," do
|
||||
= link_to "the opened issues", issues_dashboard_path
|
||||
contribute to
|
||||
= link_to "merge requests", merge_requests_dashboard_path
|
||||
or mention someone in a comment to assign a new todo automatically.
|
||||
- else
|
||||
%h4.text-center
|
||||
There are no todos to show.
|
||||
- else
|
||||
.todos-empty
|
||||
.todos-empty-hero
|
||||
= render "shared/empty_states/todos_empty.svg"
|
||||
.todos-empty-content
|
||||
%h4
|
||||
Todos let you see what you should do next.
|
||||
%p
|
||||
When an issue or merge request is assigned to you, or when you
|
||||
%strong
|
||||
@mention
|
||||
in a comment, this will trigger a new item in your todo list, automatically.
|
||||
%p
|
||||
You will always know what to work on next.
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
- if current_user
|
||||
To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
|
||||
|
||||
.prepend-top-default
|
||||
= render 'shared/issues'
|
||||
= render 'shared/issues'
|
||||
- else
|
||||
= render 'shared/empty_states/issues', project_select_button: true
|
||||
|
|
|
@ -15,5 +15,4 @@
|
|||
- if current_user
|
||||
To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
|
||||
|
||||
.prepend-top-default
|
||||
= render 'shared/merge_requests'
|
||||
= render 'shared/merge_requests'
|
||||
|
|
Loading…
Reference in a new issue