diff --git a/app/assets/stylesheets/atoms/_fonts.scss b/app/assets/stylesheets/atoms/_fonts.scss index 6066979..7bcd189 100644 --- a/app/assets/stylesheets/atoms/_fonts.scss +++ b/app/assets/stylesheets/atoms/_fonts.scss @@ -3,62 +3,62 @@ @font-face { font-family: 'HalisR'; src:local('Halis R Thin'), - font-path('HalisR-Thin.woff2') format('woff2'), - font-path('HalisR-Thin.woff') format('woff'), - font-path('HalisR-Thin.otf') format('opentype'); + font-url('HalisR-Thin.woff2') format('woff2'), + font-url('HalisR-Thin.woff') format('woff'), + font-url('HalisR-Thin.otf') format('opentype'); font-weight:100; } @font-face { font-family: 'HalisR'; src:local('Halis R Light'), - font-path('HalisR-Light.woff2') format('woff2'), - font-path('HalisR-Light.woff') format('woff'), - font-path('HalisR-Light.otf') format('opentype'); + font-url('HalisR-Light.woff2') format('woff2'), + font-url('HalisR-Light.woff') format('woff'), + font-url('HalisR-Light.otf') format('opentype'); font-weight:200; } @font-face { font-family: 'HalisR'; src:local('Halis R Book'), - font-path('HalisR-Book.woff2') format('woff2'), - font-path('HalisR-Book.woff') format('woff'), - font-path('HalisR-Book.otf') format('opentype'); + font-url('HalisR-Book.woff2') format('woff2'), + font-url('HalisR-Book.woff') format('woff'), + font-url('HalisR-Book.otf') format('opentype'); font-weight:300; } @font-face { font-family: 'HalisR'; src:local('Halis R Regular'), - font-path('HalisR-Regular.woff2') format('woff2'), - font-path('HalisR-Regular.woff') format('woff'), - font-path('HalisR-Regular.otf') format('opentype'); + font-url('HalisR-Regular.woff2') format('woff2'), + font-url('HalisR-Regular.woff') format('woff'), + font-url('HalisR-Regular.otf') format('opentype'); font-weight:500; } @font-face { font-family: 'HalisR'; src:local('Halis R Medium'), - font-path('HalisR-Medium.woff2') format('woff2'), - font-path('HalisR-Medium.woff') format('woff'), - font-path('HalisR-Medium.otf') format('opentype'); + font-url('HalisR-Medium.woff2') format('woff2'), + font-url('HalisR-Medium.woff') format('woff'), + font-url('HalisR-Medium.otf') format('opentype'); font-weight:600; } @font-face { font-family: 'HalisR'; src:local('Halis R Bold'), - font-path('HalisR-Bold.woff2') format('woff2'), - font-path('HalisR-Bold.woff') format('woff'), - font-path('HalisR-Bold.otf') format('opentype'); + font-url('HalisR-Bold.woff2') format('woff2'), + font-url('HalisR-Bold.woff') format('woff'), + font-url('HalisR-Bold.otf') format('opentype'); font-weight:700; } @font-face { font-family: 'HalisR'; src:local('Halis R Black'), - font-path('HalisR-Black.woff2') format('woff2'), - font-path('HalisR-Black.woff') format('woff'), - font-path('HalisR-Black.otf') format('opentype'); + font-url('HalisR-Black.woff2') format('woff2'), + font-url('HalisR-Black.woff') format('woff'), + font-url('HalisR-Black.otf') format('opentype'); font-weight:900; } @@ -69,44 +69,44 @@ @font-face { font-family: 'Lato'; src:local('Lato Hairline'), - font-path('Lato-Hairline.woff2') format('woff2'), - font-path('Lato-Hairline.woff') format('woff'), - font-path('Lato-Hairline.ttf') format('truetype'); + font-url('Lato-Hairline.woff2') format('woff2'), + font-url('Lato-Hairline.woff') format('woff'), + font-url('Lato-Hairline.ttf') format('truetype'); font-weight:100; } @font-face { font-family: 'Lato'; src:local('Lato Light'), - font-path('Lato-Light.woff2') format('woff2'), - font-path('Lato-Light.woff') format('woff'), - font-path('Lato-Light.ttf') format('truetype'); + font-url('Lato-Light.woff2') format('woff2'), + font-url('Lato-Light.woff') format('woff'), + font-url('Lato-Light.ttf') format('truetype'); font-weight:300; } @font-face { font-family: 'Lato'; src:local('Lato Regular'), - font-path('Lato-Regular.woff2') format('woff2'), - font-path('Lato-Regular.woff') format('woff'), - font-path('Lato-Regular.ttf') format('truetype'); + font-url('Lato-Regular.woff2') format('woff2'), + font-url('Lato-Regular.woff') format('woff'), + font-url('Lato-Regular.ttf') format('truetype'); font-weight:500; } @font-face { font-family: 'Lato'; src:local('Lato Bold'), - font-path('Lato-Bold.woff2') format('woff2'), - font-path('Lato-Bold.woff') format('woff'), - font-path('Lato-Bold.ttf') format('truetype'); + font-url('Lato-Bold.woff2') format('woff2'), + font-url('Lato-Bold.woff') format('woff'), + font-url('Lato-Bold.ttf') format('truetype'); font-weight:700; } @font-face { font-family: 'Lato'; src:local('Lato Black'), - font-path('Lato-Black.woff2') format('woff2'), - font-path('Lato-Black.woff') format('woff'), - font-path('Lato-Black.ttf') format('truetype'); + font-url('Lato-Black.woff2') format('woff2'), + font-url('Lato-Black.woff') format('woff'), + font-url('Lato-Black.ttf') format('truetype'); font-weight:900; } @@ -115,18 +115,18 @@ @font-face { font-family: 'Lato'; src:local('Lato Hairline Italic'), - font-path('Lato-HairlineItalic.woff2') format('woff2'), - font-path('Lato-HairlineItalic.woff') format('woff'), - font-path('Lato-HairlineItalic.ttf') format('truetype'); + font-url('Lato-HairlineItalic.woff2') format('woff2'), + font-url('Lato-HairlineItalic.woff') format('woff'), + font-url('Lato-HairlineItalic.ttf') format('truetype'); font-weight:100; font-style: italic; } @font-face { font-family: 'Lato'; src:local('Lato Light Italic'), - font-path('Lato-LightItalic.woff2') format('woff2'), - font-path('Lato-LightItalic.woff') format('woff'), - font-path('Lato-LightItalic.ttf') format('truetype'); + font-url('Lato-LightItalic.woff2') format('woff2'), + font-url('Lato-LightItalic.woff') format('woff'), + font-url('Lato-LightItalic.ttf') format('truetype'); font-weight:300; font-style: italic; } @@ -134,9 +134,9 @@ @font-face { font-family: 'Lato'; src:local('Lato Italic'), - font-path('Lato-Italic.woff2') format('woff2'), - font-path('Lato-Italic.woff') format('woff'), - font-path('Lato-Italic.ttf') format('truetype'); + font-url('Lato-Italic.woff2') format('woff2'), + font-url('Lato-Italic.woff') format('woff'), + font-url('Lato-Italic.ttf') format('truetype'); font-weight:500; font-style: italic; } @@ -144,9 +144,9 @@ @font-face { font-family: 'Lato'; src:local('Lato Bold Italic'), - font-path('Lato-BoldItalic.woff2') format('woff2'), - font-path('Lato-BoldItalic.woff') format('woff'), - font-path('Lato-BoldItalic.ttf') format('truetype'); + font-url('Lato-BoldItalic.woff2') format('woff2'), + font-url('Lato-BoldItalic.woff') format('woff'), + font-url('Lato-BoldItalic.ttf') format('truetype'); font-weight:700; font-style: italic; } @@ -154,9 +154,9 @@ @font-face { font-family: 'Lato'; src:local('Lato Black Italic'), - font-path('Lato-BlackItalic.woff2') format('woff2'), - font-path('Lato-BlackItalic.woff') format('woff'), - font-path('Lato-BlackItalic.ttf') format('truetype'); + font-url('Lato-BlackItalic.woff2') format('woff2'), + font-url('Lato-BlackItalic.woff') format('woff'), + font-url('Lato-BlackItalic.ttf') format('truetype'); font-weight:900; font-style: italic; } diff --git a/app/assets/stylesheets/atoms/_typography.scss b/app/assets/stylesheets/atoms/_typography.scss index 2b754c9..5b06f15 100644 --- a/app/assets/stylesheets/atoms/_typography.scss +++ b/app/assets/stylesheets/atoms/_typography.scss @@ -48,7 +48,8 @@ hr { margin: $base-spacing 0; } -.prft-heading { +// .prft-heading +h1 { text-transform: none; } @@ -56,9 +57,11 @@ hr { margin-bottom: 1.5rem; } -.prft-heading, +// .prft-heading, +h1, .question-text { font-size: 6vw; + font-weight: 100; } h1 > a { @@ -67,7 +70,8 @@ h1 > a { } @media screen and (min-width: $screen-sm) { - .prft-heading, + // .prft-heading, + h1, .question-text { font-size: 2.45rem; }