summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-05-17 18:38:52 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-05-17 18:38:52 +0000
commit319cab4115380d3bff1e6543b759e785aa36a666 (patch)
treedef403d3787e5da69ad0fe791af617bd13667584
parent3af72f9ed04b37fb4753d717950bb0945f44c12f (diff)
parent8d767c95b7c652b7591c11d843b1012498affd75 (diff)
downloadgitlab-ce-319cab4115380d3bff1e6543b759e785aa36a666.tar.gz
Merge branch '31483-ordered-task-list' into 'master'
Fix Ordered Task List Items Closes #31483 See merge request !11445
-rw-r--r--app/assets/stylesheets/framework/typography.scss4
-rw-r--r--changelogs/unreleased/31483-ordered-task-list.yml4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index a7c6cbaae21..1a4c3d6b370 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -169,14 +169,14 @@
}
ul.task-list {
- li.task-list-item {
+ > li.task-list-item {
list-style-type: none;
position: relative;
min-height: 22px;
padding-left: 28px;
margin-left: 0 !important;
- input.task-list-item-checkbox {
+ > input.task-list-item-checkbox {
position: absolute;
left: 8px;
top: 5px;
diff --git a/changelogs/unreleased/31483-ordered-task-list.yml b/changelogs/unreleased/31483-ordered-task-list.yml
new file mode 100644
index 00000000000..c43915b3268
--- /dev/null
+++ b/changelogs/unreleased/31483-ordered-task-list.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Ordered Task List Items
+merge_request: 31483
+author: Jared Deckard <jared.deckard@gmail.com>