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
e481e833
Commit
e481e833
authored
Feb 11, 2023
by
wd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改顶部包邮信息,文字显示高度居中,文字大小改成PX,a标签添加大小,顶部货币定位位置复原,去除第三部分选项,默认显示在头部。轮播图默认高度去除,列表页列宽修改。
parent
62f0331a
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
35 additions
and
18 deletions
+35
-18
app/code/Joshine/Banner/view/adminhtml/layout/joshine_banner_index_index.xml
+9
-5
app/code/Joshine/Banner/view/adminhtml/ui_component/joshine_banner_index_listing.xml
+9
-1
app/code/Joshine/Banner/view/adminhtml/web/css/style.css
+9
-0
app/code/Joshine/Banner/view/frontend/templates/index.phtml
+1
-1
app/code/Sparsh/FreeShippingBar/Block/Adminhtml/Entity/Edit/Tabs.php
+1
-8
app/code/Sparsh/FreeShippingBar/Controller/Adminhtml/Entity/Save.php
+1
-0
app/code/Sparsh/FreeShippingBar/view/frontend/templates/free_shipping_bar.phtml
+4
-2
app/design/frontend/Joshine/breeze/web/css/_custom.less
+1
-1
No files found.
app/code/Joshine/Banner/view/adminhtml/layout/joshine_banner_index_index.xml
View file @
e481e833
<?xml version="1.0" ?>
<page
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation=
"urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<body>
<referenceContainer
name=
"content"
>
<uiComponent
name=
"joshine_banner_index_listing"
/>
</referenceContainer>
</body>
<head>
<css
src=
"Joshine_Banner::css/style.css"
/>
</head>
<body>
<referenceContainer
name=
"content"
>
<uiComponent
name=
"joshine_banner_index_listing"
/>
</referenceContainer>
</body>
</page>
\ No newline at end of file
app/code/Joshine/Banner/view/adminhtml/ui_component/joshine_banner_index_listing.xml
View file @
e481e833
...
...
@@ -75,12 +75,12 @@
<item
name=
"js_config"
xsi:type=
"array"
>
<item
name=
"component"
xsi:type=
"string"
>
Magento_Ui/js/grid/columns/column
</item>
</item>
<item
name=
"config"
xsi:type=
"array"
>
<item
name=
"indexField"
xsi:type=
"string"
>
id
</item>
<item
name=
"filter"
xsi:type=
"string"
>
text
</item>
<item
name=
"sorting"
xsi:type=
"string"
>
desc
</item>
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
ID
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col2
</item>
</item>
</argument>
</column>
...
...
@@ -90,6 +90,7 @@
<item
name=
"config"
xsi:type=
"array"
>
<item
name=
"filter"
xsi:type=
"string"
>
text
</item>
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
Title
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col2
</item>
</item>
</argument>
</column>
...
...
@@ -102,6 +103,7 @@
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
Description
</item>
<item
name=
"resizeEnabled"
xsi:type=
"boolean"
>
true
</item>
<item
name=
"resizeDefaultWidth"
xsi:type=
"string"
>
60
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col3
</item>
</item>
</argument>
</column>
...
...
@@ -113,6 +115,7 @@
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
Url
</item>
<item
name=
"resizeEnabled"
xsi:type=
"boolean"
>
true
</item>
<item
name=
"resizeDefaultWidth"
xsi:type=
"string"
>
60
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col3
</item>
</item>
</argument>
</column>
...
...
@@ -122,6 +125,7 @@
<item
name=
"config"
xsi:type=
"array"
>
<item
name=
"filter"
xsi:type=
"string"
>
text
</item>
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
Sort
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col1
</item>
</item>
</argument>
</column>
...
...
@@ -131,6 +135,7 @@
<item
name=
"config"
xsi:type=
"array"
>
<item
name=
"filter"
xsi:type=
"string"
>
text
</item>
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
Status
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col1
</item>
</item>
</argument>
</column>
...
...
@@ -141,6 +146,7 @@
<item
name=
"component"
xsi:type=
"string"
>
Magento_Ui/js/grid/columns/thumbnail
</item>
<item
name=
"filter"
xsi:type=
"string"
>
text
</item>
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
Pc Image patch
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col3
</item>
</item>
</argument>
</column>
...
...
@@ -151,6 +157,7 @@
<item
name=
"component"
xsi:type=
"string"
>
Magento_Ui/js/grid/columns/thumbnail
</item>
<item
name=
"filter"
xsi:type=
"string"
>
text
</item>
<item
name=
"label"
xsi:type=
"string"
translate=
"true"
>
Phone Image patch
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col3
</item>
</item>
</argument>
</column>
...
...
@@ -162,6 +169,7 @@
<item
name=
"resizeEnabled"
xsi:type=
"boolean"
>
false
</item>
<item
name=
"resizeDefaultWidth"
xsi:type=
"string"
>
10
</item>
<item
name=
"indexField"
xsi:type=
"string"
>
id
</item>
<item
name=
"fieldClass"
xsi:type=
"string"
>
col2
</item>
</item>
</argument>
</actionsColumn>
...
...
app/code/Joshine/Banner/view/adminhtml/web/css/style.css
0 → 100644
View file @
e481e833
.col1
{
width
:
5%
;
}
.col2
{
width
:
10%
;
}
.col3
{
width
:
15%
;
}
app/code/Joshine/Banner/view/frontend/templates/index.phtml
View file @
e481e833
...
...
@@ -3,7 +3,7 @@
$collection
=
$block
->
getCollection
();
?>
<div
class=
"banner1"
style=
"background-color: #f0f0f0;
height: 10px;
"
></div>
<div
class=
"banner1"
style=
"background-color: #f0f0f0;"
></div>
<?php
foreach
(
$collection
->
getItems
()
as
$item
)
:?>
<?
php
echo
$item
->
getData
(
'name'
);
?>
...
...
app/code/Sparsh/FreeShippingBar/Block/Adminhtml/Entity/Edit/Tabs.php
View file @
e481e833
...
...
@@ -44,14 +44,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
'content'
=>
$this
->
getChildHtml
(
'what_to_display'
)
]
);
$this
->
addTab
(
'where_to_display'
,
[
'label'
=>
__
(
'Where to Display'
),
'title'
=>
__
(
'Where to Display'
),
'content'
=>
$this
->
getChildHtml
(
'where_to_display'
)
]
);
return
parent
::
_beforeToHtml
();
}
...
...
app/code/Sparsh/FreeShippingBar/Controller/Adminhtml/Entity/Save.php
View file @
e481e833
...
...
@@ -109,6 +109,7 @@ class Save extends \Sparsh\FreeShippingBar\Controller\Adminhtml\Entity implement
//no delete and no upload new img
unset
(
$data
[
'background_img_phone'
]);
}
$data
[
'bar_layout_position'
]
=
'page_top'
;
$model
->
setData
(
$data
);
$model
->
save
();
...
...
app/code/Sparsh/FreeShippingBar/view/frontend/templates/free_shipping_bar.phtml
View file @
e481e833
...
...
@@ -29,6 +29,7 @@ endif;
width
:
100%
;
height
:
60px
;
background-image
:
url
(
"
<?=
$block
->
getImgUrl
(
$barData
[
'background_img'
])
?>
");
line-height: 60px;
}
@media (max-width: 768px) {
...
...
@@ -36,15 +37,16 @@ endif;
background-image: url("
<?=
$block
->
getImgUrl
(
$barData
[
'background_img_phone'
])
?>
"
);
width
:
100%
;
height
:
40px
;
line-height
:
40px
;
}
}
</style>
<div
class=
"sparsh-free-shipping-bar-goal-message"
style=
" background-size: 100%;
line-height: initial; text-align: center; background-color:
<?=
/* @noEscape */
$barData
[
'bar_background_color'
]
?>
; font-size:
<?=
/* @noEscape */
$barData
[
'bar_font_size'
]
.
'em
'
?>
"
>
style=
" background-size: 100%;
text-align: center; background-color:
<?=
/* @noEscape */
$barData
[
'bar_background_color'
]
?>
; font-size:
<?=
/* @noEscape */
$barData
[
'bar_font_size'
]
.
'px
'
?>
"
>
<a
<?=
/* @noEscape */
$barData
[
'is_clickable'
]
?
'href='
.
$barData
[
'bar_link_url'
]
:
null
?>
<?=
/* @noEscape */
$barData
[
'is_clickable'
]
?
(
$barData
[
'is_link_open_in_new_page'
]
?
'target=_blank'
:
'target=_self'
)
:
null
?>
style=
"color:
<?=
/* @noEscape */
$barData
[
'bar_text_color'
]
?>
"
>
style=
"
width: 100%;height: 100%; display: block;
color:
<?=
/* @noEscape */
$barData
[
'bar_text_color'
]
?>
"
>
<div
data-bind=
"scope: 'free-shipping-scope'"
>
<p
data-bind=
"html: goalMessage"
></p>
</div>
...
...
app/design/frontend/Joshine/breeze/web/css/_custom.less
View file @
e481e833
...
...
@@ -992,7 +992,7 @@ footer{
@media(min-width: 640px){
.switcher.currency{
position: absolute;
top:
5
0px;
top:
3
0px;
right: 145px;
z-index: 1;
font-size: 13px;
...
...
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