Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Oz founry patch 1 #91

Open
wants to merge 91 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
e1b20f4
Create .env
OzFounry Jun 21, 2022
62b7ae0
Merge branch 'swellstores:master' into master
OzFounry Jun 24, 2022
66b2cfd
Update TheFooter.vue
OzFounry Jun 24, 2022
d310cbd
Update TheFooter.vue
OzFounry Jun 24, 2022
c09c8b9
Update _slug.vue
OzFounry Jun 24, 2022
ff75aa4
Update _slug.vue
OzFounry Jun 24, 2022
9a08a8a
Update _slug.vue
OzFounry Jun 24, 2022
118adf6
Update _slug.vue
OzFounry Jun 24, 2022
78c5e77
Update TheFooter.vue
OzFounry Jun 24, 2022
ee22e8e
Update _slug.vue
OzFounry Jun 24, 2022
83a9db4
Update _slug.vue
OzFounry Jun 24, 2022
a86ac67
Update _slug.vue
OzFounry Jun 24, 2022
e90db8d
Update _slug.vue
OzFounry Jun 24, 2022
58200dd
Update _slug.vue
OzFounry Jun 24, 2022
8aba484
Update _slug.vue
OzFounry Jun 24, 2022
2dd1423
Update _slug.vue
OzFounry Jun 24, 2022
d45a6ca
Update _slug.vue
OzFounry Jun 24, 2022
7b2504f
Update _slug.vue
OzFounry Jun 24, 2022
9fb6183
Update globals.css
OzFounry Jun 24, 2022
11729cd
Update globals.css
OzFounry Jun 24, 2022
3f45526
Update globals.css
OzFounry Jun 24, 2022
3fe4b2d
Update globals.css
OzFounry Jun 24, 2022
510bcac
Update globals.css
OzFounry Jun 24, 2022
ce17bf9
Update globals.css
OzFounry Jun 24, 2022
ed27598
Update globals.css
OzFounry Jun 24, 2022
9552175
Update .env
OzFounry Jun 24, 2022
2650e81
Delete .env
OzFounry Jun 25, 2022
292d9f0
Update globals.css
OzFounry Jun 25, 2022
b3cccec
Update globals.css
OzFounry Jun 25, 2022
7bdbfe9
Update globals.css
OzFounry Jun 25, 2022
0e49a82
Update _slug.vue
OzFounry Jun 25, 2022
0d36f0b
Update _slug.vue
OzFounry Jun 25, 2022
d7d2ce5
Update _slug.vue
OzFounry Jun 25, 2022
c58f26c
Update _slug.vue
OzFounry Jun 25, 2022
41feb51
Update _slug.vue
OzFounry Jun 25, 2022
5a09d8e
Update _slug.vue
OzFounry Jun 25, 2022
9076408
Update _slug.vue
OzFounry Jun 25, 2022
01e06db
Update _slug.vue
OzFounry Jun 25, 2022
7f73c03
Update globals.css
OzFounry Jun 25, 2022
8add274
Update globals.css
OzFounry Jun 25, 2022
77fae33
Update globals.css
OzFounry Jun 25, 2022
43b4f48
Update globals.css
OzFounry Jun 25, 2022
61f0485
Update globals.css
OzFounry Jun 25, 2022
aa65e91
Update globals.css
OzFounry Jun 25, 2022
c7c5db8
Update globals.css
OzFounry Jun 25, 2022
0146597
Update globals.css
OzFounry Jun 25, 2022
cd07e12
Update globals.css
OzFounry Jun 25, 2022
a5e3b43
Update globals.css
OzFounry Jun 25, 2022
14faa46
Update globals.css
OzFounry Jun 26, 2022
f0cd6b9
Update globals.css
OzFounry Jun 26, 2022
f8be861
Update globals.css
OzFounry Jun 26, 2022
5ab4fe0
Update globals.css
OzFounry Jun 27, 2022
b4473a8
Update globals.css
OzFounry Jun 27, 2022
b2e60aa
Update globals.css
OzFounry Jun 27, 2022
3370313
Update globals.css
OzFounry Jun 27, 2022
887a991
Update globals.css
OzFounry Jun 27, 2022
9f6d5bc
Update globals.css
OzFounry Jun 27, 2022
d4582e9
Update globals.css
OzFounry Jun 27, 2022
c1aba8a
Update globals.css
OzFounry Jun 27, 2022
ec08ebe
Update globals.css
OzFounry Jun 27, 2022
9f72c4d
Update globals.css
OzFounry Jun 27, 2022
c7c1060
Update globals.css
OzFounry Jun 27, 2022
ea34d04
Update globals.css
OzFounry Jun 28, 2022
0e15d10
Update globals.css
OzFounry Jun 28, 2022
35ba447
Update globals.css
OzFounry Jun 28, 2022
6f41495
Update globals.css
OzFounry Jun 28, 2022
bbdbff7
Update globals.css
OzFounry Jun 28, 2022
4c14b83
Update globals.css
OzFounry Jun 28, 2022
daf7ff3
Update globals.css
OzFounry Jun 28, 2022
17fccc4
Update globals.css
OzFounry Jun 28, 2022
c631e0a
Update globals.css
OzFounry Jun 28, 2022
18d684e
Update globals.css
OzFounry Jun 28, 2022
4c951a4
Update globals.css
OzFounry Jun 28, 2022
f8c2f38
Update globals.css
OzFounry Jun 29, 2022
3e17c16
Update globals.css
OzFounry Jun 29, 2022
26b0a23
Update globals.css
OzFounry Jun 29, 2022
cd2227f
Update globals.css
OzFounry Jun 29, 2022
85a41aa
Update globals.css
OzFounry Jun 29, 2022
c19e9c1
Update globals.css
OzFounry Jun 29, 2022
0bc9231
Update globals.css
OzFounry Jun 29, 2022
5846d48
Update globals.css
OzFounry Jun 29, 2022
4621948
Update globals.css
OzFounry Jun 29, 2022
9c5876b
Update globals.css
OzFounry Jun 29, 2022
13797a3
Update globals.css
OzFounry Jun 30, 2022
ffa399f
Update globals.css
OzFounry Jun 30, 2022
47847c7
Update globals.css
OzFounry Jun 30, 2022
cccff2b
Add files via upload
OzFounry Jun 30, 2022
2854d41
Update pageMeta.js
OzFounry Jun 30, 2022
dd64b73
Update package.json
OzFounry Jun 30, 2022
e03325d
Update globals.css
OzFounry Jun 30, 2022
a180fb3
Update globals.css
OzFounry Jul 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions assets/css/globals.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,80 @@
section#\36 2bb33611a7f3ddfe8000001 h2 {font-size: 3em; font-family: King Slayer Regular; font-weight: 400;}
section#\36 2bb33611a7f3ddfe8000001 { border-top: 1px solid #eaeaea;}
section#\36 2bb33611a7f3ddfe8000001 a {color: #000; font-weight: 400;}
label.label-xs-bold.w-full.text-primary-dark {color: black;}
.hidden.h-10.p-2.lg\:inline-block {display: block;}
.container.py-16.text-center.lg\:flex.lg\:flex-row.lg\:text-left a:hover { background: linear-gradient(135deg,#67b5f5 0,#2ff 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; }
button.btn-icon.absolute.top-1.right-1.bg-primary-darker.text-primary-lightest.hover\:text-accent-default:hover {background: linear-gradient(135deg,#67b5f5 0,#2ff 100%); }
.markdown {margin-top: -6em;}
section#\36 2b8a418d87ac98e97000001 { border-top: 1px solid #eaeaea; }p.font-info { color: rgb(137, 137, 137);}
@media (min-width: 768px) {section#\35 f1b0d8b556f12522e4ddfb5 { text-align: left; max-width: 60rem; }
section#\36 2b8a418d87ac98e97000001 h2 { font-size: 9em !important; } section#\36 2bb33611a7f3ddfe8000001 h2 { font-size: 7em !important; }}
section#\35 f1b0d8b556f12522e4ddfb5 { padding-top: 2.5rem; padding-bottom: 1.5rem; } p.font-info { font-size: 1.302rem; }
section#\36 2b8a418d87ac98e97000001 { padding-top: 0; padding-bottom: 0; } strong.font-link { font-size: 1.302rem; }
section#\36 2b8a418d87ac98e97000001 a { color: black; font-weight: 400; }
section#\36 2b8a418d87ac98e97000001 h2 {
font-size: 5em;
font-family: Milago Regular;
font-weight: 400;}
1.right-1.bg-primary-darker.text-primary-lightest.hover\:text-accent-default {
background: white;
}

label.relative.block.w-full.cursor-pointer.rounded.border.border-primary-med.text-sm.font-semibold.hover\:border-primary-darkest.focus\:shadow-outline.border-primary-darkest { background-color: black; color: white; }.radio-selector.relative.mt-1.ml-1.inline-block.text-center { width: 100%; }
button.btn-icon.absolute.top-1.right-1.bg-primary-darker.text-primary-lightest.hover\:text-accent-default {
background-color: #000000;
color: white;
border-radius: 4px;
}
input.outline-none.h-12.w-full.rounded.border.border-primary-med.py-2.pl-4.pr-14.transition.focus\:shadow-outline.border-primary-lightest.bg-primary-darkest {
border: 2px solid #5050503d;
background: #fafafa;
color: black;
}

.mr-4.flex.items-center {
display: none;
}
[for="Milago Thin"]{
font-family: Milago Thin;
}
.ml-auto.flex.items-center { font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, helvetica, Ubuntu, roboto, noto, segoe ui, arial, sans-serif; }

div#Font-Sampler {
margin-top: 5em;
}

label#option-62ade41707550d1dc406876e-label {
font-size: 1.4em;
color: black;
}
@font-face {
font-family: "King Slayer Regular";
src: url("https://font-sampler.vercel.app/fonts/King-Slayer/King-Slayer-Regular.woff") format("woff");}
@font-face {
font-family: "Milago Thin";
src: url("https://font-sampler.vercel.app/fonts/Milago/Milago-Thin.woff") format("woff");
}
@font-face {
font-family: "Milago Regular";
src: url("https://font-sampler.vercel.app/fonts/Milago/Milago-Regular.woff") format("woff");
}
[for="62b85f98b1bf1d209a8f7fd2"] :after { content: 'Print: 1 User Web: 100.000 Pageviews/month App: 1.000 Downloads eBook: 10.000 Downloads';
display: inline-block; margin-left: 6px; padding: 2EM;
font-size: var(--type-scale--1); }
span.block.min-w-12.p-3 { font-size: 3em; }
.radio-selector.relative.mt-1.ml-1.inline-block.text-center { margin-bottom: 2em; }
[for="62b85f98b1bf1d209a8f7fd3"]:after
{ content: 'Print: 5 User Web: 500.000 Pageviews/month App: 5.000 Downloads eBook: 50.000 Downloads';
font-size: var(--type-scale--1); display: inline-block; margin-left: 6px; padding: 2EM; }
[for="62b85f98b1bf1d209a8f7fd4"]:after { content: 'Print: 15 Users Web: 1,500,000 Pageviews/month App: 15,000 Downloads eBook: 150,000 Downloads Broadcasting: 1,500,000 Viewers';
font-size: var(--type-scale--1); display: inline-block; margin-left: 6px; padding: 2EM; }

[for="62bc382ffecfa50262ec12d0"] :after { content: 'Print: 1 User Web: 100.000 Pageviews/month App: 1.000 Downloads eBook: 10.000 Downloads';
display: inline-block; margin-left: 6px; padding: 2EM;
font-size: var(--type-scale--1);}


html,
body {
@apply bg-primary-lightest;
Expand Down Expand Up @@ -209,3 +286,5 @@ input[type='number'] {
@apply mx-auto w-full px-6 lg:px-8 xl:px-10;
}
}


9 changes: 1 addition & 8 deletions components/TheFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,7 @@
<div class="lg:flex-no-wrap container lg:flex lg:justify-between">
<!-- Copyright & Settings -->
<p class="my-3 text-sm">
<span>©{{ currentYear }} {{ store.name }}.</span> Powered by
<a
id="powered-by-swell"
href="https://www.swell.is/"
title="Headless ecommerce platform for brands"
class="text-current"
>Swell</a
<span>©{{ currentYear }} {{ store.name }}.</span> All rights reserved.</a
>
</p>
<!-- Secondary nav menu -->
Expand Down Expand Up @@ -166,7 +160,6 @@
</div>
</footer>
</template>

<script>
// Helpers
import get from 'lodash/get';
Expand Down
2 changes: 1 addition & 1 deletion mixins/pageMeta.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default {
{
hid: 'og:url',
property: 'og:url',
content: url,
content: 'https://www.oztype.com',
},
{
hid: 'og:image',
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "swell-origin-theme",
"name": "OzType",
"version": "1.0.170",
"description": "Origin PWA theme/starter for Swell ecommerce platform",
"author": "Swell",
"homepage": "https://www.swell.is/",
"description": "Oztype, an independent digital font foundry.",
"author": "OzType",
"homepage": "https://www.oztype.com/",
"repository": {
"type": "git",
"url": "https://github.com/swellstores/origin-theme/"
Expand Down
4 changes: 2 additions & 2 deletions pages/products/_slug.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
</span>
</div>
<div class="markdown" v-html="product.description" />

<!-- Bundle items -->
<template v-if="bundleItems">
<div
Expand Down Expand Up @@ -898,4 +898,4 @@ export default {
};
},
};
</script>
</script>
Binary file modified static/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.