summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-08-07 12:35:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-08-07 12:35:32 +0000
commitb3deca7a2606a6b2cef464ed08417be4ffb0cb6b (patch)
tree58cb99a58196581520303a57e9f2024553649eae /app/assets/stylesheets
parent411070c3afa621a0bdc741617c1d17f54205b81a (diff)
parent6dc7490789237a84b66baaaf4c6deea5ec3bf2de (diff)
downloadgitlab-ce-b3deca7a2606a6b2cef464ed08417be4ffb0cb6b.tar.gz
Merge branch 'group-todos' into 'master'
Group todos See merge request gitlab-org/gitlab-ce!20675
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/issuable.scss1
-rw-r--r--app/assets/stylesheets/pages/todos.scss16
2 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index d5ae2b673d9..8e78d9f65eb 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -449,6 +449,7 @@
.todo-undone {
color: $gl-link-color;
+ fill: $gl-link-color;
}
.author {
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index e5d7dd13915..010a2c05a1c 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -174,6 +174,18 @@
}
}
+@include media-breakpoint-down(lg) {
+ .todos-filters {
+ .filter-categories {
+ width: 75%;
+
+ .filter-item {
+ margin-bottom: 10px;
+ }
+ }
+ }
+}
+
@include media-breakpoint-down(xs) {
.todo {
.avatar {
@@ -199,6 +211,10 @@
}
.todos-filters {
+ .filter-categories {
+ width: auto;
+ }
+
.dropdown-menu-toggle {
width: 100%;
}