diff --git a/frontend/App.vue b/frontend/App.vue index 817a94e..08d0414 100644 --- a/frontend/App.vue +++ b/frontend/App.vue @@ -18,4 +18,5 @@ export default { @import './styles/normalize'; @import './styles/icons'; @import './styles/global'; +@import './styles/layout'; diff --git a/frontend/components/Cart.vue b/frontend/components/Cart.vue index aeaef99..553928c 100644 --- a/frontend/components/Cart.vue +++ b/frontend/components/Cart.vue @@ -207,10 +207,25 @@ table.cart-inventory { } thead tr th { - border-bottom: 2px solid rgba(255,255,255,.1); + border-bottom: 2px solid rgba(0,0,0,.1); &:not(:last-of-type) { - border-right: 2px solid rgba(255,255,255,.1); + border-right: 2px solid rgba(0,0,0,0.1); + } + } + + thead th:first-of-type { + border-top-left-radius: 6px; + } + thead th:last-of-type { + border-top-right-radius: 6px; + } + tbody tr:last-of-type { + td:first-of-type { + border-bottom-left-radius: 6px; + } + td:last-of-type { + border-bottom-right-radius: 6px; } } @@ -276,28 +291,33 @@ table.cart-inventory--mobile { table { width: 100%; - border: 1px solid rgba(255,255,255,.1); + border: 1px solid rgba(0,0,0,.1); border-radius: 6px; margin-bottom: 1.5rem; font-size: 1.2em; +// background-color: white; + color: var(--color-background); + @include mobile { font-size: 1.1em; } tr th, tr td { - border-bottom: 2px solid rgba(255,255,255,.1); + border-bottom: 2px solid rgba(0,0,0,.1); } th, td { padding: 0.75rem 1rem; + background-color: white; } th { text-align: left; vertical-align: top; } + } .page-header { diff --git a/frontend/components/Contact.vue b/frontend/components/Contact.vue new file mode 100644 index 0000000..96ea842 --- /dev/null +++ b/frontend/components/Contact.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/frontend/components/ui/Button.vue b/frontend/components/ui/Button.vue index b416794..5f85894 100644 --- a/frontend/components/ui/Button.vue +++ b/frontend/components/ui/Button.vue @@ -93,4 +93,10 @@ button { } } +button .icon { + position: relative; + top: 2.5px; + right: -8px; +} + diff --git a/frontend/components/ui/cart.vue b/frontend/components/ui/cart.vue index 4f62a0f..90ec0d8 100644 --- a/frontend/components/ui/cart.vue +++ b/frontend/components/ui/cart.vue @@ -27,9 +27,14 @@ export default { isHeaderOffScreen: false } }, + watch: { + $route(to, from) { + this.isHeaderOffScreen = false; + } + }, mounted() { let observer = new IntersectionObserver((entry, observer) => { - if (this.$route.name == 'Shop') { + if (this.$route.path.includes('shop')) { const isHeaderIntersecting = entry[0].isIntersecting; this.isHeaderOffScreen = !isHeaderIntersecting; } else { @@ -52,6 +57,8 @@ export default {