Skip to content

Commit

Permalink
Merge pull request #295 from mageplaza/2.4-develop
Browse files Browse the repository at this point in the history
2.4 develop
  • Loading branch information
chuccv authored Oct 21, 2024
2 parents 1ddffa6 + e8d8e4c commit e59f64c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"roave/security-advisories": "dev-master"
},
"type": "magento2-module",
"version": "4.1.14",
"version": "4.1.15",
"license": "proprietary",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
</field>
<field id="custom_color" translate="label" type="text" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Custom Color</label>
<validate>jscolor {hash:true,refine:false}</validate>
<frontend_model>Mageplaza\Core\Block\Adminhtml\System\Config\ColorPicker</frontend_model>
<depends>
<field id="popup_login" separator=",">popup_login,quick_login,popup_slide</field>
<field id="style_management">custom</field>
Expand Down

0 comments on commit e59f64c

Please sign in to comment.