kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '28634-todos-margin' into 'master'

Browse source 
Remove extra margin at bottom of todos page

Closes #28634

See merge request !10222
This commit is contained in:
Alfredo Sumaran 2017-03-24 22:37:59 +00:00
commit 3e61bd3ff4
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/framework/tw_bootstrap.scss
View file

@ -176,6 +176,10 @@ summary {
&.panel-without-border { &.panel-without-border {
border: 0; border: 0;
} }
&.panel-without-margin {
margin: 0;
}
} }
.panel-succes .panel-heading, .panel-succes .panel-heading,

3
app/views/dashboard/todos/index.html.haml
View file

@ -68,12 +68,11 @@
= link_to todos_filter_path(sort: sort_value_oldest_created) do = link_to todos_filter_path(sort: sort_value_oldest_created) do
= sort_title_oldest_created = sort_title_oldest_created
.js-todos-all .js-todos-all
- if @todos.any? - if @todos.any?
.js-todos-list-container .js-todos-list-container
.js-todos-options{ data: { per_page: @todos.limit_value, current_page: @todos.current_page, total_pages: @todos.total_pages } } .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 .panel.panel-default.panel-without-border.panel-without-margin
%ul.content-list.todos-list %ul.content-list.todos-list
= render @todos = render @todos
= paginate @todos, theme: "gitlab" = paginate @todos, theme: "gitlab"

4
changelogs/unreleased/28634-todos-margin.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Remove extra margin at bottom of todos page
merge_request:
author: