Merge pull request #12 from zendesk/avecerek/port_changes_from_hc

Port changes from Help Center
zendesk · Dec 4, 2017 · 6d64697 · 6d64697
2 parents 7de3d75 + b4649c7
commit 6d64697
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Copenhagen",
   "author": "Zendesk",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "api_version": 1,
   "default_locale": "en-us",
   "settings": [{

diff --git a/style.css b/style.css
@@ -1250,7 +1250,7 @@ ul {
   margin-right: 20px;
 }
 
-.article-body ul > ul, .article-body ol > ol, .article-body ol > ul, .article-body ul > ol {
+.article-body ul > ul, .article-body ol > ol, .article-body ol > ul, .article-body ul > ol, .article-body li > ul, .article-body li > ol {
   margin: 0;
 }
 
@@ -1786,7 +1786,7 @@ ul {
   margin-right: 20px;
 }
 
-.comment-body ul > ul, .comment-body ol > ol, .comment-body ol > ul, .comment-body ul > ol {
+.comment-body ul > ul, .comment-body ol > ol, .comment-body ol > ul, .comment-body ul > ol, .comment-body li > ul, .comment-body li > ol {
   margin: 0;
 }
 
@@ -2363,7 +2363,7 @@ ul {
   margin-right: 20px;
 }
 
-.post-body ul > ul, .post-body ol > ol, .post-body ol > ul, .post-body ul > ol {
+.post-body ul > ul, .post-body ol > ol, .post-body ol > ul, .post-body ul > ol, .post-body li > ul, .post-body li > ol {
   margin: 0;
 }
 

diff --git a/styles/_mixins.scss b/styles/_mixins.scss
@@ -55,7 +55,7 @@
   }
 
   // Sub level list
-  ul > ul, ol > ol, ol > ul, ul > ol {
+  ul > ul, ol > ol, ol > ul, ul > ol, li > ul, li > ol {
     margin: 0;
   }