diff --git a/src/components/gate/GateLayout.scss b/src/components/gate/GateLayout.scss index e69d376..9f7fe62 100644 --- a/src/components/gate/GateLayout.scss +++ b/src/components/gate/GateLayout.scss @@ -1,6 +1,6 @@ .gatelayout-background-image { background-size: cover; - background-image: url("../../assets/Crane_Log_In_Page.jpg"); + background-image: url("@/assets/Crane_Log_In_Page.jpg"); background-repeat: no-repeat; height: 100%; -webkit-background-size: cover; diff --git a/src/components/gate/GateLayout.vue b/src/components/gate/GateLayout.vue index e725967..195be03 100644 --- a/src/components/gate/GateLayout.vue +++ b/src/components/gate/GateLayout.vue @@ -16,7 +16,7 @@ > mdi-close
@@ -27,12 +27,12 @@ single-line type="text" color="white" - class="mobile-header-search-field white--text background-transparent" + class="mobile-header-search-field text-white background-transparent" @blur="showSearchInput = false" v-on:keyup.enter="GotoPage" >
@@ -50,14 +50,14 @@ My Account @@ -65,7 +65,7 @@ Logout @@ -73,7 +73,7 @@ Sign-In @@ -87,9 +87,9 @@ @action="onAction" @actionScroll="onActionScroll" /> - - - + + + diff --git a/src/components/gate/SignInComponent.vue b/src/components/gate/SignInComponent.vue index effa62c..17bec44 100644 --- a/src/components/gate/SignInComponent.vue +++ b/src/components/gate/SignInComponent.vue @@ -7,40 +7,42 @@ {{errorMessage}} {{signInMessage}} - + - -
- + Login + > Login
- + + mdi-account-circle-outline - mdi-account-circle-outline @@ -86,7 +77,7 @@ mdi-magnify - mdi-magnify @@ -112,43 +103,7 @@ :width="searchInputWidth" height="56" > - + - + mdi-cart-outline - mdi-cart-outline @@ -222,7 +169,7 @@ - + - +
@@ -571,43 +410,7 @@ :width="searchInputWidth" height="56" > - + @@ -650,6 +453,8 @@ import { goToCategoryPageRouting, } from "@/services/util.service"; import humps from "lodash-humps"; +import craneLogoBlue from "@/assets/Crane_Logo_blue.png"; +import craneLogoWhite from "@/assets/Crane_Logo_white.png"; export default { name: "Header", components: { @@ -660,6 +465,8 @@ export default { }, props: ["offsetTop", "heroData"], data: () => ({ + craneLogoBlue: craneLogoBlue, + craneLogoWhite: craneLogoWhite, blockId: "30", heroBanner: true, //subMenu: "", @@ -771,12 +578,12 @@ export default { let pagePath = this.$route.path; let isGateModulePage = pagePath.includes("/gate/"); if (isGateModulePage) { - return "white--text"; + return "text-white"; } if (!this.heroData) return "content-color"; if (this.offsetTop > 30) return "content-color"; - else return "white--text"; + else return "text-white"; }, userAuth: function () { return this.$store.state.auth.userAuth; diff --git a/yarn.lock b/yarn.lock index 12e6bb7..a6fcecf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2110,7 +2110,7 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.47.tgz#e597ef75086c6e896ff5478a6bfc0a7aa4bbd14c" integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ== -"@vuetify/loader-shared@^1.4.0", "@vuetify/loader-shared@^1.7.1": +"@vuetify/loader-shared@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@vuetify/loader-shared/-/loader-shared-1.7.1.tgz#0f63a3d41b6df29a2db1ff438aa1819b237c37a3" integrity sha512-kLUvuAed6RCvkeeTNJzuy14pqnkur8lTuner7v7pNE/kVhPR97TuyXwBSBMR1cJeiLiOfu6SF5XlCYbXByEx1g== @@ -2118,14 +2118,6 @@ find-cache-dir "^3.3.2" upath "^2.0.1" -"@vuetify/vite-plugin@^1.0.0-alpha.11": - version "1.0.0-alpha.11" - resolved "https://registry.yarnpkg.com/@vuetify/vite-plugin/-/vite-plugin-1.0.0-alpha.11.tgz#43cd0fa4134da2467d7dd134b35b5d21a54ddfca" - integrity sha512-ADAEubiF+2VHbcsJs0nWCBThc4LX+mGnioYrF0O+jKTvCICT1PJKpp15+M7ZyyM9sAkEFpVH+5FaH5/Ywj7RWg== - dependencies: - "@vuetify/loader-shared" "^1.4.0" - debug "^4.3.3" - acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -3717,10 +3709,10 @@ vuetify-loader@^1.9.2: file-loader "^6.2.0" loader-utils "^2.0.0" -vuetify@^3.0.0-beta.11: - version "3.1.14" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.1.14.tgz#6dac29bb54ce6eee97ff8df54dab431305aa38d4" - integrity sha512-KpJH7CDyDwLjfLUkKgmijZ7WMBscuGTGKeO5pomerEWQiZ9X9bjHJTXdycqFX60QSl3AkrJeSIWW/l8nkxoslw== +vuetify@^3.0.0: + version "3.1.15" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.1.15.tgz#aacee61d81dcaaeabaae44f68172de142dadd274" + integrity sha512-uxB4UCrP+hFyJaoSsVObAGBRD73qq5ga7HULepzGoMeUWap2H99mcqmMdN/a/Yp4ODK3gT8EcUeph3EgEcsArQ== vuex-map-fields@^1.3.6: version "1.4.0"