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
93a35d14
Commit
93a35d14
authored
Apr 27, 2023
by
dhn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minicart
parent
95c8dd80
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
139 additions
and
30 deletions
+139
-30
app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
+1
-0
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/form.phtml
+5
-4
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/minicart.phtml
+1
-0
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/content.html
+17
-11
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/item/default.html
+2
-1
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/subtotal.html
+1
-1
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/summary/cart-items.html
+1
-1
app/design/frontend/Joshine/breeze/web/css/_custom.less
+46
-10
app/design/frontend/Joshine/breeze/web/css/_theme.less
+65
-2
app/design/frontend/Joshine/breeze/web/fonts/cyrillic-ext-montserrat.woff2
+0
-0
app/design/frontend/Joshine/breeze/web/fonts/cyrillic-montserrat.woff2
+0
-0
app/design/frontend/Joshine/breeze/web/fonts/devanagari-poppins.woff2
+0
-0
app/design/frontend/Joshine/breeze/web/fonts/latin-ext-montserrat.woff2
+0
-0
app/design/frontend/Joshine/breeze/web/fonts/latin-ext-popoins.woff2
+0
-0
app/design/frontend/Joshine/breeze/web/fonts/latin-montserrat.woff2
+0
-0
app/design/frontend/Joshine/breeze/web/fonts/latin-popoins.woff2
+0
-0
app/design/frontend/Joshine/breeze/web/fonts/vietnamese-montserrat.woff2
+0
-0
No files found.
app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
View file @
93a35d14
...
...
@@ -78,6 +78,7 @@ define([
return
Component
.
extend
({
shoppingCartUrl
:
window
.
checkout
.
shoppingCartUrl
,
checkoutUrl
:
window
.
checkout
.
checkoutUrl
,
maxItemsToDisplay
:
window
.
checkout
.
maxItemsToDisplay
,
cart
:
{},
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/form.phtml
View file @
93a35d14
...
...
@@ -76,7 +76,7 @@ $mobileDetect = $objectManager->get(\Joshine\Common\Lib\MobileDetect\MobileDetec
width
:
100%
!important
;
text-align
:
center
;
font-weight
:
normal
;
font-family
:
monospace
;
font-family
:
"Montserrat"
;
font-size
:
48px
;
}
}
...
...
@@ -130,7 +130,7 @@ $mobileDetect = $objectManager->get(\Joshine\Common\Lib\MobileDetect\MobileDetec
.is_mobile
.item-info
{
display
:
table
;
font-family
:
Futura
,
sans-serif
;
font-family
:
"Poppins"
;
table-layout
:
fixed
;
margin
:
15px
0
;
width
:
100%
;
...
...
@@ -192,7 +192,8 @@ $mobileDetect = $objectManager->get(\Joshine\Common\Lib\MobileDetect\MobileDetec
}
.checkout-cart-index
.price-final_price
.price
{
font-size
:
16px
;
font-size
:
20px
;
color
:
#000000
;
}
.item-info-right
.item-price
.price-box.price-final_price
{
float
:
none
;
...
...
@@ -280,7 +281,7 @@ $mobileDetect = $objectManager->get(\Joshine\Common\Lib\MobileDetect\MobileDetec
<?php
$mergedCells
=
(
$this
->
helper
(
Magento\Tax\Helper\Data
::
class
)
->
displayCartBothPrices
()
?
2
:
1
);
?>
<?=
$block
->
getChildHtml
(
'form_before'
)
?>
<div
class=
"cart-top"
>
<h1
class=
"cart-title"
>
Sh
i
pping Cart
</h1>
<h1
class=
"cart-title"
>
Sh
o
pping Cart
</h1>
<?php
if
(
!
$is_free_shipping
)
:
?>
<div
class=
"msg-content"
>
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/minicart.phtml
View file @
93a35d14
...
...
@@ -35,6 +35,7 @@
"
triggerClass
":"
active
",
"
parentClass
":"
active
",
"
buttons
":[]}}'>
<div id="
minicart
-
content
-
wrapper
" data-bind="
scope
:
'minicart_content'
">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/content.html
View file @
93a35d14
...
...
@@ -6,15 +6,14 @@
-->
<div
class=
"block-title"
>
<strong>
<span
class=
"qty empty"
text=
"getCartParam('summary_count')"
data-bind=
"css: { empty: !!getCartParam('summary_count') == false },
attr: { title: $t('Items in Cart') }"
>
</span>
<span
class=
"trade-cart-banner--product-title--icon"
>
<svg
aria-hidden=
"true"
focusable=
"false"
role=
"presentation"
width=
"18"
height=
"13"
viewBox=
"0 0 18 13"
xmlns=
"http://www.w3.org/2000/svg"
>
<path
fill=
"currentColor"
fill-rule=
"evenodd"
d=
"M6.23 9.1L2.078 5.2 0 7.15 6.23 13 18 1.95 15.923 0z"
></path>
</svg>
</span
>
Added to your cart
</strong>
</div>
<div
class=
"block-content"
>
<button
type=
"button"
id=
"btn-minicart-close"
...
...
@@ -44,6 +43,7 @@
<div
class=
"items-total"
style=
"display: block;font-size: inherit;font-family: 'Outfit-Regular';"
>
<span
class=
"count"
if=
"maxItemsToDisplay < getCartLineItemsCount()"
text=
"maxItemsToDisplay"
></span>
<translate
args=
"'of'"
if=
"maxItemsToDisplay < getCartLineItemsCount()"
></translate>
<each
args=
"getRegion('subtotalContainer')"
render=
""
></each>
</div>
</if>
...
...
@@ -61,14 +61,20 @@
</div>
</if>
</ifnot>
<div
class=
"actions"
if=
"getCartParam('summary_count')"
>
<div
class=
"actions
mini-div
"
if=
"getCartParam('summary_count')"
>
<a
class=
"action viewcart"
data-bind=
"attr: {href: shoppingCartUrl}"
style=
"vertical-align: sub;color: #ffff;"
>
<div
class=
"secondary"
style=
"background: #ffa800;width: 100%;color: #fff;font-size: 18px;height: 35px;line-height: 35px;"
>
<span
translate=
"'View and Edit Cart'"
></span>
<div
class=
"secondary"
style=
"background-color: #FAF3FA;width: 100%;color: #7E6452;font-size: 16px;height: 40px;line-height: 40px;border: 1px solid #7E6452;"
>
<span
translate=
"'View and Edit Cart'"
></span><span>
(
<span
class=
"count"
text=
"getCartParam('summary_count')"
></span>
)
</span>
</div>
</a>
</div>
<div
class=
"actions mini-div"
if=
"getCartParam('summary_count')"
>
<a
class=
"action checkoutbtn"
data-bind=
"attr: {href: checkoutUrl}"
style=
"vertical-align: sub;color: #ffff;"
>
<div
class=
"secondary"
style=
"background-color: #7E6452;width: 100%;font-size: 16px;height: 40px;line-height: 40px;"
>
<span>
checkout
</span>
</div>
</a>
</div>
<div
id=
"minicart-widgets"
class=
"minicart-widgets"
if=
"regionHasElements('promotion')"
>
<each
args=
"getRegion('promotion')"
render=
""
></each>
</div>
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/item/default.html
View file @
93a35d14
...
...
@@ -49,7 +49,7 @@
<!-- /ko -->
<!-- /ko -->
</div>
<!--
<div class="product actions">
<div class="secondary">
<a href="#" data-bind="attr: {'data-cart-item': item_id, title: $t('Remove item')}"
...
...
@@ -58,6 +58,7 @@
</a>
</div>
</div>
-->
</div>
</div>
<div
class=
"message notice"
if=
"$data.message"
>
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/minicart/subtotal.html
View file @
93a35d14
...
...
@@ -6,7 +6,7 @@
-->
<div
class=
"subtotal"
>
<span
class=
"label"
>
<!-- ko i18n: '
T
otal' --><!-- /ko -->
<!-- ko i18n: '
Cart subt
otal' --><!-- /ko -->
</span>
:
<!-- ko foreach: elems -->
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/summary/cart-items.html
View file @
93a35d14
...
...
@@ -27,7 +27,7 @@
<div
class=
"actions-toolbar"
if=
"maxCartItemsToDisplay < getCartLineItemsCount()"
>
<div
class=
"secondary"
>
<a
class=
"action viewcart"
data-bind=
"attr: {href: cartUrl}"
>
<span
data-bind=
"i18n: 'View and Edit Cart'"
></span>
<span
data-bind=
"i18n: 'View and Edit Cart'
i18n: 'View and Edit Cart'
"
></span>
</a>
</div>
</div>
...
...
app/design/frontend/Joshine/breeze/web/css/_custom.less
View file @
93a35d14
...
...
@@ -729,7 +729,7 @@ p.shopbycate-title {
font-size: 18px;
font-weight: bold;
cursor:pointer;
color: #0000
ff
;
color: #0000
00
;
}
.checkout-cart-index #maincontent{
background-color:#FFFFFF;
...
...
@@ -2099,16 +2099,52 @@ footer{
opacity: 0;
visibility: hidden;
}
#minicart-content-wrapper .product-item-details a{
/***********************************minicart edit start*********************************************************/
.minicart-wrapper .mage-dropdown-dialog{
width:30rem;
}
.block.block-minicart{
margin:20px;
}
#minicart-content-wrapper .product-item-details a {
width: 100%;
display: inline-block;
color: #333333;
font-size: 10px;
line-height: 15px;
color: #000000;
font-size: 16px;
line-height: 1.6rem;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-word;
font-weight: 400;
}
#minicart-content-wrapper{
font-family: 'Poppins';
}
.page-header .block .block-title{
font-size: 19px;
font-family: 'Montserrat';
}
.minicart-items .product-item-photo, .minicart-items .product-image-container {
width: 100px!important;
margin-right: 15px!important;
}
#mini-cart li.product-item > div.product .product-item-details{
max-width: 260px;
}
.minicart-items-wrapper #mini-cart{
max-height: 140px;
height: 100%;
overflow: hidden;
}
.minicart-items li.product-item > div.product > :nth-child(1) {
max-width: 100%!important;
}
.mini-div a:hover{
text-decoration: none;
}
/***********************************minicart edit end*********************************************************/
@media (min-width: 992px) {
.product-item:hover .product-item-info .image0,
.product-list-item:hover .product-item-info .image0 {
...
...
@@ -2785,7 +2821,7 @@ strong.subtitle.empty{
.block-minicart .subtotal{
display: flex;
justify-content:
righ
t;
justify-content:
lef
t;
font-weight: normal;
font-size: 16px;
margin:0px;
...
...
app/design/frontend/Joshine/breeze/web/css/_theme.less
View file @
93a35d14
...
...
@@ -11,4 +11,68 @@
url('../fonts/iconfont.ttf?t=1666939843803') format('truetype');
font-weight: normal;
font-style: normal;
}
\ No newline at end of file
}
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
src: url('../fonts/devanagari-poppins.woff2') format('woff2');
unicode-range: U+0900-097F, U+1CD0-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FF;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
src: url('../fonts/latin-ext-popoins.woff2') format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
src: url('../fonts/latin-popoins.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* cyrillic-ext */
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: url('../fonts/cyrillic-ext-montserrat.woff2') format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
/* cyrillic */
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: url('../fonts/cyrillic-montserrat.woff2') format('woff2');
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* vietnamese */
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: url('../fonts/vietnamese-montserrat.woff2') format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: url('../fonts/latin-ext-montserrat.woff2') format('woff2');
unicode-range: U+0100-02AF, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: url('../fonts/latin-montserrat.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
app/design/frontend/Joshine/breeze/web/fonts/cyrillic-ext-montserrat.woff2
0 → 100644
View file @
93a35d14
File added
app/design/frontend/Joshine/breeze/web/fonts/cyrillic-montserrat.woff2
0 → 100644
View file @
93a35d14
File added
app/design/frontend/Joshine/breeze/web/fonts/devanagari-poppins.woff2
0 → 100644
View file @
93a35d14
File added
app/design/frontend/Joshine/breeze/web/fonts/latin-ext-montserrat.woff2
0 → 100644
View file @
93a35d14
File added
app/design/frontend/Joshine/breeze/web/fonts/latin-ext-popoins.woff2
0 → 100644
View file @
93a35d14
File added
app/design/frontend/Joshine/breeze/web/fonts/latin-montserrat.woff2
0 → 100644
View file @
93a35d14
File added
app/design/frontend/Joshine/breeze/web/fonts/latin-popoins.woff2
0 → 100644
View file @
93a35d14
File added
app/design/frontend/Joshine/breeze/web/fonts/vietnamese-montserrat.woff2
0 → 100644
View file @
93a35d14
File added
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