From d3dfc4b0cd46f21a8703c13e1edd70b045ad5875 Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Sat, 5 Sep 2020 22:21:25 +0200 Subject: [PATCH] Edited indentation and order of fonts. --- components/main.scss | 98 ++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/components/main.scss b/components/main.scss index b6f49e2..9c84c90 100644 --- a/components/main.scss +++ b/components/main.scss @@ -1,48 +1,48 @@ @import './rcss.bundled.scss'; +// Include primary fonts in regular, italic and bold each. @font-face { - font-family: 'Crimson Text'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: local('Crimson Text Italic'), local('CrimsonText-Italic'), url(fonts/Crimson/CrimsonText-Italic.ttf) format('truetype'); - } - @font-face { - font-family: 'Crimson Text'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Crimson Text Regular'), local('CrimsonText-Regular'), url(fonts/Crimson/CrimsonText-Regular.ttf) format('truetype'); - } - @font-face { - font-family: 'Crimson Text'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Crimson Text Bold'), local('CrimsonText-Bold'), url(fonts/Crimson/CrimsonText-Bold.ttf) format('truetype'); - } - @font-face { - font-family: 'Montserrat'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: local('Montserrat Italic'), local('Montserrat-Italic'), url(fonts/Montserrat/Montserrat-Italic.ttf) format('truetype'); - } - @font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Montserrat Regular'), local('Montserrat-Regular'), url(fonts/Montserrat/Montserrat-Regular.ttf) format('truetype'); - } - @font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Montserrat Bold'), local('Montserrat-Bold'), url(fonts/Montserrat/Montserrat-Bold.ttf) format('truetype'); - } - + font-family: 'Crimson Text'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: local('Crimson Text Regular'), local('CrimsonText-Regular'), url(fonts/Crimson/CrimsonText-Regular.ttf) format('truetype'); +} +@font-face { + font-family: 'Crimson Text'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: local('Crimson Text Italic'), local('CrimsonText-Italic'), url(fonts/Crimson/CrimsonText-Italic.ttf) format('truetype'); +} +@font-face { + font-family: 'Crimson Text'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local('Crimson Text Bold'), local('CrimsonText-Bold'), url(fonts/Crimson/CrimsonText-Bold.ttf) format('truetype'); +} +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: local('Montserrat Regular'), local('Montserrat-Regular'), url(fonts/Montserrat/Montserrat-Regular.ttf) format('truetype'); +} +@font-face { + font-family: 'Montserrat'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: local('Montserrat Italic'), local('Montserrat-Italic'), url(fonts/Montserrat/Montserrat-Italic.ttf) format('truetype'); +} +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local('Montserrat Bold'), local('Montserrat-Bold'), url(fonts/Montserrat/Montserrat-Bold.ttf) format('truetype'); +} $-beige: #D7CEC7; $-grey: #565656; @@ -51,11 +51,11 @@ $-light-brown: #C09F80; $-almost-white: #f9f9f9; $-primary-sans-serif-font: Montserrat, -Helvetica, -sans-serif; + Helvetica, + sans-serif; $-primary-serif-font: 'Crimson Text', -Times, -serif; + Times, + serif; $-viewport-extra-small: 450px; $-viewport-small: 650px; @@ -132,9 +132,9 @@ body { @media(max-width: $-viewport-extra-small) { .LP-Main__Sidebar { - max-width: 100vw; + max-width: 100vw; + } } -} @media(max-width: $-viewport-toggle-sidebar) { .LP-Wrapper__Site { @@ -192,4 +192,4 @@ body { @import '04_Templates/templates'; @import '05_Pages/pages'; -@import './tagify'; \ No newline at end of file +@import './tagify';