Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve back office logos #347

Merged
merged 1 commit into from
May 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin/themes/default/css/admin-theme.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/themes/default/css/admin-theme_rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/themes/default/css/schemes/admin-theme-blue.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/themes/default/css/schemes/admin-theme-contrast.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/themes/default/css/schemes/admin-theme-flex.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/themes/default/css/schemes/admin-theme-fruit.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/themes/default/css/schemes/admin-theme-prune.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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.
2 changes: 1 addition & 1 deletion admin/themes/default/sass/partials/_header.sass
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
font-size: 1.3em !important
position: relative
height: 36px
background: url('#{$img-path}/prestashop-avatar-header_shopname.png') no-repeat top left
background: url('#{$img-path}/qloapps-back-office-header.png') no-repeat top left
background-size: auto 36px
padding-left: 140px !important
@include margin(0, 5px, 0, 0)
Expand Down
4 changes: 2 additions & 2 deletions admin/themes/default/template/controllers/login/content.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div id="login-panel">
<div id="login-header">
<h1 class="text-center">
<img id="logo" src="{$img_dir}prestashop@2x.png" width="123px" alt="PrestaShop" />
<img id="logo" src="{$img_dir}qloapps@2x.png" width="123px" alt="PrestaShop" />
</h1>
<div class="text-center">{$qloapps_version}</div>
<div id="error" class="hide alert alert-danger">
Expand All @@ -49,7 +49,7 @@
<div class="alert alert-warning">{$warningSslMessage}</div>
{/if}
</div>
<div id="shop-img"><img src="{$img_dir}preston[email protected]" alt="{$shop_name}" width="136px" height="136px" /></div>
<div id="shop-img"><img src="{$img_dir}qloapps[email protected]" alt="{$shop_name}" width="136px" height="136px" /></div>
<div class="flip-container">
<div class="flipper">
<div class="front panel">
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
8 changes: 4 additions & 4 deletions js/admin/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ $(document).ready(function() {
});

//Preload images
$('<img/>')[0].src = img_dir+'preston[email protected]';
$('<img/>')[0].src = img_dir+'preston[email protected]';
$('<img/>')[0].src = img_dir+'qloapps[email protected]';
$('<img/>')[0].src = img_dir+'qloapps[email protected]';

$('button[name="submitLogin"]').on('mouseover', function() {
$('#shop-img img').attr('src', img_dir+'preston[email protected]');
$('#shop-img img').attr('src', img_dir+'qloapps[email protected]');
});

$('button[name="submitLogin"]').on('mouseout', function() {
$('#shop-img img').attr('src', img_dir+'preston[email protected]');
$('#shop-img img').attr('src', img_dir+'qloapps[email protected]');
});
});

Expand Down