Merge branch 'rs-list-styling' into 'master'

Improve styling for mixed list styles Tasks in an ordered list will now also show their numbers. Closes #2488 Related to #3921 See merge request !2026

Merge branch 'rs-list-styling' into 'master'
8440290f · Dmitriy Zaporozhets · 608a7275 · 53fbb0ec · 8440290f · 8440290f
Commit 8440290f authored Dec 09, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

lists.scss app/assets/stylesheets/framework/lists.scss +8 -2

notes.scss app/assets/stylesheets/pages/notes.scss +3 -7

No files found.
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -88,8 +88,14 @@ ul.bordered-list {
  }
 }

-li.task-list-item {
-  list-style-type: none;
+ul.task-list {
+  li.task-list-item {
+    list-style-type: none;
+  }
+
+  ul:not(.task-list) {
+    padding-left: 1.3em;
+  }
 }

 ul.content-list {

--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -109,13 +109,9 @@ ul.notes {
          }
        }

-        // Reduce left padding of first task list ul element
-        ul.task-list:first-child {
-          padding-left: 10px;
-
-          // sub-tasks should be padded normally
-          ul {
-            padding-left: 20px;
+        ul.task-list {
+          ul:not(.task-list) {
+            padding-left: 1.3em;
          }
        }