Compare commits

..

No commits in common. "39f8bd82f6fece86ccb5afad3bbe729c9a3183d6" and "03bf1c3a9e99091a880049789a66f30b7f5fe577" have entirely different histories.

15 changed files with 51 additions and 145 deletions

View File

@ -26,13 +26,13 @@
}, },
methods: { methods: {
handleScroll() { handleScroll() {
const limit = this.$isMobile() ? 115 : 430; const limit = 430;
if (!pagesWithCarousel.includes(this.$route.name)) { if (!pagesWithCarousel.includes(this.$route.name)) {
this.stickyClass = 'has-sticky has-sticky-1' this.stickyClass = 'has-sticky has-sticky-1'
return; return;
} }
if (window.scrollY > 5 && window.scrollY <= limit) { if (window.scrollY > 0 && window.scrollY <= limit) {
this.stickyClass = 'has-sticky has-sticky-0'; this.stickyClass = 'has-sticky has-sticky-0';
} else if(window.scrollY > limit) { } else if(window.scrollY > limit) {
this.stickyClass = 'has-sticky has-sticky-1'; this.stickyClass = 'has-sticky has-sticky-1';
@ -45,7 +45,7 @@
</script> </script>
<template> <template>
<!-- <div class="width">{{ width }}px {{ deviceClass }}</div> --> <div class="width">{{ width }}px {{ deviceClass }}</div>
<Menu :class="`${stickyClass}`" /> <Menu :class="`${stickyClass}`" />
<div class="main-container" :class="`${stickyClass} ${deviceClass}`"> <div class="main-container" :class="`${stickyClass} ${deviceClass}`">
<div class="content-wrapper"> <div class="content-wrapper">
@ -70,7 +70,7 @@
opacity: 0.5; opacity: 0.5;
} }
.content-wrapper { .content-wrapper {
padding-top: 120px; padding-top: 91px;
background-color: #000; background-color: #000;
} }
.content { .content {
@ -109,7 +109,7 @@
@media only screen and (max-width: 767px) { @media only screen and (max-width: 767px) {
.content-wrapper { .content-wrapper {
padding-top: 115px; padding-top: 50px;
} }
.content { .content {
padding: 0 16px 72px; padding: 0 16px 72px;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 625 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 KiB

View File

@ -22,10 +22,10 @@ export default {
} }
h3.header { h3.header {
font-weight: 300; font-weight: 600;
font-size: 26px; font-size: 26px;
line-height: 36px; line-height: 58px;
padding: 120px 148px 0; padding: 120px 230px 0;
text-align: center; text-align: center;
text-shadow: 1px 1px 10px #000; text-shadow: 1px 1px 10px #000;
} }

View File

@ -12,7 +12,6 @@ import DifferentBox from './DifferentBox.vue';
<DifferentBox image="coffee-cup1.png" :title="$t('different.extraordinary.title')" :description="$t('different.extraordinary.description')" /> <DifferentBox image="coffee-cup1.png" :title="$t('different.extraordinary.title')" :description="$t('different.extraordinary.description')" />
<DifferentBox image="best-price1.png" :title="$t('different.affordable.title')" :description="$t('different.affordable.description')" /> <DifferentBox image="best-price1.png" :title="$t('different.affordable.title')" :description="$t('different.affordable.description')" />
</div> </div>
<h3>{{ $t('different.subheader1') }}</h3>
</section> </section>
</template> </template>
@ -20,7 +19,7 @@ import DifferentBox from './DifferentBox.vue';
.different { .different {
color: #fff; color: #fff;
background-color: #000; background-color: #000;
padding: 0 0 0px; padding: 0 0 72px;
} }
h2 { h2 {
@ -33,7 +32,7 @@ import DifferentBox from './DifferentBox.vue';
margin-top: 24px; margin-top: 24px;
padding: 0 150px; padding: 0 150px;
font-size: 20px; font-size: 20px;
line-height: 30px; line-height: 34px;
text-align: center; text-align: center;
font-weight: 200; font-weight: 200;
margin-bottom: 50px; margin-bottom: 50px;

View File

@ -29,10 +29,6 @@ export default {
<div class="hamburger-line"></div> <div class="hamburger-line"></div>
<div class="hamburger-line"></div> <div class="hamburger-line"></div>
</div> </div>
<div class="logo">
<img src="@images/tayrona-foods-yellow.png" alt="Tayrona Foods"/>
</div>
<div></div>
</div> </div>
<div class="menu-content" :class="{collapsed: !mobileMenuOpened}"> <div class="menu-content" :class="{collapsed: !mobileMenuOpened}">
<div class="links"> <div class="links">
@ -48,9 +44,7 @@ export default {
</div> </div>
</nav> </nav>
<nav v-else> <nav v-else>
<div class="logo"> <img class="logo" src="@images/tayrona-foods-yellow.png" />
<img src="@images/tayrona-foods-yellow.png" alt="Tayrona Foods"/>
</div>
<div class="links"> <div class="links">
<router-link class="link" to="/">{{ $t('menu.home')}}</router-link> <router-link class="link" to="/">{{ $t('menu.home')}}</router-link>
<router-link class="link" to="/about">{{ $t('menu.about') }}</router-link> <router-link class="link" to="/about">{{ $t('menu.about') }}</router-link>
@ -86,9 +80,9 @@ export default {
height: 100%; height: 100%;
transition: background-color .3s ease-in-out; transition: background-color .3s ease-in-out;
.logo img{ .logo {
height: 100px; height: 75px;
width: 100px;; width: 75px;;
} }
.links { .links {
@ -154,20 +148,6 @@ export default {
.menu { .menu {
&-bar { &-bar {
width: 100%; width: 100%;
display: grid;
grid-template-columns: 1fr 2fr 1fr;
height: 115px;
transition: height .2s ease-out;
.logo, .hamburger {
justify-self: center;
align-self: center;
}
.logo {
opacity: 1;
transition: opacity .2s ease-out;
}
} }
&-content { &-content {
color: white; color: white;
@ -192,18 +172,9 @@ export default {
} }
} }
&.has-sticky-0, &.has-sticky-1 { &.has-sticky-0 nav, &.has-sticky-1 nav{
.menu-bar {
height: 50px;
}
.logo {
opacity: 0;
overflow: hidden;
}
nav {
background-color: #000; background-color: #000;
} }
} }
} }
}
</style> </style>

View File

@ -76,7 +76,7 @@ export const products = [
{ {
kind: kinds.fire, kind: kinds.fire,
name: 'products.uganda_gnoma.name', name: 'products.uganda_gnoma.name',
images: ['uganda-single.jpg', 'product-uganda-double1.png',], images: ['product-uganda-single11.png', 'product-uganda-double1.png',],
slogan: 'products.uganda_gnoma.slogan', slogan: 'products.uganda_gnoma.slogan',
description: 'products.uganda_gnoma.description', description: 'products.uganda_gnoma.description',
farm: 'products.uganda_gnoma.farm', farm: 'products.uganda_gnoma.farm',
@ -92,19 +92,19 @@ export const products = [
}, },
{ {
kind: kinds.earth, kind: kinds.earth,
name: 'products.uganda_gnoma_cream.name', name: 'products.uganda_gnoma.name',
images: ['uganda-caffecrem.jpg',], images: ['product-uganda-single11.png', 'product-uganda-double1.png',],
slogan: 'products.uganda_gnoma_cream.slogan', slogan: 'products.uganda_gnoma.slogan',
description: 'products.uganda_gnoma_cream.description', description: 'products.uganda_gnoma.description',
farm: 'products.uganda_gnoma_cream.farm', farm: 'products.uganda_gnoma.farm',
strain: 'products.uganda_gnoma_cream.strain', strain: 'products.uganda_gnoma.strain',
country: 'products.uganda_gnoma_cream.country', country: 'products.uganda_gnoma.country',
height: 'products.uganda_gnoma_cream.height', height: 'products.uganda_gnoma.height',
revision: 'products.uganda_gnoma_cream.revision', revision: 'products.uganda_gnoma.revision',
harvest: 'products.uganda_gnoma_cream.harvest', harvest: 'products.uganda_gnoma.harvest',
profile: 'products.uganda_gnoma_cream.profile', profile: 'products.uganda_gnoma.profile',
taste: 'products.uganda_gnoma_cream.taste', taste: 'products.uganda_gnoma.taste',
texture: 'products.uganda_gnoma_cream.texture', texture: 'products.uganda_gnoma.texture',
url: 'https://tayronafoods.myshopify.com/products/uganda-ngoma', url: 'https://tayronafoods.myshopify.com/products/uganda-ngoma',
}, },
]; ];
@ -113,29 +113,29 @@ export const slides = {
home: [ home: [
'mountains.jpg', 'mountains.jpg',
'coffee1.jpg', 'coffee1.jpg',
'Packaging_new 1.jpg', 'Packaging_new.png',
'proysoc.01.jpg', 'proysoc.01.jpg',
'kids.jpg', 'kids-coffee.jpg',
], ],
about: [ about: [
'coffee1.jpg', 'coffee1.jpg',
'mountains.jpg', 'mountains.jpg',
'Packaging_new 1.jpg', 'Packaging_new.png',
'proysoc.01.jpg', 'proysoc.01.jpg',
'kids.jpg', 'kids-coffee.jpg',
], ],
social: [ social: [
'proysoc.01.jpg', 'proysoc.01.jpg',
'kids.jpg', 'kids-coffee.jpg',
'mountains.jpg', 'mountains.jpg',
'coffee1.jpg', 'coffee1.jpg',
'Packaging_new 1.jpg', 'Packaging_new.png',
], ],
products: [ products: [
'Packaging_new 1.jpg', 'Packaging_new.png',
'coffee1.jpg', 'coffee1.jpg',
'mountains.jpg', 'mountains.jpg',
'proysoc.01.jpg', 'proysoc.01.jpg',
'kids.jpg', 'kids-coffee.jpg',
], ],
}; };

View File

@ -131,22 +131,6 @@ export default {
taste: 'Zartbitterschokolade', taste: 'Zartbitterschokolade',
texture: 'sanft' texture: 'sanft'
}, },
uganda_gnoma_cream: {
title:'Earth',
slogan: 'Born to create',
description: `El fuego, la pasión que resuena en cada paso de nuestro trabajo.
Desde la selección de variedades de café verde hasta el cuidadoso tostado y la preparación amorosa, estamos allí con alma y corazón para ofrecerte una experiencia de café extraordinaria.`,
name: 'Uganda Ngoma',
farm: 'Caffeè crema ',
strain: '100% Robusta',
country: 'Uganda / Wakiso District',
height: '1.250 m',
revision: 'Sonnengetrocknet',
harvest: 'handgepflückt',
profile: '1/4',
taste: 'Zartbitterschokolade',
texture: 'sanft'
},
}, },
labels: { labels: {
country: 'Land / Region', country: 'Land / Region',
@ -177,7 +161,7 @@ export default {
contact:{ contact:{
title: 'Contacto', title: 'Contacto',
paragraph1: 'Si está interesado o tiene alguna pregunta, <a class="link" href="https://tayronafoods.myshopify.com/pages/contact" target="_blank">¡contáctenos!</a>', paragraph1: 'Si está interesado o tiene alguna pregunta, ¡contáctenos!',
paragraph2: 'Correo Electrónico', paragraph2: 'Correo Electrónico',
paragraph3: 'info@tayronafoods.com', paragraph3: 'info@tayronafoods.com',
paragraph4: 'alejandro@tayronafoods.com', paragraph4: 'alejandro@tayronafoods.com',

View File

@ -133,25 +133,7 @@ export default {
taste: '', taste: '',
texture: '' texture: ''
}, },
uganda_gnoma_cream: {
title:'Earth',
slogan: 'Born to create',
description: `El fuego, la pasión que resuena en cada paso de nuestro trabajo.
Desde la selección de variedades de café verde hasta el cuidadoso tostado y la preparación amorosa, estamos allí con alma y corazón para ofrecerte una experiencia de café extraordinaria.`,
name: 'Uganda Ngoma',
farm: 'Caffeè crema ',
strain: '100% Robusta',
country: 'Uganda / Wakiso District',
height: '1.250 m',
revision: 'Sun dried',
harvest: 'Carefully selected',
profile: '1/4',
taste: 'Zartbitterschokolade',
texture: 'sanft'
}, },
},
labels: { labels: {
country: 'Country / Region', country: 'Country / Region',
height: 'Height', height: 'Height',
@ -180,7 +162,7 @@ export default {
}, },
contact:{ contact:{
title: 'Contact', title: 'Contact',
paragraph1:'If you are interested or have any questions, please <a class="link" href="https://tayronafoods.myshopify.com/pages/contact" target="_blank">contact us!</a>', paragraph1:'If you are interested or have any questions, please contact us!',
paragraph2: 'Email', paragraph2: 'Email',
paragraph3: 'info{\'@\'}tayronafoods.com', paragraph3: 'info{\'@\'}tayronafoods.com',
paragraph4: 'alejandro{\'@\'}tayronafoods.com', paragraph4: 'alejandro{\'@\'}tayronafoods.com',

View File

@ -37,7 +37,6 @@ export default {
different: { different: {
header: '¿Por qué somos diferentes?', header: '¿Por qué somos diferentes?',
subheader: '¡No solo hacemos tu café, hacemos tu día!', subheader: '¡No solo hacemos tu café, hacemos tu día!',
subheader1: 'Las grandes ideas comienzan con un excelente café, te ayudaremos a lograrlo.',
beans: { beans: {
title: 'Granos Supremos', title: 'Granos Supremos',
description: 'Granos proporcionan gran sabor', description: 'Granos proporcionan gran sabor',
@ -132,23 +131,6 @@ export default {
taste: '-.', taste: '-.',
texture: '-' texture: '-'
}, },
uganda_gnoma_cream: {
title:'Tierra',
slogan: 'Nacido para crear',
description: `El fuego, la pasión que resuena en cada paso de nuestro trabajo.
Desde la selección de variedades de café verde hasta el cuidadoso tostado y la preparación amorosa, estamos allí con alma y corazón para ofrecerte una experiencia de café extraordinaria.`,
name: 'Uganda Ngoma',
farm: 'Caffeè crema ',
strain: '100% Robusta',
country: 'Uganda / Wakiso District',
height: '1.250 m',
revision: 'Secado al sol',
harvest: 'Seleccionado cuidadósamente',
profile: '1/4',
taste: '-.',
texture: '-'
},
}, },
labels: { labels: {
country: 'País / Región', country: 'País / Región',
@ -179,7 +161,7 @@ export default {
contact:{ contact:{
title: 'Contacto', title: 'Contacto',
paragraph1: 'Si está interesado o tiene alguna pregunta, <a class="link" href="https://tayronafoods.myshopify.com/pages/contact" target="_blank">¡contáctenos!</a>', paragraph1: 'Si está interesado o tiene alguna pregunta, ¡contáctenos!',
paragraph2: 'Correo Electrónico', paragraph2: 'Correo Electrónico',
paragraph3: 'info{\'@\'}tayronafoods.com', paragraph3: 'info{\'@\'}tayronafoods.com',
paragraph4: 'alejandro{\'@\'}tayronafoods.com', paragraph4: 'alejandro{\'@\'}tayronafoods.com',

View File

@ -68,10 +68,6 @@ body {
margin-top: 48px; margin-top: 48px;
} }
a, .link {
color: #442808;
}
@media only screen and (max-width: 960px) { @media only screen and (max-width: 960px) {
.main-container { .main-container {
width: 100%; width: 100%;

View File

@ -3,7 +3,7 @@
<div class="contact-section"> <div class="contact-section">
<div class="left"> <div class="left">
<h1>{{ $t('contact.title') }}</h1> <h1>{{ $t('contact.title') }}</h1>
<p v-html="$t('contact.paragraph1')"></p> <p>{{ $t('contact.paragraph1') }}</p>
<h3>{{ $t('contact.paragraph2') }}</h3> <h3>{{ $t('contact.paragraph2') }}</h3>
<p>{{ $t('contact.paragraph3') }}</p> <p>{{ $t('contact.paragraph3') }}</p>
<p>{{ $t('contact.paragraph4') }}</p> <p>{{ $t('contact.paragraph4') }}</p>
@ -12,7 +12,7 @@
<p>{{ $t('contact.paragraph7') }}</p> <p>{{ $t('contact.paragraph7') }}</p>
<p>{{ $t('contact.paragraph8') }}</p> <p>{{ $t('contact.paragraph8') }}</p>
<h3>{{ $t('contact.paragraph9') }}</h3> <h3>{{ $t('contact.paragraph9') }}</h3>
<p><a href="https://www.instagram.com/tayrona_foods" target="">Instagram</a></p> <p>{{ $t('contact.paragraph10') }}</p>
</div> </div>
<div class="right"></div> <div class="right"></div>
</div> </div>
@ -36,28 +36,20 @@ export default {
h1 { h1 {
font-weight: 400; font-weight: 400;
font-size: 32px; font-size: 64px;
line-height: 75px; line-height: 75px;
} }
h3 { h3 {
margin-top: 54px; margin-top: 54px;
font-weight: 400; font-weight: 400;
font-size: 18px; font-size: 32px;
line-height: 38px; line-height: 38px;
} }
p { p {
font-weight: 300; font-weight: 400;
font-size: 16px; font-size: 20px;
line-height: 24px; line-height: 24px;
} }
} }
@media only screen and (max-width: 767px) {
.contact-section {
.left {
padding: 36px 16px;
}
}
}
</style> </style>