From da1008b0d6e6b0760447c9973acc08c8e0c18736 Mon Sep 17 00:00:00 2001 From: 刘汉宸 Date: Wed, 22 Jul 2020 18:05:49 +0800 Subject: [PATCH] style: 修复markdown样式与组件样式冲突 --- examples/components/code-snippet.vue | 9 --------- examples/styles/markdown.scss | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/examples/components/code-snippet.vue b/examples/components/code-snippet.vue index d9af917..b5d0996 100644 --- a/examples/components/code-snippet.vue +++ b/examples/components/code-snippet.vue @@ -41,15 +41,6 @@ export default { border: 1px solid $border; background-color: inherit; text-align: left; - // element-ui样式冲突 - ul > li { - list-style-type: none !important; - margin: 0px !important; - padding: 0px !important; - } - .el-pagination.is-background .el-pager li { - margin: 0 5px !important; - } } .code-snippet--demo { box-sizing: border-box; diff --git a/examples/styles/markdown.scss b/examples/styles/markdown.scss index a7f9c57..3472012 100644 --- a/examples/styles/markdown.scss +++ b/examples/styles/markdown.scss @@ -61,17 +61,17 @@ ol > li > p { margin: 4px 0; } - ul { + ul:not([class]) { padding: 0; margin: 0; } - ul > li { + ul:not([class]) > li:not([class]) { list-style-type: circle; margin-left: 20px; padding-left: 4px; padding-top: 15px; } - ol > li { + ol:not([class]) > li:not([class]) { list-style-type: decimal; margin-left: 20px; padding-left: 4px; -- libgit2 0.21.0