-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #568 from mailchimp/Issue565-2.3
Issue565 2.3
- Loading branch information
Showing
14 changed files
with
22 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,7 @@ | |
<h4> | ||
<img width="224px" style="padding-left: 15px;" height="60px" src="https://ebizmarts-website.s3.amazonaws.com/Logo_Ebizmarts.png"/><br><br> | ||
<div style="padding-left: 15px;"> | ||
<p> <strong style="color:#EA7601;"><?php echo __('MailChimp v') ?><?php echo $this->getModuleVersion() ?><?php echo __(' by') ?></strong> <a target="_blank" href="http://ebizmarts.com"><strong>ebizmarts</strong></a></p> | ||
<p> <strong style="color:#EA7601;"><?php echo __('Mailchimp v') ?><?php echo $this->getModuleVersion() ?><?php echo __(' by') ?></strong> <a target="_blank" href="http://ebizmarts.com"><strong>ebizmarts</strong></a></p> | ||
<p><?php echo __('Need help? See our ') ?><a href="http://wiki.ebizmarts.com/installation" target="_blank"><?php echo __('Wiki') ?></a><?php echo __(' or browse our ') ?><a href="http://ebizmarts.com/forums" target="_blank"><?php echo __('support forums') ?></a><?php echo __(' Got feedback? ') ?><a href="mailto:[email protected]?Subject=MailChimp For Magento Version <?php echo $this->getModuleVersion()?>"><?php echo __('Email us') ?></a></p> | ||
<p><?php echo __('You can find more extension in our ') ?><a href="http://store.ebizmarts.com" target="_blank"><?php echo __('Store') ?></a></p> | ||
</div> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,17 @@ | ||
@font-face { | ||
font-family: 'mailchimp'; | ||
src: url('../fonts/mailchimp.eot?75w84o'); | ||
src: url('../fonts/mailchimp.eot?75w84o#iefix') format('embedded-opentype'), | ||
url('../fonts/mailchimp.ttf?75w84o') format('truetype'), | ||
url('../fonts/mailchimp.woff?75w84o') format('woff'), | ||
url('../fonts/mailchimp.svg?75w84o#mailchimp') format('svg'); | ||
src: url('../fonts/mailchimp.eot?3g8ubh'); | ||
src: url('../fonts/mailchimp.eot?3g8ubh#iefix') format('embedded-opentype'), | ||
url('../fonts/mailchimp.ttf?3g8ubh') format('truetype'), | ||
url('../fonts/mailchimp.woff?3g8ubh') format('woff'), | ||
url('../fonts/mailchimp.svg?3g8ubh#mailchimp') format('svg'); | ||
font-weight: normal; | ||
font-style: normal; | ||
} | ||
font-style: normal;} | ||
.admin__menu .item-mailchimp-menu.parent.level-0 > a:before { | ||
font-family: 'mailchimp'; | ||
content: "\e990" | ||
content: "\e991" | ||
} | ||
|
||
.admin__data-grid-wrap .data-grid .data-grid-draggable .data-row .data-grid-thumbnail-cell .admin__control-thumbnail > img:before { | ||
border:none; | ||
} | ||
} |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.