Merge pull request #1056 from dpfaffenbauer/update-ci

[2.0] Update CI

README.md

@@ -1,4 +1,6 @@
-# CoreShop 2
+![CoreShop](etc/logo.png)
+
+---
 
 **CoreShop - Pimcore eCommerce**
 

docs/themes/coreshop/less/_variables.less

@@ -11,4 +11,4 @@
 */
 
 @zindex-navbar-fixed:      1030;
-@navbar-height: 50px;
+@navbar-height: 60px;

docs/themes/coreshop/less/theme-coreshop.less

@@ -17,7 +17,7 @@
 @sidebar-hover: #c5c5cb;
 @lines: #e7e7e9;
 @dark: black;
-@light: #5cb672;
+@light: #cd1017;
 @text: #2d2d2d;
 @font-family-text: 'Roboto Condensed', sans-serif;
 

docs/themes/coreshop/templates/partials/navbar_content.php

@@ -1,6 +1,5 @@
 <a class="Brand" href="<?= $params['base_page'] . $params['index']->getUri(); ?>">
-    <img src="<?=$base_url?>themes/coreshop/img/coreshop_tag.png">
-    Core<span class="black">Shop</span>
+    <img src="<?=$base_url?>themes/coreshop/img/logo-full.svg" width="220px">
 </a>
 
 <?php if ($params['html']['search']) { ?>

src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/css/core.css

@@ -18,7 +18,7 @@
 }
 
 #pimcore_navigation li#pimcore_menu_coreshop:hover:after {
-    background-color: #5CB672;
+    background-color: #cd1017;
 }
 
 .icon-coreshop-shop:before { content: '\e800'; } /* '' */
@@ -31,7 +31,7 @@
 }
 
 .coreshop_icon_localization {
-    background: url(../img//collaboration.svg) center center no-repeat !important;
+    background: url(../img/collaboration.svg) center center no-repeat !important;
 }
 
 .coreshop_settings_inherited {

src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/helpers.js

@@ -51,7 +51,7 @@ coreshop.util.format.currency = function (currency, v) {
 coreshop.helpers.showAbout = function () {
 
     var html = '<div class="pimcore_about_window">';
-    html += '<br><img src="/bundles/coreshopcore/pimcore/img/logo.svg" style="width: 60px;"><br>';
+    html += '<br><img src="/bundles/coreshopcore/pimcore/img/logo-full.svg" style="width: 400px;"><br>';
     html += '<br><b>Version: ' + coreshop.settings.bundle.version + '</b>';
     html += '<br><br>&copy; by Dominik Pfaffenbauer, Wels, Austria (<a href="https://www.coreshop.org/" target="_blank">coreshop.org</a>)';
     html += '<br><br><a href="https://github.com/coreshop/coreshop/blob/master/LICENSE.md" target="_blank">License</a> | ';