Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
joshine
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
joshine
Commits
c7275e6d
Commit
c7275e6d
authored
Mar 23, 2023
by
wd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
恢复商品详情页原始弹窗功能
parent
2522199a
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
77 additions
and
19 deletions
+77
-19
app/design/frontend/Joshine/breeze/Magento_Catalog/layout/catalog_product_view.xml
+4
-0
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/gallery.phtml
+0
-0
app/design/frontend/Joshine/breeze/Magento_Catalog/web/css/gallery.css
+0
-0
app/design/frontend/Joshine/breeze/Magento_Theme/layout/breeze_default.xml
+0
-1
app/design/frontend/Joshine/breeze/etc/view.xml
+51
-5
app/design/frontend/Joshine/breeze/web/css/_custom.less
+17
-4
lib/web/fotorama/fotorama.js
+1
-1
lib/web/mage/gallery/gallery.js
+4
-4
vendor/swissup/theme-frontend-breeze-blank/web/mage/gallery/gallery.less
+0
-4
No files found.
app/design/frontend/Joshine/breeze/Magento_Catalog/layout/catalog_product_view.xml
View file @
c7275e6d
...
...
@@ -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_Catalog/templates/product/view/gallery.phtml
deleted
100644 → 0
View file @
2522199a
This diff is collapsed.
Click to expand it.
app/design/frontend/Joshine/breeze/Magento_Catalog/web/css/gallery.css
0 → 100644
View file @
c7275e6d
This diff is collapsed.
Click to expand it.
app/design/frontend/Joshine/breeze/Magento_Theme/layout/breeze_default.xml
View file @
c7275e6d
...
...
@@ -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
View file @
c7275e6d
...
...
@@ -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
View file @
c7275e6d
// 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;
}
...
...
@@ -3050,7 +3047,23 @@ 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: 80px;
}
.sparsh-mfp-wrap .fotorama__arr--next{
right: 2px!important;
}
.sparsh-mfp-wrap .fotorama__arr .fotorama__arr__arr{
top: 42%!important;
}
/*导入Joshine工具类*/
@import "./_joshine_col";
...
...
lib/web/fotorama/fotorama.js
View file @
c7275e6d
...
...
@@ -1140,7 +1140,7 @@ fotoramaVersion = '4.6.4';
function
addEvent
(
el
,
e
,
fn
,
bool
)
{
if
(
!
e
)
return
;
el
.
addEventListener
?
el
.
addEventListener
(
e
,
fn
,
{
passive
:
tru
e
})
:
el
.
attachEvent
(
'on'
+
e
,
fn
);
el
.
addEventListener
?
el
.
addEventListener
(
e
,
fn
,
{
passive
:
fals
e
})
:
el
.
attachEvent
(
'on'
+
e
,
fn
);
}
/**
...
...
lib/web/mage/gallery/gallery.js
View file @
c7275e6d
...
...
@@ -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
View file @
2522199a
// Fotorama is not supported in Breeze Theme
.breeze-disable-fotorama {
width: 1;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment