Skip to content

J
joshine
Commit 6be9860e by dhn
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

parents a9724dd5 cbc5464d
Showing with 120 additions and 19 deletions
.gitignore 0 → 100644
/app/etc/config.php
/.gitignore
cache
composer_home
log
page_cache
view_preprocessed
static
errors
media
opt
/app/etc/env.php
generated
var
.idea
/.php_cs.cache
/app/design/frontend/Joshine/breeze/Magento_Theme/templates/root.phtml
/pub/feed
/lib/web/images/loader-1.gif
/lib/web/images/loader-2.gif
app/code/Sparsh/QuickView/view/frontend/layout/quickview_catalog_product_view.xml
......@@ -12,5 +12,6 @@
<referenceBlock name="product.info.review" remove="true" />
<referenceBlock name="reviews.tab" remove="true" />
<referenceBlock name="form.subscribe" remove="true" />
<referenceBlock name="checkout.cart.empty.recently" remove="true" />
</body>
</page>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Catalog/layout/catalog_product_view.xml
......@@ -6,6 +6,10 @@
*/
-->
<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head>
<remove src="mage/gallery/gallery.css"/>
<css src="Magento_Catalog::css/gallery.css"/>
</head>
<body>
<referenceBlock name="product.info.description" remove="true" />
<referenceBlock name="product.attributes" remove="true" />
......
app/design/frontend/Joshine/breeze/Magento_Theme/layout/breeze_default.xml
......@@ -3,7 +3,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head>
<remove src="mage/calendar.css"/>
<remove src="mage/gallery/gallery.css"/>
</head>
<body>
<referenceContainer name="before.body.end">
......
app/design/frontend/Joshine/breeze/etc/view.xml
......@@ -208,12 +208,58 @@
</images>
</media>
<vars module="Magento_Catalog">
<!-- Gallery and magnifier theme settings. Start -->
<var name="gallery">
<var name="allowfullscreen">true</var>
<var name="keyboard">true</var>
<var name="loop">true</var>
<var name="nav">true</var> <!-- true/false -->
<var name="navdir">vertical</var> <!-- horizontal/vertical -->
<var name="nav">thumbs</var> <!-- Gallery navigation style (false/thumbs/dots) -->
<var name="loop">true</var> <!-- Gallery navigation loop (true/false) -->
<var name="keyboard">true</var> <!-- Turn on/off keyboard arrows navigation (true/false) -->
<var name="arrows">true</var> <!-- Turn on/off arrows on the sides preview (true/false) -->
<var name="caption">false</var> <!-- Display alt text as image title (true/false) -->
<var name="allowfullscreen">true</var> <!-- Turn on/off fullscreen (true/false) -->
<var name="navdir">vertical</var> <!-- Sliding direction of thumbnails (horizontal/vertical) -->
<var name="navarrows">true</var> <!-- Turn on/off on the thumbs navigation sides arrows(true/false) -->
<var name="navtype">slides</var> <!-- Sliding type of thumbnails (slides/thumbs) -->
<var name="transition">
<var name="effect">slide</var> <!-- Sets transition effect for slides changing (slide/crossfade/dissolve) -->
<var name="duration">500</var> <!-- Sets transition duration in ms -->
</var>
<var name="fullscreen">
<var name="nav">thumbs</var> <!-- Fullscreen navigation style (false/thumbs/dots) -->
<var name="loop">true</var> <!-- Fullscreen navigation loop (true/false/null) -->
<var name="arrows">true</var> <!-- Turn on/off arrows on the sides preview in fullscreen (true/false/null) -->
<var name="caption">false</var> <!-- Display alt text as image title in fullscreen(true/false) -->
<var name="navdir">horizontal</var> <!--Sliding direction of thumbnails in fullscreen(horizontal/vertical) -->
<var name="navarrows">false</var> <!-- Turn on/off on the thumbs navigation sides arrows(true/false) -->
<var name="navtype">slides</var> <!-- Sliding type of thumbnails (slides/thumbs) -->
<var name="transition">
<var name="effect">slide</var> <!-- Sets transition effect for slides changing (slide/crossfade/dissolve) -->
<var name="duration">500</var> <!-- Sets transition duration in ms -->
</var>
</var>
</var>
<var name="magnifier">
<var name="fullscreenzoom">20</var> <!-- Zoom for fullscreen (integer)-->
<var name="top"></var> <!-- Top position of magnifier -->
<var name="left"></var> <!-- Left position of magnifier -->
<var name="width"></var> <!-- Width of magnifier block -->
<var name="height"></var> <!-- Height of magnifier block -->
<var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
<var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
<var name="mode">outside</var> <!-- Zoom type (outside/inside) -->
</var>
<var name="breakpoints">
<var name="mobile">
<var name="conditions">
<var name="max-width">767px</var>
</var>
<var name="options">
<var name="options">
<var name="nav">dots</var>
</var>
</var>
</var>
</var>
</vars>
<vars module="Magento_ConfigurableProduct">
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
// DO NOT EDIT THIS FILE - IT SHOULD REMAIN EMPTY
// DO NOT EDIT THIS FILE - IT SHOULD REMAIN EMPTY
.product.media .gallery-placeholder .fotorama__stage{ left: 0 !important; }
.product.media .gallery-placeholder .fotorama__nav-wrap--vertical.fotorama__nav-wrap{ right: 0; text-align: right;}
.product.media .gallery-placeholder .fotorama__nav--thumbs{float: right;}
.fotorama__stage__shaft.fotorama__grab {
margin-left: -120px !important;
}
.breeze-gallery .thumbnails .item img{
margin: 3px 1px;
}
......@@ -3077,7 +3074,44 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
}
}
.sparsh-mfp-wrap .fotorama__stage__shaft,fotorama__grab{
float: right;
}
.sparsh-mfp-wrap .fotorama__stage__frame .fotorama__img{
top: 40%;
}
.sparsh-mfp-wrap .fotorama__arr--prev{
left: 95px;
}
.sparsh-mfp-wrap .fotorama__arr--next{
right: 2px!important;
}
.sparsh-mfp-wrap .fotorama__arr .fotorama__arr__arr{
top: 42%!important;
}
.fotorama__nav{
max-height:1000px;
}
.product,.media .fotorama__stage{
max-height: 1000px;
max-width: 800px;
}
.fotorama__thumb-border{
border-color: #0a0a0a;
}
#sparsh-mfp-quickview .fotorama__nav{
max-height:645px;
}
#sparsh-mfp-quickview .fotorama__stage{
max-height: 700px;
max-width: 560px;
}
/*导入Joshine工具类*/
@import "./_joshine_col";
......
lib/web/fotorama/fotorama.js
......@@ -1140,7 +1140,7 @@ fotoramaVersion = '4.6.4';
function addEvent(el, e, fn, bool) {
if (!e) return;
el.addEventListener ? el.addEventListener(e, fn, {passive: true}) : el.attachEvent('on' + e, fn);
el.addEventListener ? el.addEventListener(e, fn, {passive: false}) : el.attachEvent('on' + e, fn);
}
/**
......
lib/web/mage/gallery/gallery.js
......@@ -186,7 +186,7 @@ define([
settings.focusableStart = this.settings.$element.find('[data-gallery-role="fotorama__focusable-start"]');
settings.focusableEnd = this.settings.$element.find('[data-gallery-role="fotorama__focusable-end"]');
settings.closeIcon = this.settings.$element.find('[data-gallery-role="fotorama__fullscreen-icon"]');
//settings.fullscreenConfig.swipe = true;
settings.fullscreenConfig.swipe = true;
settings.$gallery.on('fotorama:fullscreenenter', function () {
settings.closeIcon.show();
......@@ -537,9 +537,9 @@ define([
returnCurrentImages: function () {
var images = [];
// _.each(this.fotorama.data, function (item) {
// images.push(_.omit(item, '$navThumbFrame', '$navDotFrame', '$stageFrame', 'labelledby'));
// });
_.each(this.fotorama.data, function (item) {
images.push(_.omit(item, '$navThumbFrame', '$navDotFrame', '$stageFrame', 'labelledby'));
});
return images;
},
......
vendor/swissup/theme-frontend-breeze-blank/web/mage/gallery/gallery.less deleted 100755 → 0
// Fotorama is not supported in Breeze Theme
.breeze-disable-fotorama {
width: 1;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment