Commit da1008b0d6e6b0760447c9973acc08c8e0c18736
1 parent
f8ca6f5c
Exists in
master
and in
3 other branches
style: 修复markdown样式与组件样式冲突
Showing
2 changed files
with
3 additions
and
12 deletions
Show diff stats
examples/components/code-snippet.vue
| @@ -41,15 +41,6 @@ export default { | @@ -41,15 +41,6 @@ export default { | ||
| 41 | border: 1px solid $border; | 41 | border: 1px solid $border; |
| 42 | background-color: inherit; | 42 | background-color: inherit; |
| 43 | text-align: left; | 43 | text-align: left; |
| 44 | - // element-ui样式冲突 | ||
| 45 | - ul > li { | ||
| 46 | - list-style-type: none !important; | ||
| 47 | - margin: 0px !important; | ||
| 48 | - padding: 0px !important; | ||
| 49 | - } | ||
| 50 | - .el-pagination.is-background .el-pager li { | ||
| 51 | - margin: 0 5px !important; | ||
| 52 | - } | ||
| 53 | } | 44 | } |
| 54 | .code-snippet--demo { | 45 | .code-snippet--demo { |
| 55 | box-sizing: border-box; | 46 | box-sizing: border-box; |
examples/styles/markdown.scss
| @@ -61,17 +61,17 @@ | @@ -61,17 +61,17 @@ | ||
| 61 | ol > li > p { | 61 | ol > li > p { |
| 62 | margin: 4px 0; | 62 | margin: 4px 0; |
| 63 | } | 63 | } |
| 64 | - ul { | 64 | + ul:not([class]) { |
| 65 | padding: 0; | 65 | padding: 0; |
| 66 | margin: 0; | 66 | margin: 0; |
| 67 | } | 67 | } |
| 68 | - ul > li { | 68 | + ul:not([class]) > li:not([class]) { |
| 69 | list-style-type: circle; | 69 | list-style-type: circle; |
| 70 | margin-left: 20px; | 70 | margin-left: 20px; |
| 71 | padding-left: 4px; | 71 | padding-left: 4px; |
| 72 | padding-top: 15px; | 72 | padding-top: 15px; |
| 73 | } | 73 | } |
| 74 | - ol > li { | 74 | + ol:not([class]) > li:not([class]) { |
| 75 | list-style-type: decimal; | 75 | list-style-type: decimal; |
| 76 | margin-left: 20px; | 76 | margin-left: 20px; |
| 77 | padding-left: 4px; | 77 | padding-left: 4px; |