diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index f73444e11..4acefdc9e 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -655,13 +655,18 @@ section.slider-block { flex-direction: row; justify-content: flex-end; align-items: center; - // cursor: pointer; .currency-switcher { float: right; border-right: 2px solid $border-color; cursor: pointer; + .dropdown-toggle { + line-height: 25px; + margin-left: 14px; + margin-right: 14px; + } + .dropdown-list { width: 100px; top: 37px; @@ -675,12 +680,20 @@ section.slider-block { ul.account-dropdown-container { float: right; border-right: 2px solid $border-color; + cursor: pointer; li.account-dropdown { display: flex; flex-direction: row; - margin-right: 14px; margin-left: 14px; + margin-right: 14px; + + .account { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + } .dropdown-list { width: 300px; diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index dc4441e94..9ed2eac23 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -7,6 +7,17 @@ return [ 'new-products' => 'New Products' ], + 'header' => [ + 'title' => 'Account', + 'dropdown-text' => 'Manage Cart, Orders & Wishlist.', + 'sign-in' => 'Sign In', + 'sign-up' => 'Sign Up', + 'profile' => 'Profile', + 'wishlist' => 'Wishlist', + 'cart' => 'Cart', + 'logout' => 'Logout' + ], + 'footer' => [ 'subscribe-newsletter' => 'Subscribe Newsletter', 'subscribe' => 'Subscribe', diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index 49799a87a..fc91e0539 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -26,9 +26,9 @@
@if (core()->getCurrentChannel()->currencies->count() > 1) -
+
- + @endif @@ -109,22 +102,18 @@