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.

Sign up for GitHub

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

Jump to bottom

chore: font organization #523

Merged
merged 7 commits into from
Jul 30, 2024
Merged

chore: font organization #523

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0852661
font improvements and organization changes that allow for consuming p…
stephiescastle Jul 30, 2024
6d6a83d
Merge branch 'main' into feature/explorer-1-font-organization
stephiescastle Jul 30, 2024
23b692b
major version bump
stephiescastle Jul 30, 2024
28c05e6
fixing version numbers again
stephiescastle Jul 30, 2024
b68838a
changing order of imports in styles-with-fonts.scss, reflecting versi…
stephiescastle Jul 30, 2024
d107ae6
fixing html package style imports
stephiescastle Jul 30, 2024
bd19044
fixing accessibility issue with 'hidden' slides in MixinCarousel
stephiescastle Jul 30, 2024
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
2 changes: 1 addition & 1 deletion apps/vue-storybook/.storybook/preview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import vClickOutside from 'click-outside-vue3'
import VueCompareImage from 'vue3-compare-image'
import { createPinia } from 'pinia'
import filters from '@explorer-1/vue/src/utils/filters'
import '@explorer-1/common/src/scss/styles.scss'
import '@explorer-1/common/src/scss/styles-with-fonts.scss'
import { withGlobals, globalTypes } from './withGlobals'
import customTheme from '@explorer-1/common-storybook/src/config/customTheme'
import '@explorer-1/common-storybook/src/config/canvas.css'
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@explorer-1/common",
"version": "1.0.5",
Scotchester marked this conversation as resolved.
Show resolved Hide resolved
"version": "1.0.6",
"private": false,
"publishConfig": {
"access": "public"
Expand Down
12 changes: 4 additions & 8 deletions packages/common/src/scss/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
font-weight: 600;
font-style: italic;
font-display: swap;
src: url('../fonts/metropolis/Metropolis-SemiBoldItalic.woff2')
format('woff2');
src: url('../fonts/metropolis/Metropolis-SemiBoldItalic.woff2') format('woff2');
}

@font-face {
Expand Down Expand Up @@ -84,24 +83,21 @@
font-weight: 700;
font-style: italic;
font-display: swap;
src: url('../fonts/archivo-narrow/ArchivoNarrow-BoldItalic.woff2')
format('woff2');
src: url('../fonts/archivo-narrow/ArchivoNarrow-BoldItalic.woff2') format('woff2');
}

@font-face {
font-family: 'Archivo Narrow';
font-weight: 600;
font-style: normal;
font-display: swap;
src: url('../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff2')
format('woff2');
src: url('../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff2') format('woff2');
}

@font-face {
font-family: 'Archivo Narrow';
font-weight: 600;
font-style: italic;
font-display: swap;
src: url('../fonts/archivo-narrow/ArchivoNarrow-SemiBoldItalic.woff2')
format('woff2');
src: url('../fonts/archivo-narrow/ArchivoNarrow-SemiBoldItalic.woff2') format('woff2');
}
2 changes: 0 additions & 2 deletions packages/common/src/scss/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@use 'sass:math';
@tailwind base;
@tailwind utilities;
Scotchester marked this conversation as resolved.
Show resolved Hide resolved

// Conversion util for easier definition of font sizes by pixel size
@function pxToRem($pxValue) {
Expand Down
2 changes: 2 additions & 0 deletions packages/common/src/scss/styles-with-fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'styles.scss';
@import 'fonts';
1 change: 0 additions & 1 deletion packages/common/src/scss/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

// main elements
@import 'forms';
@import 'fonts';
@import 'aspect-ratios';
@import 'grid';
@import 'typography';
Expand Down
2 changes: 1 addition & 1 deletion packages/html/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import initBlockAccordion from './assets/js/components/_BlockAccordion.js'
import initBackToTop from './assets/js/components/_BackToTop.js'
import initHeaderInternal from './assets/js/components/_HeaderInternal.js'
import initHeroMedia from './assets/js/components/_HeroMedia.js'
import './assets/scss/styles.scss'
import './assets/scss/styles-with-fonts.scss'

initBackToTop()
initBlockAccordion()
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@explorer-1/vue",
"version": "0.1.9",
"version": "0.1.10",
"private": false,
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import filters from './utils/filters'
// @ts-ignore
import vClickOutside from 'click-outside-vue3'
import VueCompareImage from 'vue3-compare-image'
import './assets/scss/styles.scss'
import './assets/scss/styles-with-fonts.scss'
import App from './App.vue'

const pinia = createPinia()
Expand Down
Loading