Resolve merge conflict

MarkBind · Feb 10, 2024 · b9e4197 · b9e4197
2 parents fdfdc8b + 2009e41
commit b9e4197
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 28 deletions.
diff --git a/docs/userGuide/components/presentation.md b/docs/userGuide/components/presentation.md
@@ -24,7 +24,7 @@ The components in this page are the core **presentational** components you may w
 
 As presentational components are HTML-based, you need to follow the HTML syntax when using markdown in the content of the components.
 More specifically, you should use either:
-- add a line break with no indentation beforethe markdown content
+- add a line break with no indentation before the markdown content
 - use the `<markdown>` or `<md>`
   tag to wrap the markdown content.
 For more information, please refer to this [section]({{baseUrl}}/userGuide/usingHtmlJavaScriptCss.html#markdown-in-html).

diff --git a/packages/vue-components/src/panels/NestedPanel.vue b/packages/vue-components/src/panels/NestedPanel.vue
@@ -283,28 +283,6 @@ export default {
         margin-top: 0 !important;
     }
 
-    .card-seamless {
-        padding: 0;
-    }
-
-    .card.card-seamless {
-        box-shadow: none;
-        border: none;
-    }
-
-    .card-seamless > .card-heading {
-        padding: 0;
-    }
-
-    .card-seamless > .card-collapse > hr {
-        margin: 0;
-        width: calc(100% - 27px);
-    }
-
-    .card-seamless > .card-collapse > .card-body {
-        padding: 10px 0;
-    }
-
     .card-body > .collapse-button {
         margin-bottom: 13px;
         margin-top: 5px;
@@ -315,11 +293,6 @@ export default {
         opacity: 1;
     }
 
-    .card-seamless > .card-collapse > .card-body > .collapse-button {
-        position: relative;
-        top: 22px;
-    }
-
     .close-button {
         font-size: 10px !important;
         float: right;