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
b9ee2a9d
Commit
b9ee2a9d
authored
Nov 04, 2022
by
lmf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
恢复空购物车样式
parent
c31cf6ea
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
211 additions
and
4 deletions
+211
-4
app/app/design/frontend/Joshine/breeze/Magento_Newsletter/email/subscr_success.html
+58
-0
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml
+1
-1
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/minicart.phtml
+69
-0
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/noItems.phtml
+29
-0
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
+0
-2
app/design/frontend/Joshine/breeze/Magento_Checkout/web/images/empty-cart.svg
+2
-0
app/design/frontend/Joshine/breeze/web/css/_custom.less
+52
-1
No files found.
app/app/design/frontend/Joshine/breeze/Magento_Newsletter/email/subscr_success.html
0 → 100644
View file @
b9ee2a9d
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<!--@subject {{trans "Newsletter subscription success"}} @-->
<!--@vars {
"template config_path=\"design\/email\/footer_template\"":"Email Footer Template",
"template config_path=\"design\/email\/header_template\"":"Email Header Template"
} @-->
{{template config_path="design/email/header_template"}}
<table
width=
"620"
border=
"0"
cellpadding=
"0"
cellspacing=
"0"
>
<tbody>
<tr>
<td
width=
"620"
colspan=
"2"
align=
"center"
><a
href=
"https://www.joshine.com/"
style=
"outline: none; text-decoration: none;"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
data-mce-href=
"https://www.joshine.com/"
>
<div
alt=
"Clothing"
title=
"Clothing"
style=
"color: #000; padding: 12px 0; line-height: 25px; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 3px; text-transform: uppercase; font-size: 20px; border-bottom: 1px solid #000; border-top: 1px solid #000;"
data-mce-style=
"color: #000; padding: 12px 0; line-height: 25px; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 3px; text-transform: uppercase; font-size: 20px; border-bottom: 1px solid #000; border-top: 1px solid #000;"
>
<strong>
FREE SHIPPING FOR ORDERS $69+
</strong><br>
<span
style=
"font-size: 15px;"
data-mce-style=
"font-size: 15px;"
>
Free Returns, No Minimum
</span>
</div>
<div
style=
"text-align: -webkit-center;"
data-mce-fragment=
"1"
data-mce-style=
"text-align: -webkit-center;"
><img
height=
"394"
width=
"494"
style=
"margin-top: 20px; float: none;"
alt=
"shapewear"
src=
"https://media.joshine.com/email/email.jpg"
data-mce-fragment=
"1"
data-mce-style=
"margin-top: 20px; float: none;"
></div>
<div
alt=
"Clothing"
title=
"Clothing"
>
<p
style=
"color: #000; line-height: 30px; font-family: Arial,Helvetica,sans-serif; font-weight: normal; text-align: center; letter-spacing: 2px; font-size: 20px; margin: 20px 0 10px 0;"
data-mce-style=
"color: #000; line-height: 30px; font-family: Arial,Helvetica,sans-serif; font-weight: normal; text-align: center; letter-spacing: 2px; font-size: 20px; margin: 20px 0 10px 0;"
><span
style=
"text-transform: none;"
data-mce-style=
"text-transform: none;"
>
We're so glad
</span>
YOU FOUND US!
</p>
<p
style=
"margin: 0; text-align: center; font-family: Arial,Helvetica,sans-serif; color: #000; margin-bottom: 30px;"
data-mce-style=
"margin: 0; text-align: center; font-family: Arial,Helvetica,sans-serif; color: #000; margin-bottom: 30px;"
><span
style=
"display: inline-block; font-size: 10px; line-height: 5px; font-weight: 600; letter-spacing: 0.5px; padding: 0 0 30px;"
data-mce-style=
"display: inline-block; font-size: 10px; line-height: 5px; font-weight: 600; letter-spacing: 0.5px; padding: 0 0 30px;"
>
Now you are on board, you'll receive even more of what
<span
class=
"il"
>
JOSHINE
</span>
has to offer.
</span><br>
<span
style=
"font-size: 18px; line-height: 42px; font-weight: normal; letter-spacing: 1px; color: #000;"
data-mce-style=
"font-size: 18px; line-height: 42px; font-weight: normal; letter-spacing: 1px; color: #000;"
>
As an exclusive thank you offer
<br>
<strong
style=
"font-size: 56px; text-transform: uppercase; font-weight: 800; letter-spacing: -1px; color: #bbbf4e;"
data-mce-style=
"font-size: 56px; text-transform: uppercase; font-weight: 800; letter-spacing: -1px; color: #bbbf4e;"
>
take 20% off*
</strong><br>
sale styles at
<span
class=
"il"
>
JOSHINE
</span>
.
</span><br>
<span
style=
"display: inline-block; width: 240px; height: 46px; background-color: #ffaead; font-size: 24px; font-weight: 600; letter-spacing: 0; line-height: 42px; color: #fff; margin: 15px 0 25px 0;"
data-mce-style=
"display: inline-block; width: 240px; height: 46px; background-color: #ffaead; font-size: 24px; font-weight: 600; letter-spacing: 0; line-height: 42px; color: #fff; margin: 15px 0 25px 0;"
>
CODE: N20F
</span><br>
<span
style=
"font-size: 18px; text-transform: uppercase; text-decoration: underline; font-weight: 0; letter-spacing: 1px; line-height: 60px;"
data-mce-style=
"font-size: 18px; text-transform: uppercase; text-decoration: underline; font-weight: 0; letter-spacing: 1px; line-height: 60px;"
>
EXPLORE
<span
class=
"il"
mce-data-marked=
"1"
>
JOSHINE
</span>
>
</span></p>
</div>
</a></td>
</tr>
<tr>
<td
width=
"310"
align=
"right"
>
<a
href=
"https://www.joshine.com/"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
<div
alt=
"SALE"
title=
"SALE"
style=
"margin: 0 6px 6px 0;"
data-mce-style=
"margin: 0 6px 6px 0;"
>
<a
href=
"https://www.joshine.com/"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
<p
style=
"margin: 0; width: 278px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
data-mce-style=
"margin: 0; width: 278px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
><span
style=
"color: #ffffff;"
><a
href=
"https://www.joshine.com/new-arrivals"
style=
"color: #ffffff;"
><span
style=
"outline-color: initial; outline-width: initial;"
>
NEW
</span>
IN
</a></span></p>
<a
href=
"https://www.joshine.com/daily-new"
data-saferedirecturl=
""
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
</div>
</td>
<td
width=
"310"
align=
"left"
>
<a
href=
"https://www.joshine.com/"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
<p
style=
"margin: 0; width: 278px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
data-mce-style=
"margin: 0; width: 278px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
><span
style=
"color: #ffffff;"
><a
href=
"https://www.joshine.com/on-sale"
style=
"color: #ffffff;"
>
ON SALE
</a></span></p>
<a
href=
"https://www.joshine.com/sales"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
</td>
</tr>
<tr>
<td
width=
"325"
align=
"right"
>
<a
href=
"https://www.joshine.com/on-sale"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
<p
style=
"margin: 0; width: 284px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
data-mce-style=
"margin: 0; width: 278px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
><span
style=
"color: #ffffff;"
><a
href=
"https://www.joshine.com/shapewear"
style=
"color: #ffffff;"
>
SHAPEWEAR
</a></span></p>
<a
href=
"https://www.joshine.com/shapewear"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
</td>
<td
width=
"310"
align=
"left"
>
<p
style=
"margin: 0; width: 278px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
data-mce-style=
"margin: 0; width: 278px; height: 72px; line-height: 72px; background-color: #000; color: #fff; font-family: Arial,Helvetica,sans-serif; text-align: center; letter-spacing: 1px; font-weight: 600; text-transform: uppercase; font-size: 23.5px;"
><span
style=
"color: #ffffff;"
><a
href=
"https://www.joshine.com/swimwear"
style=
"color: #ffffff;"
>
SWIMWEAR
</a></span></p>
<a
href=
"https://www.joshine.com/swimwear"
data-mce-style=
"outline: none; text-decoration: none;"
target=
"_blank"
>
</a>
</td>
</tr>
</tbody>
</table>
{{template config_path="design/email/footer_template"}}
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml
View file @
b9ee2a9d
...
...
@@ -172,7 +172,7 @@
max-width
:
100%
;
font-weight
:
600
;
height
:
55px
;
width
:
300px
;
width
:
100%
;
}
@media
(
max-width
:
1024px
){
#product-intro__freeshipping-more-3
{
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/minicart.phtml
0 → 100644
View file @
b9ee2a9d
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var $block \Magento\Checkout\Block\Cart\Sidebar */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?>
<div
data-block=
"minicart"
class=
"minicart-wrapper"
>
<a
class=
"action showcart"
href=
"
<?=
$block
->
escapeUrl
(
$block
->
getShoppingCartUrl
())
?>
"
data-bind=
"scope: 'minicart_content'"
>
<span
class=
"text"
>
<?=
$block
->
escapeHtml
(
__
(
'My Cart'
))
?>
</span>
<span
class=
"counter qty empty"
data-bind=
"css: { empty: !!getCartParam('summary_count') == false && !isLoading() },
blockLoader: isLoading"
>
<span
class=
"counter-number"
>
<!-- ko text: getCartParam('summary_count') --><!-- /ko -->
</span>
<span
class=
"counter-label"
>
<!-- ko if: getCartParam('summary_count') -->
<!-- ko text: getCartParam('summary_count') --><!-- /ko -->
<!-- ko i18n: 'items' --><!-- /ko -->
<!-- /ko -->
</span>
</span>
</a>
<?php
if
(
$block
->
getIsNeedToDisplaySideBar
())
:?>
<
div
class
="
block
block
-
minicart
"
data-role="
dropdownDialog
"
data-mage-init='{"
dropdownDialog
":{
"
appendTo
":"
[
data
-
block
=
minicart
]
",
"
triggerTarget
":"
.
showcart
",
"
timeout
": "
2000
",
"
closeOnMouseLeave
": false,
"
closeOnEscape
": true,
"
triggerClass
":"
active
",
"
parentClass
":"
active
",
"
buttons
":[]}}'>
<div id="
minicart
-
content
-
wrapper
" data-bind="
scope
:
'minicart_content'
">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
<?=
$block->getChildHtml
('minicart.addons') ?>
</div>
<?php else: ?>
<?php
$scriptString
= <<<script
require(['jquery'], function ($) {
$('a.action.showcart').click(function() {
$(document.body).trigger('processStart');
});
});
script;
?>
<?= /* @noEscape */
$secureRenderer->renderTag
('script', [],
$scriptString
, false); ?>
<?php endif ?>
<?= /* @noEscape */
$secureRenderer->renderTag
('script', [], 'window.checkout = ' .
/* @noEscape */
$block->getSerializedConfig
(), false); ?>
<script type="
text
/
x
-
magento
-
init
">
{
"
[
data
-
block
=
'minicart'
]
": {
"
Magento_Ui
/
js
/
core
/
app
": <?= /* @noEscape */
$block->getJsLayout
() ?>
},
"
*
": {
"
Magento_Ui
/
js
/
block
-
loader
": "
<?=
$block
->
escapeJs
(
$block
->
escapeUrl
(
$block
->
getViewFileUrl
(
'images/loader-1.gif'
))
)
?>
"
}
}
</script>
</div>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/noItems.phtml
0 → 100644
View file @
b9ee2a9d
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var $block \Magento\Checkout\Block\Cart */
?>
<div
class=
"cart-empty"
>
<?=
$block
->
getChildHtml
(
'checkout_cart_empty_widget'
)
?>
<div
class=
"empty-img"
><img
src=
"
<?=
$block
->
getViewFileUrl
(
'Magento_Checkout::images/empty-cart.svg'
);
?>
"
/></div>
<p>
<?=
$block
->
escapeHtml
(
__
(
'You have no items in your shopping cart.'
))
?>
</p>
<p>
<?=
$block
->
escapeHtml
(
__
(
'Click <a href="%1">here</a> to continue shopping.'
,
$block
->
escapeUrl
(
$block
->
getContinueShoppingUrl
())
),
[
'a'
]
)
?>
</p>
<?=
$block
->
getChildHtml
(
'shopping.cart.table.after'
)
?>
</div>
<script
type=
"text/x-magento-init"
>
{
"*"
:
{
"Magento_Checkout/js/empty-cart"
:
{}
}
}
</script>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
View file @
b9ee2a9d
...
...
@@ -180,8 +180,6 @@
}
.opc-block-summary
.title
{
font-weight
:
600
;
font-size
:
20px
;
color
:
#363636
;
}
.product-item-details
{
color
:
#666666
;
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/web/images/empty-cart.svg
0 → 100644
View file @
b9ee2a9d
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg
t=
"1666333165025"
class=
"icon"
viewBox=
"0 0 1024 1024"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
p-id=
"13278"
width=
"200"
height=
"200"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
><path
d=
"M725.333333 981.333333a42.666667 42.666667 0 1 1 42.666667-42.666666 42.713333 42.713333 0 0 1-42.666667 42.666666z m0-42.666666z m-384 42.666666a42.666667 42.666667 0 1 1 42.666667-42.666666 42.713333 42.713333 0 0 1-42.666667 42.666666z m0-42.666666z m382.313334-128H347.146667a85.333333 85.333333 0 0 1-82.146667-62.226667L90.506667 128H21.333333a21.333333 21.333333 0 0 1 0-42.666667h85.333334a21.333333 21.333333 0 0 1 20.533333 15.56L170.826667 256h766.086666a37.333333 37.333333 0 0 1 34.953334 50.44l-168.32 448.853333a85.333333 85.333333 0 0 1-79.9 55.373334zM182.826667 298.666667l123.246666 438.22a42.82 42.82 0 0 0 41.073334 31.113333h376.5a42.873333 42.873333 0 0 0 39.953333-27.686667L929.213333 298.666667z"
fill=
"#bfbfbf"
p-id=
"13279"
></path></svg>
\ No newline at end of file
app/design/frontend/Joshine/breeze/web/css/_custom.less
View file @
b9ee2a9d
...
...
@@ -108,7 +108,7 @@
padding-left: 10px;
}
.box-tocart .fieldset .actions > button{
width:
8
0% !important;
width:
10
0% !important;
float: right;
margin-left: 20%;
}
...
...
@@ -2207,6 +2207,56 @@ text-transform: none;
#search_mini_form_input{
display: none;
}
.header-top.header-fixed{
height: 60px !important;
}
.page-with-filter .toolbar .modes{
display: block !important;
margin-left: 0px !important;
}
.toolbar select {
max-width: 150px !important;
}
.checkout-container .action.primary, .checkout-container action.secondary{
width: 100%;
font-size: larger;
}
}
@media(min-width: 640px) {
.cart-container {
width: 81%;
margin: 0 auto;
}
.scroll-active{
background: #ffffff;
z-index: 1000;
width: 100%;
position: fixed;
padding-right: 20px;
top: 0;
transition: transform .3s;
}
.checkout-cart-index .page.messages{
width: 81%;
margin: 0 auto;
}
.checkout.checkout-methods-items li{display: block;}
.checkout.checkout-methods-items li .paypal.checkout{margin-bottom: 15px;}
}
.cart.table-wrapper .cart.table td{vertical-align: middle;}
.checkout-cart-index .cart-empty{text-align: center;margin-top: 50px;}
.checkout-cart-index .cart-empty .empty-img{margin-bottom: 20px;}
.checkout-cart-index .cart-empty .empty-img img{width: 120px;}
.checkout-cart-index .cart-empty a{
background: #ffa800;
color: #ffffff;
padding: 8px 15px;
font-size: 12px;
text-transform: uppercase;
}
...
...
@@ -2214,3 +2264,4 @@ text-transform: none;
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