diff --git a/falcon/_dev/css/custom.scss b/falcon/_dev/css/custom.scss index 31cb19a..91e3f6c 100644 --- a/falcon/_dev/css/custom.scss +++ b/falcon/_dev/css/custom.scss @@ -6,6 +6,7 @@ // Components: parts of the theme itself that are not associated with a module. //@import "custom/components/"; +@import "custom/components/forms"; // Modules: Styling for specific modules. //@import "custom/modules/"; @@ -13,6 +14,7 @@ //Layouts: Parts of a page, such as the header, footer, etc. //@import "custom/layout/header"; //@import "custom/layout/footer"; +@import "custom/layout/left-column"; // Pages //@import "custom/pages/category"; diff --git a/falcon/_dev/css/custom/components/_forms.scss b/falcon/_dev/css/custom/components/_forms.scss new file mode 100644 index 0000000..8a28ebf --- /dev/null +++ b/falcon/_dev/css/custom/components/_forms.scss @@ -0,0 +1,12 @@ +.field-password-policy .input-group.js-parent-focus { + > * { + max-height: rem-calc(39px); + } + .form-control { + height: unset; + } + .input-group-append .btn { + border-top-right-radius: $border-radius !important; + border-bottom-right-radius: $border-radius !important; + } +} diff --git a/falcon/_dev/css/custom/layout/_left-column.scss b/falcon/_dev/css/custom/layout/_left-column.scss new file mode 100644 index 0000000..7b0a6ae --- /dev/null +++ b/falcon/_dev/css/custom/layout/_left-column.scss @@ -0,0 +1,10 @@ +#left-column { + .list-group-item, + .list-group-item-action-dropdown-link, + label { + font-family: $font-family-base; + font-size: $font-size-base; + color: $secondary; + font-weight: 400; + } +} diff --git a/falcon/_dev/css/theme/components/customer/_customer-links.scss b/falcon/_dev/css/theme/components/customer/_customer-links.scss index b7a6a51..0ab51e0 100644 --- a/falcon/_dev/css/theme/components/customer/_customer-links.scss +++ b/falcon/_dev/css/theme/components/customer/_customer-links.scss @@ -1,83 +1,80 @@ @use "sass:map"; .customer-links { - margin: 0 0 map.get($spacers, 3); - @include media-breakpoint-up(lg) { - margin: 0; - } - - .link-item { - display: flex; - align-items: center; - } - - &__list { - @include media-breakpoint-down(md) { - display: flex; - flex-wrap: nowrap; - - margin: rem-calc(20px) 0 0; - overflow-x: scroll; - overflow-y: hidden; - white-space: nowrap; - -webkit-overflow-scrolling: touch; - -ms-overflow-style: -ms-autohiding-scrollbar; - - &::-webkit-scrollbar { - display: none; - } - } - } - - a { - display: block; - flex: 0 0; - max-width: inherit; - padding: map.get($spacers, 2); - font-weight: 700; - color: $gray-800; - white-space: nowrap; - border-radius: $border-radius; - @include font-size($font-size-base); - + margin: 0 0 map.get($spacers, 3); @include media-breakpoint-up(lg) { - white-space: normal; + margin: 0; } - @include hover-focus() { - color: $primary; - text-decoration: none; + .link-item { + display: flex; + align-items: center; } - i { - margin-right: map.get($spacers, 1); - color: $primary; - @include font-size(26px); - @include media-breakpoint-up(md) { - margin-right: map.get($spacers, 2); - } + &__list { + @include media-breakpoint-down(md) { + display: flex; + flex-wrap: nowrap; + + margin: rem-calc(20px) 0 0; + overflow-x: scroll; + overflow-y: hidden; + white-space: nowrap; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; + + &::-webkit-scrollbar { + display: none; + } + } } - &.active { - color: #fff; - background: $primary; - - &::after { + a { display: block; - } + flex: 0 0; + max-width: inherit; + padding: map.get($spacers, 2); + font-weight: 700; + white-space: nowrap; + border-radius: $border-radius; + @include font-size($font-size-base); - i { - color: inherit; - } + @include media-breakpoint-up(lg) { + white-space: normal; + } + + @include hover-focus() { + text-decoration: none; + } + + i { + margin-right: map.get($spacers, 1); + @include font-size(26px); + @include media-breakpoint-up(md) { + margin-right: map.get($spacers, 2); + } + } + + &.active { + color: #fff; + background: $primary; + + &::after { + display: block; + } + + i { + color: inherit; + } + } } - } - &__logout { - text-align: center; + &__logout { + text-align: center; - &::after, - &::before { - display: none; + &::after, + &::before { + display: none; + } } - } } diff --git a/falcon/_dev/img/chevron_down.svg b/falcon/_dev/img/chevron_down.svg index 9af8f01..64b5016 100644 --- a/falcon/_dev/img/chevron_down.svg +++ b/falcon/_dev/img/chevron_down.svg @@ -1,3 +1,3 @@ - - + + diff --git a/falcon/_dev/img/chevron_right.svg b/falcon/_dev/img/chevron_right.svg index 9c43f23..409f028 100644 --- a/falcon/_dev/img/chevron_right.svg +++ b/falcon/_dev/img/chevron_right.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/falcon/_dev/img/hamburger-menu.svg b/falcon/_dev/img/hamburger-menu.svg new file mode 100644 index 0000000..603e8b9 --- /dev/null +++ b/falcon/_dev/img/hamburger-menu.svg @@ -0,0 +1,3 @@ + + + diff --git a/falcon/templates/customer/history.tpl b/falcon/templates/customer/history.tpl index 8ec152a..b583626 100644 --- a/falcon/templates/customer/history.tpl +++ b/falcon/templates/customer/history.tpl @@ -29,7 +29,11 @@ {/block} {block name='page_content'} -
{l s='Here are the orders you\'ve placed since your account was created.' d='Shop.Theme.Customeraccount'}
+

+ + {l s='Here are the orders you\'ve placed since your account was created.' d='Shop.Theme.Customeraccount'} + +

{if $orders} @@ -40,7 +44,7 @@ - + @@ -66,16 +70,14 @@ {$order.history.current.ostate_name} -
{l s='Total price' d='Shop.Theme.Checkout'} {l s='Payment' d='Shop.Theme.Checkout'} {l s='Status' d='Shop.Theme.Checkout'} {l s='Actions' d='Shop.Theme.Checkout'}
+ {l s='Details' d='Shop.Theme.Customeraccount'} {if $order.details.reorder_url} -
- + {l s='Reorder' d='Shop.Theme.Actions'} -
{/if}