From 0570c885ccbbb91cbd8ca858420a9cd45a0e4728 Mon Sep 17 00:00:00 2001 From: HauNg Date: Wed, 9 Dec 2020 07:28:26 +0700 Subject: [PATCH] update menu component --- apollo/queries/Menus.gql | 2 +- assets/css/main.css | 2 + assets/scss/pages/checkout.scss | 2 +- components/Menu/MenuNavItem.vue | 4 +- pages/cart.vue | 47 +++++----- pages/checkout.vue | 18 ++-- pages/login.vue | 6 +- pages/my-account.vue | 144 +------------------------------ pages/product-category/index.vue | 6 +- pages/shop.vue | 26 +----- 10 files changed, 52 insertions(+), 205 deletions(-) diff --git a/apollo/queries/Menus.gql b/apollo/queries/Menus.gql index 79903d1..e2aedf2 100644 --- a/apollo/queries/Menus.gql +++ b/apollo/queries/Menus.gql @@ -10,13 +10,13 @@ query GET_MENU($id: ID!) { key: id databaseId title - url cssClasses description label linkRelationship target parentId + path } } } diff --git a/assets/css/main.css b/assets/css/main.css index 06a057f..3c6212d 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -231,6 +231,7 @@ input[type='text']:-ms-clear { .shadow { position: relative; + z-index: 1; } .shadow:before { @@ -248,6 +249,7 @@ input[type='text']:-ms-clear { -webkit-transition: background-color cubic-bezier(0.25, 0.46, 0.45, 0.94) 0.2s !important; -o-transition: background-color cubic-bezier(0.25, 0.46, 0.45, 0.94) 0.2s !important; transition: background-color cubic-bezier(0.25, 0.46, 0.45, 0.94) 0.2s !important; + z-index: -1; } .shadow > * { diff --git a/assets/scss/pages/checkout.scss b/assets/scss/pages/checkout.scss index 1cd0b9a..9951771 100644 --- a/assets/scss/pages/checkout.scss +++ b/assets/scss/pages/checkout.scss @@ -25,7 +25,7 @@ button { margin: 0; color: #222326; - background-color: transparent; + background-color: #fff; font-size: 1rem; line-height: 1.5; } diff --git a/components/Menu/MenuNavItem.vue b/components/Menu/MenuNavItem.vue index 6fe2309..69b0792 100644 --- a/components/Menu/MenuNavItem.vue +++ b/components/Menu/MenuNavItem.vue @@ -1,12 +1,12 @@