Skip to content

Commit

Permalink
Merge branch 'main' into fix/carousel-8247
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Mar 3, 2022
2 parents 54c87cd + 49387fb commit 905be0f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* Copyright IBM Corp. 2020, 2021
* Copyright IBM Corp. 2020, 2022
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -22,8 +22,8 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
*/
@customElement(`${ddsPrefix}-content-block-horizontal`)
class DDSContentBlockHorizontal extends DDSContentGroup {
@property({ type: Boolean, reflect: true })
border: Boolean = true;
@property({ type: Boolean, reflect: true, attribute: 'border' })
border = false;

render() {
return html`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
<slot name="complementary">
</slot>
</div>
<dds-hr data-autoid="dds--hr">
</dds-hr>
```

Expand Down Expand Up @@ -55,8 +53,6 @@
<slot name="complementary">
</slot>
</div>
<dds-hr data-autoid="dds--hr">
</dds-hr>
```

0 comments on commit 905be0f

Please sign in to comment.