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
5db3a6fe
Commit
5db3a6fe
authored
Jan 17, 2023
by
wd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将返回按钮以及logo修改同步到全局通用模板
parent
5d6c0afe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
41 deletions
+55
-41
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
+1
-40
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/footer.phtml
+5
-0
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/header/logo.phtml
+33
-1
app/design/frontend/Joshine/breeze/web/css/_custom.less
+16
-0
No files found.
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
View file @
5db3a6fe
...
@@ -23,9 +23,6 @@
...
@@ -23,9 +23,6 @@
padding
:
1px
;
padding
:
1px
;
}
}
#topBtn
{
width
:
8%
!important
;
}
}
}
@media
(
max-width
:
1024px
)
{
@media
(
max-width
:
1024px
)
{
...
@@ -40,24 +37,13 @@
...
@@ -40,24 +37,13 @@
font-size
:
18px
;
font-size
:
18px
;
}
}
#topBtn
{
width
:
6%
!important
;
}
}
}
#topBtn
{
bottom
:
5%
;
right
:
2%
;
position
:
fixed
;
width
:
4%
;
}
</style>
</style>
<div
class=
"banner1"
></div>
<div
class=
"banner1"
></div>
<a
href=
"#top"
title=
"go to header"
id=
"topBtn"
style=
"display: none;"
>
<img
loading=
"lazy"
src=
"
<?php
echo
$block
->
getViewFileUrl
(
'images/goTop.png'
);
?>
"
>
</a>
<script>
<script>
require
([
require
([
'jquery'
'jquery'
...
@@ -258,32 +244,7 @@
...
@@ -258,32 +244,7 @@
return
mobile_flag
;
return
mobile_flag
;
}
}
window
.
onscroll
=
function
(){
var
top
=
document
.
getElementById
(
"topBtn"
);
if
(
document
.
documentElement
.
scrollTop
>
200
||
document
.
body
.
scrollTop
>
200
){
top
.
style
.
display
=
"block"
;
}
else
{
top
.
style
.
display
=
"none"
;
}
}
var
userAgentInfo
=
navigator
.
userAgent
;
var
Agents
=
new
Array
(
"Android"
,
"iPhone"
,
"SymbianOS"
,
"Windows Phone"
,
"iPad"
,
"iPod"
);
var
flag
=
true
;
for
(
var
v
=
0
;
v
<
Agents
.
length
;
v
++
)
{
if
(
userAgentInfo
.
indexOf
(
Agents
[
v
])
>
0
)
{
flag
=
false
;
break
;
}
}
require
([
'jquery'
],
function
(
$
){
if
(
flag
){
var
imgH
=
$
(
'.logo'
).
height
();
imgH
=
Math
.
ceil
(
imgH
/
3
);
$
(
'.header '
).
css
(
'margin-bottom'
,
imgH
);
}
else
{
var
headerH
=
$
(
'.page-header'
).
outerHeight
(
true
);
$
(
'.columns'
).
css
(
'margin-top'
,
headerH
);
}
});
</script>
</script>
<?php
echo
$block
->
getLayout
()
->
createBlock
(
'Magento\Cms\Block\Block'
)
->
setBlockId
(
'home_top_category_thumnail'
)
->
toHtml
();
?>
<?php
echo
$block
->
getLayout
()
->
createBlock
(
'Magento\Cms\Block\Block'
)
->
setBlockId
(
'home_top_category_thumnail'
)
->
toHtml
();
?>
<?php
echo
$block
->
getLayout
()
->
createBlock
(
'Magento\Cms\Block\Block'
)
->
setBlockId
(
'home_new_arrivals'
)
->
toHtml
();
?>
<?php
echo
$block
->
getLayout
()
->
createBlock
(
'Magento\Cms\Block\Block'
)
->
setBlockId
(
'home_new_arrivals'
)
->
toHtml
();
?>
...
...
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/footer.phtml
View file @
5db3a6fe
...
@@ -6,6 +6,11 @@
...
@@ -6,6 +6,11 @@
?>
?>
<?php
echo
$block
->
getLayout
()
->
createBlock
(
'Magento\Cms\Block\Block'
)
->
setBlockId
(
'public_footer'
)
->
toHtml
();
?>
<?php
echo
$block
->
getLayout
()
->
createBlock
(
'Magento\Cms\Block\Block'
)
->
setBlockId
(
'public_footer'
)
->
toHtml
();
?>
<a
href=
"#top"
title=
"go to header"
id=
"topBtn"
style=
"display: none;"
>
<img
loading=
"lazy"
src=
"
<?php
echo
$block
->
getViewFileUrl
(
'images/goTop.png'
);
?>
"
>
</a>
<script>
<script>
require
([
require
([
'jquery'
'jquery'
...
...
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/header/logo.phtml
View file @
5db3a6fe
...
@@ -19,6 +19,37 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
...
@@ -19,6 +19,37 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
?
$logoSizeResolver
->
getHeight
()
?
$logoSizeResolver
->
getHeight
()
:
$block
->
getLogoHeight
();
:
$block
->
getLogoHeight
();
?>
?>
<script>
window
.
onscroll
=
function
(){
var
top
=
document
.
getElementById
(
"topBtn"
);
if
(
document
.
documentElement
.
scrollTop
>
200
||
document
.
body
.
scrollTop
>
200
){
top
.
style
.
display
=
"block"
;
}
else
{
top
.
style
.
display
=
"none"
;
}
}
var
userAgentInfo
=
navigator
.
userAgent
;
var
Agents
=
new
Array
(
"Android"
,
"iPhone"
,
"SymbianOS"
,
"Windows Phone"
,
"iPad"
,
"iPod"
);
var
flag
=
true
;
for
(
var
v
=
0
;
v
<
Agents
.
length
;
v
++
)
{
if
(
userAgentInfo
.
indexOf
(
Agents
[
v
])
>
0
)
{
flag
=
false
;
break
;
}
}
require
([
'jquery'
],
function
(
$
){
if
(
flag
){
var
imgH
=
$
(
'.logo'
).
height
();
imgH
=
Math
.
ceil
(
imgH
/
3
);
$
(
'.header '
).
css
(
'margin-bottom'
,
imgH
);
}
else
{
var
headerH
=
$
(
'.page-header'
).
outerHeight
(
true
);
$
(
'.columns'
).
css
(
'margin-top'
,
headerH
);
}
});
</script>
<span
data-action=
"toggle-nav"
class=
"action nav-toggle"
><span>
<?=
$block
->
escapeHtml
(
__
(
'Toggle Nav'
))
?>
</span></span>
<span
data-action=
"toggle-nav"
class=
"action nav-toggle"
><span>
<?=
$block
->
escapeHtml
(
__
(
'Toggle Nav'
))
?>
</span></span>
<a
<a
class=
"logo"
class=
"logo"
...
@@ -31,4 +62,4 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
...
@@ -31,4 +62,4 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
<?=
$logoWidth
?
'width="'
.
$block
->
escapeHtmlAttr
(
$logoWidth
)
.
'"'
:
''
?>
<?=
$logoWidth
?
'width="'
.
$block
->
escapeHtmlAttr
(
$logoWidth
)
.
'"'
:
''
?>
<?=
$logoHeight
?
'height="'
.
$block
->
escapeHtmlAttr
(
$logoHeight
)
.
'"'
:
''
?>
<?=
$logoHeight
?
'height="'
.
$block
->
escapeHtmlAttr
(
$logoHeight
)
.
'"'
:
''
?>
/>
/>
</a>
</a>
\ No newline at end of file
app/design/frontend/Joshine/breeze/web/css/_custom.less
View file @
5db3a6fe
...
@@ -142,6 +142,10 @@
...
@@ -142,6 +142,10 @@
// position: fixed;
// position: fixed;
//}
//}
#topBtn{
width: 6% !important;
}
}
}
...
@@ -608,6 +612,10 @@ ul {
...
@@ -608,6 +612,10 @@ ul {
.categories_tab {
.categories_tab {
height: 330px;
height: 330px;
}
}
#topBtn {
width: 8% !important;
}
}
}
.categories_tab {
.categories_tab {
...
@@ -2571,3 +2579,10 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
...
@@ -2571,3 +2579,10 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
padding:0 !important;
padding:0 !important;
}
}
#topBtn{
bottom: 5%;
right: 2%;
position:fixed;
width: 4%;
}
\ No newline at end of file
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