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
04ded970
Commit
04ded970
authored
May 04, 2023
by
halweg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
38cb9110
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
25 deletions
+29
-25
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/free_shipping.phtml
+13
-11
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
+12
-7
app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js
+2
-2
app/design/frontend/Joshine/breeze/web/css/_custom.less
+2
-5
No files found.
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/free_shipping.phtml
View file @
04ded970
...
...
@@ -6,7 +6,7 @@
?>
<div
class=
"product-intro__freeshipping product-intro__bg-none"
>
<div
class=
"product-intro__freeshipping-abt action"
data-trigger=
"trigger-shipping"
>
<div
class=
"product-intro__freeshipping-icon shipping "
><i
class=
"svgicon svgicon-gd-shipping"
></i>
<p>
Fast Delivery
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
</div>
<div
class=
"product-intro__freeshipping-icon shipping
joshine-clearfix
"
><i
class=
"svgicon svgicon-gd-shipping"
></i>
<p>
Fast Delivery
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
</div>
<div
class=
"free-wrapper"
>
<p>
Estimated to be delivered on
<span
id=
"deliveredTime"
>
11/25/2021 - 12/03/2021
</span>
.
</p>
</div></div>
<div
data-bind=
"mageInit: {
...
...
@@ -130,7 +130,7 @@
</div>
</div>
<div
class=
"product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action"
data-trigger=
"trigger2"
>
<div
class=
"product-intro__freeshipping-icon"
>
<div
class=
"product-intro__freeshipping-icon
joshine-clearfix
"
>
<i
class=
"svgicon svgicon-gd-freereturn"
></i><p>
Free Return
&
Exchange
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
</div>
<div
class=
"product-intro__freeshipping-desc"
>
Learn More
</div>
...
...
@@ -199,6 +199,13 @@
</script>
<style>
.product-intro__freeshipping-icon
{
display
:
flex
;
flex-wrap
:
nowrap
;
align-items
:
center
;
}
.product-intro__freeshipping-icon
.svgicon
{
width
:
15px
;
height
:
15px
;
...
...
@@ -220,21 +227,16 @@
}
.free-wrapper
p
{
padding-left
:
40px
;
}
.product-intro__freeshipping-desc
{
padding-left
:
40px
;
}
.product-intro__freeshipping-icon.shipping
p
,
.product-intro__freeshipping-icon
p
{
display
:
inline-block
;
line-height
:
15px
;
padding
:
0
10px
;
float
:
left
;
padding-left
:
15px
;
}
.product-intro__freeshipping-desc
{
padding-left
:
40px
;
font-size
:
.8rem
!important
;
}
.product-intro__freeshipping-icon.shipping
p
,
.product-intro__freeshipping-icon
p
{
display
:
inline-block
;
line-height
:
.9rem
;
padding
:
0
10px
;
float
:
left
;
padding-left
:
15px
;
}
...
...
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
View file @
04ded970
...
...
@@ -60,7 +60,7 @@
<div
style=
"width: 100%"
class=
"product-view-freeshipping"
>
<div
class=
"product-intro__freeshipping product-intro__bg-none"
>
<div
class=
"product-intro__freeshipping-abt action"
id=
"freeshipping-button"
>
<div
class=
"product-intro__freeshipping-icon shipping
"
><i
class=
"svgicon svgicon-gd-shipping
"
></i>
<p>
<?=
__
(
"Fast Delivery"
);
?>
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
<div
class=
"product-intro__freeshipping-icon shipping
joshine-clearfix "
><i
class=
"svgicon svgicon-gd-shipping"
style=
"position: relative;top: 4px;
"
></i>
<p>
<?=
__
(
"Fast Delivery"
);
?>
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
</div>
<div
class=
"free-wrapper"
>
...
...
@@ -68,7 +68,7 @@
</div>
<div
class=
"product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action"
id=
"free-return-button"
>
<div
class=
"product-intro__freeshipping-icon"
>
<div
class=
"product-intro__freeshipping-icon
joshine-clearfix
"
>
<i
class=
"svgicon svgicon-gd-freereturn"
></i><p>
<?=
__
(
"Free Return & Exchange"
)
?>
:
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
</div>
<div
class=
"product-intro__freeshipping-desc"
>
<?=
__
(
"Learn More"
)
?>
</div>
...
...
@@ -91,6 +91,13 @@
});
</script>
<style>
.product-intro__freeshipping-icon
{
display
:
flex
;
flex-wrap
:
nowrap
;
align-items
:
center
;
}
.product-intro__freeshipping-icon
.svgicon
{
width
:
15px
;
height
:
15px
;
...
...
@@ -106,7 +113,6 @@
.free-wrapper
{
border-bottom
:
1px
solid
#e8e7e7
;
margin-bottom
:
10px
;
line-height
:
15px
;
padding-bottom
:
10px
;
}
.free-wrapper
>
*
{
...
...
@@ -118,6 +124,7 @@
.free-wrapper
p
{
padding-left
:
40px
;
}
.product-intro__freeshipping-desc
{
font-size
:
.8rem
!important
;
padding-left
:
40px
;
}
.product-intro__freeshipping-icon.shipping
p
,
.product-intro__freeshipping-icon
p
{
...
...
@@ -127,7 +134,7 @@
padding-left
:
15px
;
}
.product-intro__freeshipping-item
>
*
{
font-size
:
.8
rem
;
font-size
:
1
rem
;
}
.svgicon-gd-more-grey
{
...
...
@@ -173,8 +180,7 @@
.joshine-desction
.desction-left
{
width
:
90%
;
flot
:
left
;
font-weight
:
600
;
color
:
#000
;
font-size
:
1rem
;
}
.joshine-desction
.desction-right
{
width
:
10%
;
...
...
@@ -182,7 +188,6 @@
text-align
:
end
;
font-size
:
larger
;
color
:
#000
;
font-weight
:
600
;
}
.joshine-desction
.desction-info
{
font-size
:
small
;
...
...
app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js
View file @
04ded970
...
...
@@ -451,8 +451,8 @@ define([
if
(
item
.
id
==
137
)
{
// Create new control
var
sizeContent
=
'<div class="swatch-attribute-selected-option-size-content" style="display:block;">'
+
'<div
style="color:#999999;"
>'
+
$
.
mage
.
__
(
"Product Size Describe"
)
+
'</div>'
+
'<span
style="color:#0a0a0a;"
class="'
+
classes
.
attributeSelectedOptionLabelClass
+
'">'
+
item
.
options
[
0
].
label
+
'</span></div>'
;
'<div>'
+
$
.
mage
.
__
(
"Product Size Describe"
)
+
'</div>'
+
'<span class="'
+
classes
.
attributeSelectedOptionLabelClass
+
'">'
+
item
.
options
[
0
].
label
+
'</span></div>'
;
container
.
append
(
'<div class="'
+
classes
.
attributeClass
+
' '
+
item
.
code
+
'" '
+
...
...
app/design/frontend/Joshine/breeze/web/css/_custom.less
View file @
04ded970
...
...
@@ -2463,8 +2463,7 @@ button.action.submit.primary {
}
.swatch-attribute.size .swatch-attribute-selected-option{
font-size: 12px;
color: rgba(23, 23, 23, 0.6) !important;
font-size: .8rem;
}
.swatch-attribute-selected-option-size-content{
...
...
@@ -2478,9 +2477,7 @@ button.action.submit.primary {
.swatch-attribute-selected-option-size-content span.swatch-attribute-selected-option{
margin-left: 0!important;
line-height:0.53333rem;
font-size: 12px;
text-transform:capitalize;
color: #0a0a0a;
}
}
...
...
@@ -3020,7 +3017,7 @@ tr.grand.totals {
}
.flash-sale-info .product-name{
font-size: 1
2
px;
font-size: 1
4
px;
}
.flash-sale-info .price{
font-size: 16px;
...
...
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