diff --git a/sass/global.scss b/sass/global.scss index 0a36546f..25ee72ee 100644 --- a/sass/global.scss +++ b/sass/global.scss @@ -16,7 +16,7 @@ @import 'variables/colors'; @import 'variables/breakpoints'; @import 'variables/font-face'; -@import 'variables/font-family'; +@import 'variables/typography-family'; @import 'variables/typography-size'; @import 'variables/forms'; @import 'variables/spacings'; diff --git a/sass/gutenberg-editor-styles.scss b/sass/gutenberg-editor-styles.scss index 346b7f7c..3ca12798 100644 --- a/sass/gutenberg-editor-styles.scss +++ b/sass/gutenberg-editor-styles.scss @@ -16,7 +16,7 @@ // Variables @import 'variables/colors'; @import 'variables/breakpoints'; -@import 'variables/font-family'; +@import 'variables/typography-family'; @import 'variables/typography-size'; @import 'variables/forms'; @import 'variables/spacings'; diff --git a/sass/variables/_font-family copy.scss b/sass/variables/_font-family copy.scss deleted file mode 100644 index db70ccc7..00000000 --- a/sass/variables/_font-family copy.scss +++ /dev/null @@ -1,10 +0,0 @@ -// stylelint-disable max-line-length -// Font family settings -// You can define your own font families here, like --typography-family-barlow -// and then attach them to elements: --typography-family-paragraph: var(--typography-family-barlow) -:root { - // Fonts in use for content - --typography-family-inter: 'Inter', -apple-system, 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Oxygen-Sans', 'Ubuntu', 'Cantarell', 'Helvetica Neue', sans-serif; - --typography-family-paragraph: var(--typography-family-inter); - --typography-family-heading: var(--typography-family-inter); -} diff --git a/sass/variables/_font-size.scss b/sass/variables/_font-size.scss deleted file mode 100644 index da626cd1..00000000 --- a/sass/variables/_font-size.scss +++ /dev/null @@ -1,59 +0,0 @@ -// stylelint-disable rem-over-px/rem-over-px -// CSS Variables for responsive fonts -:root { - // Heading font sizes - --font-size-hero: 52px; - --font-size-h1: 40px; - --font-size-h2: 30px; - --font-size-h3: 24px; - --font-size-h4: 20px; - --font-size-h5: 16px; - --font-size-h6: 14px; - - // Paragraph font sizes - --font-size-12: 12px; - --font-size-13: 13px; - --font-size-14: 14px; - --font-size-15: 15px; - --font-size-16: 16px; - --font-size-17: 17px; - --font-size-18: 18px; - --font-size-20: 20px; - --font-size-22: 22px; - - // Element font sizes - --font-size-paragraph: var(--font-size-18); - --font-size-nav-toggle-label: 15px; - --font-size-captions: 15px; - - // Line-heights - --line-height-heading: 1.5; - --line-height-core-heading: 1.23; - --line-height-paragraph: 1.7; - - // Font weights - --font-weight-regular: 400; - --font-weight-medium: 500; - --font-weight-semibold: 600; - --font-weight-bold: 700; - --font-weight-paragraph: var(--font-weight-regular); - --font-weight-heading: var(--font-weight-bold); - - // Heading font sizes in mobile - @media (max-width: $container-mobile) { - --font-size-hero: 38px; - --font-size-h1: 32px; - --font-size-h2: 24px; - --font-size-h3: 21px; - --font-size-h4: 18px; - --font-size-h5: 14px; - --font-size-h6: 12px; - --font-size-paragraph: 16px; - } - - // Element font sizes in tiny phones like iPhone 5S - @media (max-width: 420px) { - --font-size-16: 14px; - --font-size-nav-toggle-label: 13px; - } -} diff --git a/sass/variables/_font-family.scss b/sass/variables/_typography-family.scss similarity index 100% rename from sass/variables/_font-family.scss rename to sass/variables/_typography-family.scss