diff --git a/README.md b/README.md index e6925ec..f4cb247 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Rumfoords +# Code Study Boilerplate **Local Development** diff --git a/app.html b/app.html index 123f64c..ed57dc5 100644 --- a/app.html +++ b/app.html @@ -1,10 +1,3 @@ - diff --git a/assets/scss/_base.scss b/assets/scss/_base.scss index 2b22558..946dae8 100755 --- a/assets/scss/_base.scss +++ b/assets/scss/_base.scss @@ -1,5 +1,5 @@ @import 'vars'; -@import url('https://fonts.googleapis.com/css2?family=EB+Garamond:ital,wght@0,400;0,700;1,400;1,700&family=Poppins:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=EB+Garamond:ital,wght@0,400;0,700;1,400;1,700&family=IBM+Plex+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap'); html { font-size: 16px; @@ -12,7 +12,7 @@ body { --black: #000000; --white: #ffffff; - --font-sans: 'Poppins', sans-serif; + --font-sans: 'IBM Plex Sans', sans-serif; --font-serif: 'EB Garamond', serif; @include fontSize(16px); @@ -107,20 +107,15 @@ a { path { transition: fill 0.3s; } - - @include hover { - color: var(--white); - - path { - fill: var(--white); - } + &:hover { + text-decoration: underline; } } .contained { padding-right: var(--margin); padding-left: var(--margin); - // max-width: 1380px; + max-width: 1200px; margin-right: auto; margin-left: auto; } diff --git a/components/StudyBody.vue b/components/StudyBody.vue new file mode 100644 index 0000000..cb0995f --- /dev/null +++ b/components/StudyBody.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/components/ThreeBoilerplate.vue b/components/ThreeBoilerplate.vue index 96f05a2..7ad0b71 100644 --- a/components/ThreeBoilerplate.vue +++ b/components/ThreeBoilerplate.vue @@ -1,16 +1,37 @@ @@ -95,4 +219,10 @@ export default { width: 100%; height: 100%; } - \ No newline at end of file + +#assetUrl { + position: absolute; + z-index: 50; + color: var(--white); +} + diff --git a/components/svg/facebook-clipped.vue b/components/svg/facebook-clipped.vue new file mode 100644 index 0000000..cee3cef --- /dev/null +++ b/components/svg/facebook-clipped.vue @@ -0,0 +1,47 @@ + + + diff --git a/components/svg/social/social-facebook.vue b/components/svg/social/social-facebook.vue index 255e297..76d98e7 100644 --- a/components/svg/social/social-facebook.vue +++ b/components/svg/social/social-facebook.vue @@ -1,5 +1,6 @@ \ No newline at end of file + diff --git a/components/svg/social/social-instagram.vue b/components/svg/social/social-instagram.vue index 127d7bc..9d78085 100644 --- a/components/svg/social/social-instagram.vue +++ b/components/svg/social/social-instagram.vue @@ -1,5 +1,6 @@ @@ -13,5 +25,18 @@ export default {} diff --git a/static/fonts/fonts.css b/static/fonts/fonts.css index 0991838..a295f43 100755 --- a/static/fonts/fonts.css +++ b/static/fonts/fonts.css @@ -10,25 +10,3 @@ 800 - Extra Bold (Ultra Bold) 900 - Black (Heavy) */ - -@font-face { - font-family: 'SweetSans'; - font-style: normal; - font-weight: 400; - src: url('SweetSans-Regular.woff2') format('woff2'), - url('SweetSans-Regular.woff') format('woff'); -} -@font-face { - font-family: 'SweetSans'; - font-style: normal; - font-weight: 700; - src: url('SweetSans-Medium.woff2') format('woff2'), - url('SweetSans-Medium.woff') format('woff'); -} -@font-face { - font-family: 'WT-Monarch'; - font-style: normal; - font-weight: 400; - src: url('WT-Monarch.woff2') format('woff2'), - url('WT-Monarch.woff') format('woff'); -} diff --git a/static/images/Diffuse2k.jpg b/static/images/Diffuse2k.jpg new file mode 100644 index 0000000..60b6cab Binary files /dev/null and b/static/images/Diffuse2k.jpg differ diff --git a/static/images/gradient.png b/static/images/gradient.png new file mode 100644 index 0000000..a4fb1a8 Binary files /dev/null and b/static/images/gradient.png differ diff --git a/static/images/skin-2-diffuse.png b/static/images/skin-2-diffuse.png new file mode 100644 index 0000000..675ab1e Binary files /dev/null and b/static/images/skin-2-diffuse.png differ diff --git a/static/images/skin-2-displace.png b/static/images/skin-2-displace.png new file mode 100644 index 0000000..9f923d1 Binary files /dev/null and b/static/images/skin-2-displace.png differ diff --git a/static/images/skin-2-normals.png b/static/images/skin-2-normals.png new file mode 100644 index 0000000..3a129cc Binary files /dev/null and b/static/images/skin-2-normals.png differ diff --git a/static/images/skin-2-spec.png b/static/images/skin-2-spec.png new file mode 100644 index 0000000..1f5bc8a Binary files /dev/null and b/static/images/skin-2-spec.png differ diff --git a/static/images/skin-diffuse.jpg b/static/images/skin-diffuse.jpg new file mode 100644 index 0000000..87c7c60 Binary files /dev/null and b/static/images/skin-diffuse.jpg differ diff --git a/static/images/skin-displace.jpg b/static/images/skin-displace.jpg new file mode 100644 index 0000000..0e1d588 Binary files /dev/null and b/static/images/skin-displace.jpg differ diff --git a/static/images/skin-normals.jpg b/static/images/skin-normals.jpg new file mode 100644 index 0000000..12cd519 Binary files /dev/null and b/static/images/skin-normals.jpg differ diff --git a/static/images/skin-spec.jpg b/static/images/skin-spec.jpg new file mode 100644 index 0000000..fec17f7 Binary files /dev/null and b/static/images/skin-spec.jpg differ diff --git a/static/images/tattoo-msdf.png b/static/images/tattoo-msdf.png new file mode 100644 index 0000000..dc2cb7b Binary files /dev/null and b/static/images/tattoo-msdf.png differ diff --git a/static/images/tattoo-sdf-2.png b/static/images/tattoo-sdf-2.png new file mode 100644 index 0000000..9b9b0d8 Binary files /dev/null and b/static/images/tattoo-sdf-2.png differ diff --git a/static/images/tattoo-sdf.png b/static/images/tattoo-sdf.png new file mode 100644 index 0000000..e513f76 Binary files /dev/null and b/static/images/tattoo-sdf.png differ diff --git a/static/images/tattoo.png b/static/images/tattoo.png new file mode 100644 index 0000000..3c32e87 Binary files /dev/null and b/static/images/tattoo.png differ diff --git a/static/images/tribal-msdf-2.png b/static/images/tribal-msdf-2.png new file mode 100644 index 0000000..45d415b Binary files /dev/null and b/static/images/tribal-msdf-2.png differ diff --git a/static/images/tribal-msdf.png b/static/images/tribal-msdf.png new file mode 100644 index 0000000..eaf3035 Binary files /dev/null and b/static/images/tribal-msdf.png differ diff --git a/static/lps/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg b/static/lps/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg new file mode 100644 index 0000000..054fe89 Binary files /dev/null and b/static/lps/Infinite-Level_02_Disp_NoSmoothUV-4096.jpg differ diff --git a/static/lps/Infinite-Level_02_Tangent_SmoothUV.jpg b/static/lps/Infinite-Level_02_Tangent_SmoothUV.jpg new file mode 100644 index 0000000..e8a6361 Binary files /dev/null and b/static/lps/Infinite-Level_02_Tangent_SmoothUV.jpg differ diff --git a/static/lps/LeePerrySmith.glb b/static/lps/LeePerrySmith.glb new file mode 100644 index 0000000..cff335d Binary files /dev/null and b/static/lps/LeePerrySmith.glb differ diff --git a/static/lps/Map-COL.jpg b/static/lps/Map-COL.jpg new file mode 100644 index 0000000..7407030 Binary files /dev/null and b/static/lps/Map-COL.jpg differ diff --git a/static/lps/Map-SPEC.jpg b/static/lps/Map-SPEC.jpg new file mode 100644 index 0000000..8e52e62 Binary files /dev/null and b/static/lps/Map-SPEC.jpg differ diff --git a/static/videos/shovel.mp4 b/static/videos/shovel.mp4 new file mode 100644 index 0000000..4c998d3 Binary files /dev/null and b/static/videos/shovel.mp4 differ diff --git a/store/browser.js b/store/browser.js index 69f1a22..d5443da 100755 --- a/store/browser.js +++ b/store/browser.js @@ -60,12 +60,12 @@ export const actions = { context.commit('FONTS_LOADING') await loadFonts([ { - name: 'SweetSans', + name: 'EB Garamund', weights: [400, 700], }, { - name: 'WT-Monarch', - weights: [400], + name: 'Poppins', + weights: [300, 400, 700], }, ]) context.commit('FONTS_LOADED')