From 330e4363d8abb509031d2c8c1a89dcc6f955e2c1 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 4 Dec 2020 11:16:25 -0500 Subject: Renamespace Devalloc and Que Move them under the Biz root so that we know they are specific to Biz stuff. Biz is for proprietary stuff that we own. I also had to refactor the bild namespace parsing code because it couldn't handle a namespace with 3 parts. I really need to get that namespace library written and tested. --- Hero/Look/Typography.hs | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'Hero') diff --git a/Hero/Look/Typography.hs b/Hero/Look/Typography.hs index 9e35ef5..7c28f21 100644 --- a/Hero/Look/Typography.hs +++ b/Hero/Look/Typography.hs @@ -36,7 +36,7 @@ lean = fontStyle italic -- | "smallcaps" is already taken by Clay smol = fontVariant smallCaps -lower = textTransform lowercase +lower = textTransform Clay.lowercase upper = textTransform uppercase @@ -52,21 +52,22 @@ fontRoot = Pack.cdnEdge <> "/old-assets/fonts/eurostile/Eurostile" -- | font faces fonts :: Css fonts = - mconcat <| - mkEuro - fontStyle normal), - ("LTStd-Bold.otf", OpenType, thicc <> norm), - ("LTStd-Cn.otf", OpenType, slim <> norm), - ("LTStd-Ex2.otf", OpenType, wide <> norm), - ("LTStd-BoldCn.otf", OpenType, slim <> thicc), - ("LTStd-BoldEx2.otf", OpenType, wide <> thicc) - ] + mconcat + <| mkEuro + fontStyle normal), + ("LTStd-Bold.otf", OpenType, thicc <> norm), + ("LTStd-Cn.otf", OpenType, slim <> norm), + ("LTStd-Ex2.otf", OpenType, wide <> norm), + ("LTStd-BoldCn.otf", OpenType, slim <> thicc), + ("LTStd-BoldEx2.otf", OpenType, wide <> thicc) + ] where mkEuro :: (Text, FontFaceFormat, Css) -> Css - mkEuro (sufx, fmt, extra) = fontFace <| do - fontFamily ["Eurostile"] [] - fontFaceSrc [FontFaceSrcUrl (fontRoot <> sufx) <| Just fmt] - extra + mkEuro (sufx, fmt, extra) = + fontFace <| do + fontFamily ["Eurostile"] [] + fontFaceSrc [FontFaceSrcUrl (fontRoot <> sufx) <| Just fmt] + extra -- TODO: add the below to Clay.Font upstream -- cgit v1.2.3