summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-03-24 22:37:59 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-03-24 22:37:59 +0000
commit3e61bd3ff41fa64312ce8b04e4dff5871ea7aa74 (patch)
tree62954f4e851610a34756534e78f1883be9cdf7d9
parentf1e1e51311b6f50c98b3e1476942107269c28a97 (diff)
parentb17523c19b091f42ae7a66a7615030343a4c7c76 (diff)
downloadgitlab-ce-3e61bd3ff41fa64312ce8b04e4dff5871ea7aa74.tar.gz
Merge branch '28634-todos-margin' into 'master'
Remove extra margin at bottom of todos page Closes #28634 See merge request !10222
-rw-r--r--app/assets/stylesheets/framework/tw_bootstrap.scss4
-rw-r--r--app/views/dashboard/todos/index.html.haml3
-rw-r--r--changelogs/unreleased/28634-todos-margin.yml4
3 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index 12a86a64645..e54cc2866a7 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -176,6 +176,10 @@ summary {
&.panel-without-border {
border: 0;
}
+
+ &.panel-without-margin {
+ margin: 0;
+ }
}
.panel-succes .panel-heading,
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index e31fa5fbe95..52d6ebd8a14 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -68,12 +68,11 @@
= link_to todos_filter_path(sort: sort_value_oldest_created) do
= sort_title_oldest_created
-
.js-todos-all
- if @todos.any?
.js-todos-list-container
.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
= render @todos
= paginate @todos, theme: "gitlab"
diff --git a/changelogs/unreleased/28634-todos-margin.yml b/changelogs/unreleased/28634-todos-margin.yml
new file mode 100644
index 00000000000..f4221ce4350
--- /dev/null
+++ b/changelogs/unreleased/28634-todos-margin.yml
@@ -0,0 +1,4 @@
+---
+title: Remove extra margin at bottom of todos page
+merge_request:
+author: