Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(default-theme): remove duplicated product description #882

Merged
merged 6 commits into from
Jun 25, 2020
Merged

fix(default-theme): remove duplicated product description #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2231cfe
fix(default-theme): remove duplicated description
llusiak Jun 22, 2020
d78182d
fix(default-theme): remove description from SfTabs
Jun 22, 2020
489e27b
Merge branch 'master' into fix(default-theme)/description-is-displaye…
Jun 23, 2020
75de060
Merge branch 'master' into fix(default-theme)/description-is-displaye…
mkucmus Jun 23, 2020
7fc26eb
fix(default-theme): add description on mobile
Jun 24, 2020
b6b4c2a
Merge branch 'master' into fix(default-theme)/description-is-displaye…
patzick Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions packages/default-theme/components/SwProductDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
/>
</div>
<SwPluginSlot name="product-page-description" :slotContext="product">
<p
class="product-details__description desktop-only"
v-html="description"
/>
<p class="product-details__description" v-html="description" />
</SwPluginSlot>
<!-- <div class="product-details__action">
<button v-if="sizes.length > 0" class="sf-action">Size guide</button>
Expand Down Expand Up @@ -64,7 +61,6 @@
</div>
</div>
<SwProductTabs
:description="description"
:properties="properties"
:reviews="reviews"
:manufacturer="product.manufacturer"
Expand Down Expand Up @@ -256,7 +252,7 @@ export default {
margin-bottom: var(--spacer-base);
}
&__description {
margin: var(--spacer-xl) 0 calc(var(--spacer-base) * 3) 0;
margin: var(--spacer-xl) 0;
font-family: var(--font-family-secondary);
font-size: var(--font-sm);
}
Expand Down
9 changes: 0 additions & 9 deletions packages/default-theme/components/SwProductTabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<div class="sw-product-tabs">
<SfTabs class="product-details__tabs" :open-tab="openTab">
<slot>
<SfTab title="Description">
<div>
<p v-html="description" />
</div>
</SfTab>
<SfTab title="Properties">
<div class="product-details__properties">
<SfProperty
Expand Down Expand Up @@ -66,10 +61,6 @@ export default {
type: Array,
default: () => [],
},
description: {
type: String,
default: "",
},
manufacturer: {
type: Object,
default: () => ({}),
Expand Down