Skip to content

Commit 6d668bd

Browse files
committed
DmfManuTheme v2.0.0 - Shopware 6.4 compatibility
1 parent d9d468c commit 6d668bd

48 files changed

Lines changed: 598 additions & 300 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# 2.0.0
2+
- Corrected layout 'Search as icon / Navigation bottom'
3+
- Corrected text align in search field suggestions
4+
- Added option to display variant information
5+
- Added configuration options for wishlist:
6+
- Color of the wishlist icon
7+
- Position of the wishlist button in the product listing
8+
- Type of wishlist display in the header
9+
- Shopware 6.4 compatibility
10+
11+
112
# 1.0.5
213
- fix font integration
314
- fix compatibility issue with shopware 6.3.5.

CHANGELOG_de-DE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# 2.0.0
2+
- Die Variante 'Suche als Icon / Navigation Unterhalb' wurde korrigiert
3+
- Textausrichtung bei Vorschlägen im Suchfeld korrigiert
4+
- Option für die Anzeige von Varianteninformationen eingefügt
5+
- Konfigurationsmöglichkeiten für Merkzettel hinzugefügt:
6+
- Farbe des Merkzettel Symbols
7+
- Position des Merkzettel Buttons im Produktlisting
8+
- Art der Merkzettelanzeige im Header
9+
- Shopware 6.4 Kompatibilität
10+
111
# 1.0.5
212
- Fix Fonteinbindung der Inter-Font
313
- Kompatibilität-Fix für Shopware 6.3.5.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "dmf/sw6-manu-theme",
33
"description": "Manu Theme",
4-
"version": "1.0.5",
4+
"version": "2.0.0",
55
"type": "shopware-platform-plugin",
66
"authors": [
77
{
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"shopware/core": "*",
15+
"shopware/core": "~6.4.0",
1616
"shopware/storefront": "*"
1717
},
1818
"minimum-stability": "RC",

src/Resources/app/storefront/dist/storefront/js/dmf-manu-theme.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import WishlistWidgetPlugin from "src/plugin/header/wishlist-widget.plugin";
2+
3+
export default class ExtendedWishlistWidgetPlugin extends WishlistWidgetPlugin {
4+
_renderCounter() {
5+
if (this.el.dataset.wishlistHideCount) {
6+
if (this._wishlistStorage.getCurrentCounter() > 0) {
7+
this.el.classList.remove("d-none");
8+
} else {
9+
this.el.classList.add("d-none");
10+
}
11+
} else {
12+
this.el.innerHTML = this._wishlistStorage.getCurrentCounter() || "";
13+
}
14+
}
15+
}

src/Resources/app/storefront/src/main.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import InputSpinner from './js/input-spinner/input-spinner.plugin';
22
import NewsletterPrivacy from './js/newsletter-privacy/newsletter-privacy.plugin';
33
import TogglePassword from './js/toggle-password/toggle-password.plugin';
44
import RegisterExpand from './js/register-expand/register-expand.plugin';
5+
import ExtendedWishlistWidgetPlugin from './js/wishlist-widget/wishlist-widget.plugin';
56

67
const PluginManager = window.PluginManager;
78

89
PluginManager.register('NewsletterPrivacy', NewsletterPrivacy, '.footer-newsletter-email');
910
PluginManager.register('InputSpinner', InputSpinner, '[data-input-spinner]');
1011
PluginManager.register('TogglePassword', TogglePassword, '[data-toggle-password]');
1112
PluginManager.register('RegisterExpand', RegisterExpand, '[data-register-expand]');
13+
PluginManager.override('WishlistWidget', ExtendedWishlistWidgetPlugin, '[data-wishlist-widget]');

src/Resources/app/storefront/src/scss/base.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ https://sass-guidelin.es/#the-7-1-pattern
6767
@import 'component/jumbotron';
6868
@import 'component/toggle-password';
6969
@import 'component/sidebar';
70+
@import 'component/product-wishlist';
7071

7172
/*
7273
* Layout-related sections

src/Resources/app/storefront/src/scss/component/breadcrumb.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ Advanced styling for breadcrumb component
9292
@include media-breakpoint-up(sm) {
9393
.breadcrumb {
9494
padding: $spacer $order-grid-gutter-width;
95+
padding-left: 0px;
9596

9697
.breadcrumb-container {
9798
&.penultimate {

src/Resources/app/storefront/src/scss/component/product-box.scss

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Custom styling for product box component.
6767
.product-price-unit,
6868
.product-description {
6969
color: $sw-text-color;
70-
opacity: .5;
70+
opacity: 0.5;
7171
}
7272

7373
.product-description {
@@ -95,7 +95,7 @@ Custom styling for product box component.
9595

9696
.product-price {
9797
.list-price {
98-
opacity: .5;
98+
opacity: 0.5;
9999
}
100100
}
101101

@@ -132,7 +132,6 @@ Custom styling for product box component.
132132
color: $success;
133133
border-color: $success;
134134
background-color: rgba($color: $success, $alpha: 0.2);
135-
136135
}
137136
}
138137

@@ -154,3 +153,23 @@ Custom styling for product box component.
154153
}
155154
}
156155
}
156+
157+
.product-action {
158+
&.wishlist-button {
159+
display: flex;
160+
justify-content: space-between;
161+
align-items: center;
162+
163+
.buy-widget {
164+
width: 78%;
165+
}
166+
.product-wishlist {
167+
margin-top: 0px;
168+
.product-wishlist-action-circle {
169+
position: relative;
170+
bottom: 0px;
171+
right: 0px;
172+
}
173+
}
174+
}
175+
}

0 commit comments

Comments
 (0)