From fd2a4868e194581319955ac078e8f3f10da5a121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ve=C4=8Derek?= Date: Mon, 4 Dec 2017 14:55:38 +0100 Subject: [PATCH 1/2] Ports changes from HC#14755 --- style.css | 6 +++--- styles/_mixins.scss | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index 157403106..d88c7a9b4 100644 --- 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 index 1f50c7055..b4863d3ae 100644 --- 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; } From b4649c705d21d2780b44aeb6053470b74ce97451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ve=C4=8Derek?= Date: Mon, 4 Dec 2017 15:01:33 +0100 Subject: [PATCH 2/2] Bumps version to 1.1.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 25f6f7a72..c84dc6d14 100644 --- 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": [{