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
ff7af330
Commit
ff7af330
authored
Sep 17, 2022
by
lmf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化首页样式错位
parent
dfb90427
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
21 deletions
+36
-21
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/widget/new/content/home_news_product.phtml
+4
-4
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
+15
-15
app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
+4
-2
app/design/frontend/Joshine/breeze/web/css/_custom.less
+13
-0
No files found.
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/widget/new/content/home_news_product.phtml
View file @
ff7af330
...
...
@@ -71,7 +71,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
data-mage-init='{"
redirectUrl
":{"
url
":"
<?=
$block
->
escapeUrl
(
$block
->
getAddToCartUrl
(
$_item
))
?>
"}}'
type="button"
title="
<?=
$block
->
escapeHtmlAttr
(
__
(
'Add to Cart'
))
?>
">
<span>
<?=
$block
->
escapeHtml
(
__
(
'Add
to Cart
'
))
?>
</span>
<span>
<?=
$block
->
escapeHtml
(
__
(
'Add'
))
?>
</span>
</button>
<?php
else
:?>
<?
php
...
...
@@ -85,7 +85,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
data-post=
'
<?=
/* @noEscape */
$postData
?>
'
type=
"button"
title=
"
<?=
$block
->
escapeHtmlAttr
(
__
(
'Add to Cart'
))
?>
"
>
<span>
<?=
$block
->
escapeHtml
(
__
(
'Add
to Cart
'
))
?>
</span>
<span>
<?=
$block
->
escapeHtml
(
__
(
'Add'
))
?>
</span>
</button>
<?php
endif
;
?>
<?php
else
:?>
...
...
@@ -109,7 +109,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
class
="
action
towishlist
"
data-action="
add
-
to
-
wishlist
"
title="
<?=
$block
->
escapeHtmlAttr
(
__
(
'Add to Wish List'
))
?>
">
<span>
<?=
$block
->
escapeHtml
(
__
(
'
Add to Wish List
'
))
?>
</span>
<span>
<?=
$block
->
escapeHtml
(
__
(
'
Wish
'
))
?>
</span>
</a>
<?php
endif
;
?>
<?php
if
(
$block
->
getAddToCompareUrl
()
&&
$showCompare
)
:?>
...
...
@@ -117,7 +117,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
<a
href=
"#"
class=
"action tocompare"
data-post=
'
<?=
/* @noEscape */
$compareHelper
->
getPostDataParams
(
$_item
)
?>
'
title=
"
<?=
$block
->
escapeHtmlAttr
(
__
(
'Add to Compare'
))
?>
"
>
<span>
<?=
$block
->
escapeHtml
(
__
(
'
Add to
Compare'
))
?>
</span>
<span>
<?=
$block
->
escapeHtml
(
__
(
'Compare'
))
?>
</span>
</a>
<?php
endif
;
?>
</div>
...
...
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
View file @
ff7af330
...
...
@@ -27,31 +27,31 @@
<p
class=
"shopbycate-title"
>
Shop By Cateogry
</p>
<div
class=
"shopcatewpt"
>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/thongs-bodysuits-shapewear/strap-control-shorts-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/1-strap.png"
alt=
""
/></a>
<a
href=
"/shapewear/thongs-bodysuits-shapewear/strap-control-shorts-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/1-strap.png"
alt=
""
/></a>
</div>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/thongs-bodysuits-shapewear/underbust-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/2-underbust.png"
alt=
""
/></a>
<a
href=
"/shapewear/thongs-bodysuits-shapewear/underbust-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/2-underbust.png"
alt=
""
/></a>
</div>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/thongs-bodysuits-shapewear/overbust-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/3-overbust.png"
alt=
""
/></a>
<a
href=
"/shapewear/thongs-bodysuits-shapewear/overbust-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/3-overbust.png"
alt=
""
/></a>
</div>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/thongs-bodysuits-shapewear/sleeved-underbust-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/4-sleeved.png"
alt=
""
/></a>
<a
href=
"/shapewear/thongs-bodysuits-shapewear/sleeved-underbust-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/4-sleeved.png"
alt=
""
/></a>
</div>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/thongs-bodysuits-shapewear/full-body-shaper-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/5-fullbody.jpg"
alt=
""
/></a>
<a
href=
"/shapewear/thongs-bodysuits-shapewear/full-body-shaper-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/5-fullbody.jpg"
alt=
""
/></a>
</div>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/thongs-bodysuits-shapewear/thongs-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/6-thongs.png"
alt=
""
/></a>
<a
href=
"/shapewear/thongs-bodysuits-shapewear/thongs-bodysuits-shapewear"
><img
src=
"/media/wysiwyg/shopbycategory/6-thongs.png"
alt=
""
/></a>
</div>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/pamaleta-luggage"
><img
src=
"/media/wysiwyg/shopbycategory/7-buttlifter.png"
alt=
""
/></a>
<a
href=
"/shapewear/pamaleta-luggage"
><img
src=
"/media/wysiwyg/shopbycategory/7-buttlifter.png"
alt=
""
/></a>
</div>
<div
class=
"shop-by-cata"
>
<a
href=
"
https://www.joshine.com
/shapewear/overbust-corset"
><img
src=
"/media/wysiwyg/shopbycategory/8-waisttrainer.png"
alt=
""
/></a>
<a
href=
"/shapewear/overbust-corset"
><img
src=
"/media/wysiwyg/shopbycategory/8-waisttrainer.png"
alt=
""
/></a>
</div>
</div>
</div>
...
...
@@ -61,13 +61,13 @@ echo $this->getLayout()->createBlock("Magento\Catalog\Block\Product\Widget\NewWi
<div
class=
"flash_sale"
>
<a
href=
"
https://www.joshine.com
/flashsale-0422?product_list_order=price_low"
><p
class=
"flashsale-title"
>
⚡FLASH SALE⚡
</p>
</a>
<a
href=
"/flashsale-0422?product_list_order=price_low"
><p
class=
"flashsale-title"
>
⚡FLASH SALE⚡
</p>
</a>
<div
class=
"flash-sale-wpt row"
style=
"background: linear-gradient(to right, #ffffff, #ffffff);"
>
<div
class=
"flash-sale-inner"
>
<?php
$templateType
=
\Magento\Catalog\Block\Product\ReviewRendererInterface
::
SHORT_VIEW
;
$ids
=
explode
(
','
,
"133,138,148,158,167,172"
);
//
$ids = explode(',',"1,2");
//
$ids = explode(',',"133,138,148,158,167,172");
$ids
=
explode
(
','
,
"1,2"
);
$objectManager
=
\Magento\Framework\App\ObjectManager
::
getInstance
();
$pr
=
$objectManager
->
create
(
'Magento\Catalog\Model\ProductRepository'
);
...
...
@@ -98,16 +98,16 @@ echo $this->getLayout()->createBlock("Magento\Catalog\Block\Product\Widget\NewWi
<div
class=
"top-content-home"
>
<div
class=
"banner-4-cate"
>
<a
href=
"
https://www.joshine.com
/shapewear"
><img
src=
"/media/wysiwyg/BDS.jpg"
alt=
""
/></a>
<a
href=
"/shapewear"
><img
src=
"/media/wysiwyg/BDS.jpg"
alt=
""
/></a>
</div>
<div
class=
"banner-4-cate"
>
<a
href=
"
https://www.joshine.com
/bodysuits-shapewear/bra"
><img
src=
"/media/wysiwyg/Bra_1.jpg"
alt=
""
/></a>
<a
href=
"/bodysuits-shapewear/bra"
><img
src=
"/media/wysiwyg/Bra_1.jpg"
alt=
""
/></a>
</div>
<div
class=
"banner-4-cate"
>
<a
href=
"
https://www.joshine.com
/shapewear/control-panties-shapewear"
><img
src=
"/media/wysiwyg/BT.jpg"
alt=
""
/></a>
<a
href=
"/shapewear/control-panties-shapewear"
><img
src=
"/media/wysiwyg/BT.jpg"
alt=
""
/></a>
</div>
<div
class=
"banner-4-cate"
>
<a
href=
"
https://www.joshine.com
/shapewear/waist-trainer-corsets"
><img
src=
"/media/wysiwyg/WT.jpg"
alt=
""
/></a>
<a
href=
"/shapewear/waist-trainer-corsets"
><img
src=
"/media/wysiwyg/WT.jpg"
alt=
""
/></a>
</div>
</div>
...
...
app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
View file @
ff7af330
...
...
@@ -79,7 +79,8 @@
position
:
relative
;
z-index
:
1
;
margin-bottom
:
-18px
;
margin-top
:
10px
;
margin-top
:
80px
;
height
:
100px
;
}
.field.newsletter
{
width
:
65%
;
...
...
@@ -119,7 +120,7 @@
float
:
left
;
}
.newsletter-list
ul
>
li
>
a
>
img
{
max-width
:
7
0%
;
max-width
:
5
0%
;
margin-left
:
2px
;
}
@media
(
max-width
:
789px
)
{
...
...
@@ -134,6 +135,7 @@
}
.block.newsletter
{
height
:
200px
;
margin-top
:
50px
;
}
.newsletter-list.sub
{
width
:
105%
;
...
...
app/design/frontend/Joshine/breeze/web/css/_custom.less
View file @
ff7af330
...
...
@@ -207,6 +207,9 @@ footer{
padding: 10px ;
}
footer .footer_link {
margin-bottom: 40px;
}
footer .footer_link .logo_img{
margin-top: 10%;
}
...
...
@@ -902,8 +905,17 @@ p.flashsale-title {
.page-bottom {
margin-top: 10px;
}
.footer-middle{
margin-top: 10px;
}
}
.footer-middle{
margin-top: 60px;
}
footer{
margin-top: -10px;
}
.page-bottom {
margin-top: 50px;
}
\ 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