diff --git a/assets/images/login-card-bg.png b/assets/images/login-card-bg.png new file mode 100644 index 00000000..14c7cfc5 Binary files /dev/null and b/assets/images/login-card-bg.png differ diff --git a/assets/scss/bootstrap-migration/_custom.scss b/assets/scss/bootstrap-migration/_custom.scss index 9a73e2a5..3767434e 100644 --- a/assets/scss/bootstrap-migration/_custom.scss +++ b/assets/scss/bootstrap-migration/_custom.scss @@ -1,7 +1,21 @@ -@import "custom/backgrounds"; -@import "custom/popover"; -@import "custom/navbar"; -@import "custom/sizing"; -@import "custom/buttons"; -@import "custom/type"; -@import "custom/modals"; +@import 'custom/backgrounds'; +@import 'custom/popover'; +@import 'custom/navbar'; +@import 'custom/sizing'; +@import 'custom/buttons'; +@import 'custom/type'; +@import 'custom/modals'; +@import 'custom/lists'; + +.add-cart-item-total { + height: 40px; +} + +.login-card { + background: center / cover no-repeat url('../../images/login-card-bg.png'); + .login-card-title { + text-shadow: 1px 1px 0px $dark; + text-transform: none; + font-size: 1.75rem; + } +} diff --git a/assets/scss/bootstrap-migration/_maps.scss b/assets/scss/bootstrap-migration/_maps.scss index 8ac30472..384d438c 100644 --- a/assets/scss/bootstrap-migration/_maps.scss +++ b/assets/scss/bootstrap-migration/_maps.scss @@ -6,7 +6,8 @@ $theme-colors: map-merge( 'gray-600': $gray-600, 'gray-300': $gray-300, 'gray-200': $gray-200, - 'gray-modal': $gray-modal-bg + 'gray-modal': $gray-modal-bg, + 'white': $white ) ); diff --git a/assets/scss/bootstrap-migration/custom/_lists.scss b/assets/scss/bootstrap-migration/custom/_lists.scss new file mode 100644 index 00000000..7f4ced45 --- /dev/null +++ b/assets/scss/bootstrap-migration/custom/_lists.scss @@ -0,0 +1,8 @@ +.dashed-list { + list-style-type: none; + li:before { + content: '\2014'; + position: absolute; + margin-left: -1.25rem; + } +} diff --git a/assets/scss/bootstrap-migration/custom/_type.scss b/assets/scss/bootstrap-migration/custom/_type.scss index 0cdc5d36..070bbf26 100644 --- a/assets/scss/bootstrap-migration/custom/_type.scss +++ b/assets/scss/bootstrap-migration/custom/_type.scss @@ -1,5 +1 @@ @include text-emphasis-variant('.text-dark-green', $dark-green); - -.add-cart-item-total { - height: 40px; -} diff --git a/locales/en.default.json b/locales/en.default.json index 02463226..bf2cf8a1 100644 --- a/locales/en.default.json +++ b/locales/en.default.json @@ -475,6 +475,7 @@ "forgot_password": "Forgot your password?", "reset_password_success": "We've sent you an email with a link to update your password.", "sign_in": "Sign In", + "continue": "Continue", "or": "or", "cancel": "Return to Store", "guest_title": "Continue as a guest", diff --git a/snippets/bootstrap-migration/customers/login-form.liquid b/snippets/bootstrap-migration/customers/login-form.liquid index 789fa062..e064294e 100644 --- a/snippets/bootstrap-migration/customers/login-form.liquid +++ b/snippets/bootstrap-migration/customers/login-form.liquid @@ -26,8 +26,11 @@
{% else %} -
- +
+ {% include 'bootstrap-migration/customers/forgot-links' %} +
+
+ {% endif %} {% if template != 'customers/login' %} @@ -39,11 +42,6 @@
{% endif %}
- {% if template == 'customers/login' %} -
- {% include 'bootstrap-migration/customers/forgot-links' %} -
- {% endif %} {{ antiforgery }} diff --git a/snippets/bootstrap-migration/customers/sign-in-content.liquid b/snippets/bootstrap-migration/customers/sign-in-content.liquid new file mode 100644 index 00000000..34979e3d --- /dev/null +++ b/snippets/bootstrap-migration/customers/sign-in-content.liquid @@ -0,0 +1,17 @@ +
+ {% capture loginUrl %} {{ requestUrl }} {% endcapture %} + {% include 'bootstrap-migration/customers/login-form' %} +
+ diff --git a/snippets/bootstrap-migration/form-errors-custom.liquid b/snippets/bootstrap-migration/form-errors-custom.liquid index 0d8f5cda..5a540ae4 100644 --- a/snippets/bootstrap-migration/form-errors-custom.liquid +++ b/snippets/bootstrap-migration/form-errors-custom.liquid @@ -1,7 +1,10 @@ {% unless form.errors.empty? %} -
-

{{ 'general.forms.post_error' | t }}

-
    +
    + + + + +
      {% assign message = 'contact.form.message' | t %} {% for field in form.errors %} {% if field == 'form' %} diff --git a/templates/customers/login.liquid b/templates/customers/login.liquid index 598b2296..6db37c7b 100644 --- a/templates/customers/login.liquid +++ b/templates/customers/login.liquid @@ -1,28 +1,14 @@ {% layout 'bootstrap_migration' %} -
      -
      -
      +
      +
      +

      {{ 'customer.sign_in.title' | t }}

      - {% capture loginUrl %} {{ requestUrl }} {% endcapture %} - {% include 'bootstrap-migration/customers/login-form' %} -
      -
      -

      {{ 'customer.sign_in.registration_title' | t: shop.name }}

      -

      - {{ 'customer.sign_in.registration_advantages_title' | t: shop.name }} -

        - {% assign advantages_size = 'customer.sign_in.registration_advantages' | t | size | minus: 2 %} - {% assign registration_advantage = 'customer.sign_in.registration_advantages' | t | slice: 1, advantages_size %} - {% assign advantages = registration_advantage | split: ',' %} - {% for phrase in advantages %} - {% assign phrase_size = phrase | strip | size | minus: 2 %} -
      • {{ phrase | strip | slice: 1, phrase_size }}
      • - {% endfor %} -
      -

      -
      - {{ 'layout.customer.register' | t | customer_register_link | replace: 'a href', 'a class="btn btn-primary w-25" href' }} +
      + {% include 'bootstrap-migration/customers/sign-in-content' %} +
      +
      + {% include 'bootstrap-migration/customers/sign-in-content' %}