summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-01-26 11:10:04 -0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-01-27 20:20:19 -0200
commit6a5a5d0ec0ad08fafc007a88d2cd558f3c7add1b (patch)
tree7f932f3ac140e742386c9bf3f1cfe79121d316a2
parented3cf83a634525996c76190ce06dd6298017484b (diff)
downloadgitlab-ce-6a5a5d0ec0ad08fafc007a88d2cd558f3c7add1b.tar.gz
Remove border from issues, todos and MR pages
-rw-r--r--app/assets/stylesheets/framework/tw_bootstrap.scss4
-rw-r--r--app/views/dashboard/todos/index.html.haml2
-rw-r--r--app/views/shared/_issues.html.haml2
-rw-r--r--app/views/shared/_merge_requests.html.haml2
4 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index 12d56359d7d..ea2d26dd5a0 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -162,6 +162,10 @@
}
}
}
+
+ &.panel-without-border {
+ border: 0;
+ }
}
.panel-succes .panel-heading,
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 0b471f142d0..32b4350b8e0 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -70,7 +70,7 @@
.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.panel-default.panel-small.panel-without-border
%ul.content-list.todos-list
= render @todos
= paginate @todos, theme: "gitlab"
diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml
index 69e6ee8ec40..3a49227961f 100644
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
@@ -1,5 +1,5 @@
- if @issues.to_a.any?
- .panel.panel-default.panel-small
+ .panel.panel-default.panel-small.panel-without-border
%ul.content-list.issues-list
= render partial: 'projects/issues/issue', collection: @issues
= paginate @issues, theme: "gitlab"
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index 773f71802c0..b7982b7fe9b 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -1,5 +1,5 @@
- if @merge_requests.to_a.any?
- .panel.panel-default.panel-small
+ .panel.panel-default.panel-small.panel-without-border
%ul.content-list.mr-list
= render partial: 'projects/merge_requests/merge_request', collection: @merge_requests