diff --git a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php index 76536e397..cac7c8034 100644 --- a/packages/Webkul/Core/src/Eloquent/TranslatableModel.php +++ b/packages/Webkul/Core/src/Eloquent/TranslatableModel.php @@ -24,7 +24,7 @@ class TranslatableModel extends Model } elseif(Locale::where('code', '=', $key)->first()) { return true; } - + return false; } @@ -52,12 +52,4 @@ class TranslatableModel extends Model { return false; } - - /** - * @return string - */ - protected function getLocaleSeparator() - { - return config('translatable.locale_separator', '%'); - } -} \ No newline at end of file +} diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-dropdown-left.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-dropdown-left.svg new file mode 100644 index 000000000..ddc827bf8 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/icon-dropdown-left.svg @@ -0,0 +1,10 @@ + + + + icon-dropdown-left + Created with Sketch. + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-close.svg b/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-close.svg new file mode 100644 index 000000000..014866710 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/icon-menu-close.svg @@ -0,0 +1,13 @@ + + + + icon-menu-close + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg b/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg index dc2f60ebd..042f15182 100644 --- a/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg +++ b/packages/Webkul/Shop/src/Resources/assets/images/offer-zone.svg @@ -1,13 +1,13 @@ - + icon-offer Created with Sketch. - % + % \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue index c85c59e2b..2ffceecc3 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue @@ -1,7 +1,7 @@ - - diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 974fd6a37..8e3f9a74c 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -1,5 +1,6 @@ @import url("https://fonts.googleapis.com/css?family=Montserrat:400,500"); +@import "icons"; @import "mixins"; @import "variables"; @@ -12,7 +13,6 @@ body { } .header { - // border: 1px solid black; margin-top: 16px; margin-bottom: 21px; @@ -93,17 +93,19 @@ body { margin-right: 14px; .account-icon { - margin: 0; - padding-right: 8px; + cursor: pointer; + margin-right: 8px; height: 24px; width: 24px; } .account { + cursor: pointer; padding-top: 3px; padding-right: 5px; margin-left: 8px; } .icon.arrow-down-icon { + cursor: pointer; margin-top: 10px; } } @@ -168,29 +170,130 @@ body { font-size: 16px; display: block; - .menu-bar { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; + // .menu-bar { + // display: flex; + // flex-direction: row; + // justify-content: flex-start; + // align-items: center; + // height: 48px; + // width: 80%; + // margin-left: auto; + // margin-right: auto; + + // li { + // display: flex; + // flex-direction: row; + // align-items: center; + // justify-content: center; + // // background-color: blue; + // height: 100%; + // margin: 2.5%; + // } + // li:last-child { + // margin-left: auto; + // color: $offer-color; + // } + // } + ul.nav { + display: block; + font-size:16px; height: 48px; width: 80%; margin-left: auto; margin-right: auto; + } - li { - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - // background-color: blue; - height: 100%; - margin: 2.5%; - } - li:last-child { - margin-left: auto; - color: $offer-color; - } + .nav ul { + margin: 0; + padding:0; + border: 1px solid #B1B1B1; + box-shadow: 1px 1px 1px 0 rgba(0,0,0,0.40); + } + + .nav a { + display:block; + color: #242424; + text-decoration: none; + padding: 0.8em 0.3em 0.8em 0.5em; + text-transform: uppercase; + letter-spacing: 2px; + position: relative; + } + + .nav{ + vertical-align: top; + display: inline-block; + } + + .nav li { + position: relative; + height:45px; + } + + .nav > li { + float: left; + margin-right: 1px; + } + + .nav > li > a { + margin-bottom: 1px; + } + + .nav > li:last-child { + border-radius: 0 0 4px 0; + margin-right: 0; + } + + .nav > li:last-child > a { + border-radius: 0 4px 0 0; + } + + .nav li li a { + margin-top: 1px; + } + + .nav li a:first-child:nth-last-child(2):before { + content: ""; + position: absolute; + height: 0; + width: 0; + border: 5px solid transparent; + top: 50% ; + right:5px; + } + + /* submenu positioning*/ + + .nav ul { + position: absolute; + white-space: nowrap; + border: 1px solid #B1B1B1; + background-color:white; + z-index: 1; + left: -99999em; + } + + .nav > li:hover > ul { + left: auto; + min-width: 100%; + } + + .nav > li li:hover > ul { + left: 100%; + margin-left: 1px; + top: -1px; + } + + .nav > li:hover > a:first-child:nth-last-child(2):before { + margin-top:-5px + } + + .nav li li > a:first-child:nth-last-child(2):before { + margin-top: -5px + } + + .nav li li:hover > a:first-child:nth-last-child(2):before { + right: 10px; } } } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss new file mode 100644 index 000000000..f59e70001 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss @@ -0,0 +1,11 @@ +.icon { + display: inline-block; + background-size: cover; +} +.dropdown-right-icon{ + background-image:URL('../images/icon-dropdown-left.svg'); + width: 8px; + height: 8px; + margin-left:auto; + margin-bottom: 2px; +} diff --git a/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php index 76a859585..5742cf08c 100644 --- a/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php @@ -2,9 +2,6 @@
    +
  • +
+
+