diff options
| author | Ben Sima <ben@bsima.me> | 2020-12-04 11:16:25 -0500 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2020-12-05 07:55:13 -0500 |
| commit | 330e4363d8abb509031d2c8c1a89dcc6f955e2c1 (patch) | |
| tree | 915c8c50a7125bf6eb9e560f8d00a80592f41c77 /Hero | |
| parent | 32f53350a3a3d701e9a1474e670a8454342adc40 (diff) | |
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.
Diffstat (limited to 'Hero')
| -rw-r--r-- | Hero/Look/Typography.hs | 29 |
1 files changed, 15 insertions, 14 deletions
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 - </ [ ("-Reg.otf", OpenType, fontWeight normal <> 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 + </ [ ("-Reg.otf", OpenType, fontWeight normal <> 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 |