Skip to content

Commit

Permalink
Merge pull request #3069 from patzick/bugfix/#3056-remove-back-icon-o…
Browse files Browse the repository at this point in the history
…n-product-page

Bugfix/#3056 remove back icon on product page
  • Loading branch information
patzick committed Jun 18, 2019
2 parents b68d310 + 9fdb262 commit c2d35e9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Improve performace with preventing render 404 page on the server side if some of static content is missed, simple 404 response uses instead - [PHOENIX MEDIA](https://www.phoenix-media.eu/) - Yuri Boyko @yuriboyko, Anton Lobodenko @sniffy1988 (#3002)
- Added Products column change functionality - @vishal-7037 (#3017)
- Add support for api.url in the Task module - @basvanpoppel (#3011)
- Back icon on product page causing inconsistent behavior - @patzick (#3056)

### Fixed
- Special price got zeroed - @pkarw (#2940)
Expand Down
9 changes: 1 addition & 8 deletions src/themes/default/components/core/blocks/Header/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@
<div class="row between-xs middle-xs" v-if="!isCheckoutPage || isThankYouPage">
<div class="col-md-4 col-xs-2 middle-xs">
<div>
<template v-if="!canGoBack">
<hamburger-icon class="p15 icon bg-cl-secondary pointer" v-if="!canGoBack" />
</template>
<template v-else>
<return-icon class="p15 icon bg-cl-secondary pointer" v-if="canGoBack" />
</template>
<hamburger-icon class="p15 icon bg-cl-secondary pointer" />
</div>
</div>
<div class="col-xs-2 visible-xs">
Expand Down Expand Up @@ -73,7 +68,6 @@ import CompareIcon from 'theme/components/core/blocks/Header/CompareIcon'
import HamburgerIcon from 'theme/components/core/blocks/Header/HamburgerIcon'
import Logo from 'theme/components/core/Logo'
import MicrocartIcon from 'theme/components/core/blocks/Header/MicrocartIcon'
import ReturnIcon from 'theme/components/core/blocks/Header/ReturnIcon'
import SearchIcon from 'theme/components/core/blocks/Header/SearchIcon'
import WishlistIcon from 'theme/components/core/blocks/Header/WishlistIcon'
Expand All @@ -85,7 +79,6 @@ export default {
HamburgerIcon,
Logo,
MicrocartIcon,
ReturnIcon,
SearchIcon,
WishlistIcon
},
Expand Down

0 comments on commit c2d35e9

Please sign in to comment.