clay 0.13.3 → 0.14.0

raw patch · 26 files changed

+218/−57 lines, 26 filesdep ~basedep ~hspecdep ~hspec-discoverPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, hspec, hspec-discover, mtl, text

API changes (from Hackage documentation)

Files

• CHANGELOG +8/−1
• CONTRIBUTING.md +13/−3
• clay.cabal +17/−12
• src/Clay.hs +4/−1
• src/Clay/Border.hs +1/−1
• src/Clay/Box.hs +4/−1
• src/Clay/Color.hs +3/−1
• src/Clay/Comments.hs +0/−2
• src/Clay/Common.hs +19/−7
• src/Clay/Display.hs +2/−3
• src/Clay/Flexbox.hs +4/−2
• src/Clay/Font.hs +2/−1
• src/Clay/FontFace.hs +0/−2
• src/Clay/Gradient.hs +0/−2
• src/Clay/Grid.hs +58/−0
• src/Clay/List.hs +1/−2
• src/Clay/Mask.hs +0/−2
• src/Clay/Property.hs +0/−1
• src/Clay/Render.hs +1/−1
• src/Clay/Selector.hs +6/−2
• src/Clay/Size.hs +25/−1
• src/Clay/Stylesheet.hs +0/−3
• src/Clay/Text.hs +4/−1
• src/Clay/Time.hs +0/−1
• src/Clay/Transform.hs +44/−1
• src/Clay/Transition.hs +2/−3

@@ -1,5 +1,13 @@ CHANGELOG +  0.14.0:+    - Drop support for GHC 8.2+    - Added `text-align-last`+    - Fix typo in `stepsStart`+    - Added clay-examples+    - Fix `cubicBezier` and other issues+    Thanks to Vasiliy Yorkin, Florian Grignon, Nick Saunders, David Fox, Ben Sima, Murakami Kennzo, Owen Shepherd, Anton Gushcha, Temur Saidkhodjaev, Rob Bassi, Alex Sayers, and further contributors.+   0.13.3:     - Improve README     - Relax types for `sym2` and `sym3` combinators@@ -129,4 +137,3 @@     - Refinements applied to the top level magically introduce star selector.     Thanks to listx, bergmark, Cynede, chrisdone, Primigenus, Sigrlami for the     pull requests and bug reports.-

@@ -16,11 +16,11 @@ GHC_VERSION=ghc881 nix-build ``` -To find out which GHC versions your nix setup provides:+To find out which GHC versions our nix setup provides:  ```-$ nix eval '(builtins.attrNames ((import <nixpkgs> {}).haskell.compiler))'-[ "ghc822Binary" "ghc844" "ghc863Binary" "ghc865" "ghc881" "ghcHEAD" "ghcjs" "ghcjs86" "integer-simple" ]+$ nix eval '(builtins.attrNames (import (builtins.fetchTarball (import ./nix/nixpkgs.nix)) {}).haskell.compiler)'+[ "ghc8102Binary" "ghc8102BinaryMinimal" "ghc8104" "ghc865Binary" "ghc884" "ghc901" "ghcHEAD" "integer-simple" "native-bignum" ] ```  # Building your pull request@@ -41,3 +41,13 @@  If you fix an important bug or contribute a new feature, consider adding a line to `CHANGELOG` describing what you have changed.++# Running tests locally++Tests will be run with the above `nix-build` calls, but if you want to run them+without doing a full nix build, you can do so with cabal:++```+nix-shell+cabal test+```

@@ -1,5 +1,5 @@ Name:     clay-Version:  0.13.3+Version:  0.14.0 Synopsis: CSS preprocessor as embedded Haskell. Description:   Clay is a CSS preprocessor like LESS and Sass, but implemented as an embedded@@ -20,17 +20,18 @@ License:       BSD3 License-File:  LICENSE Category:      Web, Graphics-Cabal-Version: >= 1.8+Cabal-Version: >= 1.10 Build-Type:    Simple  Extra-Source-Files:   README.md CHANGELOG CONTRIBUTING.md  Tested-With:-  GHC==8.2.2,   GHC==8.4.4,   GHC==8.6.5,-  GHC==8.8.1+  GHC==8.8.4,+  GHC==8.10.7,+  GHC==9.0.2  Source-Repository head   Type:     git@@ -58,6 +59,7 @@     Clay.FontFace     Clay.Geometry     Clay.Gradient+    Clay.Grid     Clay.List     Clay.Media     Clay.Mask@@ -73,19 +75,22 @@     Clay.Transition    Build-Depends:-    base  >= 4.10 && < 5,-    mtl   >= 1    && < 2.3,-    text  >= 0.11 && < 1.3+    base  >= 4.11 && < 4.16,+    mtl   >= 1,+    text  >= 0.11   GHC-Options: -Wall -Wcompat+  Default-Language: Haskell2010  Test-Suite Test-Clay   Type: exitcode-stdio-1.0   HS-Source-Dirs: spec, src+  Build-Tools: hspec-discover   main-is: Spec.hs   Build-Depends:-    base                 >= 4.10  && < 5,-    mtl                  >= 1     && < 2.3,-    text                 >= 0.11  && < 1.3,-    hspec                >= 2.2.0 && < 2.8,-    hspec-discover       >= 2.2.0 && < 2.8+    base                 >= 4.11  && < 4.16,+    mtl                  >= 1,+    text                 >= 0.11,+    hspec                >= 2.2.0,+    hspec-discover       >= 2.2.0   GHC-Options: -Wall -Wcompat+  Default-Language: Haskell2010

@@ -39,6 +39,7 @@ , (|>) , (#) , (|+)+, (|~)  -- ** Refining selectors. @@ -112,6 +113,7 @@ , module Clay.FontFace , module Clay.Geometry , module Clay.Gradient+, module Clay.Grid , module Clay.List , module Clay.Text , module Clay.Transform@@ -155,6 +157,7 @@ import Clay.FontFace import Clay.Geometry import Clay.Gradient+import Clay.Grid import Clay.List import Clay.Size import Clay.Text       hiding (pre)@@ -182,6 +185,6 @@ -- grouped with the preceding value when rendered compactly. -- -- Note that /every/ generated line in the generated content will feature the--- comment. +-- comment. -- -- An empty comment generates '@/*  */@'.

@@ -56,7 +56,7 @@  ------------------------------------------------------------------------------- -border, borderTop, borderLeft, borderBottom, borderRight :: Stroke -> Size LengthUnit -> Color -> Css+border, borderTop, borderLeft, borderBottom, borderRight :: Size LengthUnit -> Stroke -> Color -> Css  border        a b c = key "border"        (a ! b ! c) borderTop     a b c = key "border-top"    (a ! b ! c)

@@ -20,7 +20,6 @@ ) where -import Data.Monoid import Data.List.NonEmpty (NonEmpty)  import Clay.Color@@ -82,6 +81,10 @@ -- > boxShadow . pure $ shadow (px 1) (px 1) -- -- Use with @{-# LANGUAGE OverloadedLists #-}@ for the simplest list syntax.+-- Note that sometimes when @{-# LANGUAGE OverloadedLists #-}@ is active, GHC+-- has troubles identifying what type the list should be converted to. Examples:+-- 1) "forM_ [0..10] $ \x -> ..."+-- 2) "[left, top, right, bottom] `forM_` ($ pct 4)" -- -- > boxShadow [none] -- > boxShadow [shadow (px 1) (px 1)]

@@ -2,7 +2,6 @@ module Clay.Color where  import Data.Char (isHexDigit)-import Data.Monoid import Data.String import Text.Printf @@ -119,14 +118,17 @@ (*.) :: Color -> Integer -> Color (*.) (Rgba r g b a) i = Rgba (clamp (r * i)) (clamp (g * i)) (clamp (b * i)) a (*.) o              _ = o+infixl 7 *.  (+.) :: Color -> Integer -> Color (+.) (Rgba r g b a) i = Rgba (clamp (r + i)) (clamp (g + i)) (clamp (b + i)) a (+.) o              _ = o+infixl 6 +.  (-.) :: Color -> Integer -> Color (-.) (Rgba r g b a) i = Rgba (clamp (r - i)) (clamp (g - i)) (clamp (b - i)) a (-.) o              _ = o+infixl 6 -.  clamp :: Ord a => Num a => a -> a clamp i = max (min i (fromIntegral (255 :: Integer))) (fromIntegral (0 :: Integer))

@@ -3,8 +3,6 @@ {-# LANGUAGE OverloadedStrings #-} module Clay.Comments where -import Data.Foldable (foldMap)-import Data.Monoid ((<>)) import Data.Maybe (isNothing) import Data.List (partition) 

@@ -9,9 +9,9 @@  module Clay.Common where +import Data.Text (Text) import Clay.Property import Data.String (IsString)-import Data.Monoid (Monoid, (<>))  ------------------------------------------------------------------------------- @@ -74,13 +74,25 @@ -- | Common list browser prefixes to make experimental properties work in -- different browsers. +webkitPrefix :: (Text, Text)+webkitPrefix = ( "-webkit-", "" )++emptyPrefix :: (Text, Text)+emptyPrefix = ( "", "" )++webkit :: Prefixed+webkit = Prefixed $+  [ webkitPrefix+  , emptyPrefix+  ]+ browsers :: Prefixed-browsers = Prefixed-  [ ( "-webkit-", "" )-  , (    "-moz-", "" )-  , (     "-ms-", "" )-  , (      "-o-", "" )-  , (         "", "" )+browsers = Prefixed $+  [ webkitPrefix+  , ( "-moz-", "" )+  , (  "-ms-", "" )+  , (   "-o-", "" )+  , emptyPrefix   ]  -------------------------------------------------------------------------------

@@ -81,7 +81,6 @@ ) where -import Data.Monoid import Data.String  import Clay.Size@@ -128,7 +127,7 @@ absolute = Position "absolute" fixed    = Position "fixed" relative = Position "relative"-sticky = Position "sticky"+sticky = Position $ Value (webkit <> Plain "sticky")  position :: Position -> Css position = key "position"@@ -187,7 +186,7 @@ -------------------------------------------------------------------------------  newtype Visibility = Visibility Value-  deriving (Val, Other, Auto, Inherit, Hidden, Visible)+  deriving (Val, Other, Inherit, Hidden, Unset, Visible)  separate, collapse :: Visibility 

@@ -14,19 +14,21 @@ class FlexStart    a where flexStart    :: a class SpaceAround  a where spaceAround  :: a class SpaceBetween a where spaceBetween :: a+class SpaceEvenly  a where spaceEvenly  :: a class Stretch      a where stretch      :: a  instance FlexEnd Value      where flexEnd      = "flex-end" instance FlexStart Value    where flexStart    = "flex-start" instance SpaceAround Value  where spaceAround  = "space-around" instance SpaceBetween Value where spaceBetween = "space-between"+instance SpaceEvenly Value  where spaceEvenly  = "space-evenly" instance Stretch Value      where stretch      = "stretch"  -------------------------------------------------------------------------------  newtype AlignContentValue = AlignContentValue Value   deriving (Val, Other, Inherit, FlexStart, FlexEnd-          , Center, SpaceBetween, SpaceAround, Stretch)+          , Center, SpaceBetween, SpaceAround, SpaceEvenly, Stretch)  alignContent :: AlignContentValue -> Css alignContent = key "align-content"@@ -107,7 +109,7 @@  newtype JustifyContentValue = JustifyContentValue Value   deriving (Val, Other, Inherit, Center, FlexEnd-          , FlexStart, SpaceAround, SpaceBetween)+          , FlexStart, SpaceAround, SpaceBetween, SpaceEvenly)  justifyContent :: JustifyContentValue -> Css justifyContent = key "justify-content"

@@ -102,7 +102,8 @@   [GenericFontFamily]  instance Val (Required a) where-  value (Required a Nothing  c d) = value (a ! (Literal <$> c) ! d)+  value (Required a Nothing  c d) = value a <> " " <> (value $ Literal <$> c) <> sep <> value d+    where sep = if null c || null d then "" else ","   value (Required a (Just b) c d) = value ((value a <> "/" <> value b) ! (Literal <$> c) ! d)  instance Font (          Required a)

@@ -9,8 +9,6 @@ import Clay.Property (Prefixed (Plain), Value(Value), Val (value), quote) import Clay.Stylesheet (Css, key) -import Data.Monoid ((<>))-import Data.Functor ((<$>)) import Data.Maybe (fromMaybe) import Data.Text (Text) 

@@ -36,8 +36,6 @@ ) where -import Data.Monoid- import Clay.Color import Clay.Common import Clay.Property

@@ -0,0 +1,58 @@+{-# LANGUAGE OverloadedStrings #-}+-- | Partial implementation of <https://alligator.io/css/css-grid-layout-grid-areas grid area CSS API>.+--+-- For instance, you want to generate the following CSS:+--+-- @+-- .grid1 {+--   display: grid;+--   width: max-content;+-- }+--+-- .grid3 {+--   display: grid;+--   width: max-content;+-- }+--+-- \@media (min-width: 40.0rem) {+--   .grid3 {+--     display: grid;+--     grid-template-columns: 1fr 1fr 1fr;+--     grid-gap: 1rem;+--     width: max-content;+--   }+-- }+-- @+--+-- The corresponding clay code:+--+-- @+--  ".grid1" ? do+--    display grid+--    width maxContent+--  ".grid3" ? do+--    display grid+--    width maxContent+--  query M.screen [M.minWidth (rem 40)] $ ".grid3" ? do+--    display grid+--    gridTemplateColumns [fr 1, fr 1, fr 1]+--    gridGap $ rem 1+--    width maxContent+-- @+module Clay.Grid+( gridGap+, gridTemplateColumns+)+where++import Clay.Property+import Clay.Size+import Clay.Stylesheet++-- | Property sets the gaps (gutters) between rows and columns.+gridGap :: Size a -> Css+gridGap = key "grid-gap"++-- | Property defines the line names and track sizing functions of the grid columns.+gridTemplateColumns :: [Size a] -> Css+gridTemplateColumns = key "grid-template-columns" . noCommas

@@ -36,7 +36,6 @@ ) where -import Data.Semigroup import Data.Text (Text)  import Clay.Common@@ -75,7 +74,7 @@ listStyleType = key "list-style-type"  newtype ListStylePosition = ListStylePosition Value-  deriving (Val, Initial, Inherit, None, Other)+  deriving (Val, Initial, Inherit, Other)  inside, outside :: ListStylePosition 

@@ -57,8 +57,6 @@ ) where -import Data.Semigroup- import Clay.Background import Clay.Common import Clay.Property

@@ -6,7 +6,6 @@ import Data.List (partition, sort) import Data.List.NonEmpty (NonEmpty, toList) import Data.Maybe-import Data.Semigroup import Data.String import Data.Text (Text, replace) 

@@ -14,7 +14,6 @@  import           Control.Applicative import           Control.Monad.Writer-import           Data.Foldable          (foldMap) import           Data.List              (sort) import           Data.Maybe import           Data.Text              (Text, pack)@@ -304,6 +303,7 @@             Child      a b -> ins " > " <$> rec a <*> rec b             Deep       a b -> ins " "   <$> rec a <*> rec b             Adjacent   a b -> ins " + " <$> rec a <*> rec b+            Sibling    a b -> ins " ~ " <$> rec a <*> rec b             Combined   a b -> rec a ++ rec b           where ins s a b = a <> s <> b 

@@ -9,8 +9,6 @@   #-} module Clay.Selector where -import Control.Applicative-import Data.Semigroup import Data.String import Data.Text (Text) @@ -53,6 +51,11 @@ (|+) :: Selector -> Selector -> Selector (|+) a b = In (SelectorF (Refinement []) (Adjacent a b)) +-- | The general sibling selector composer. Maps to @sel1 ~ sel2@ in CSS.++(|~) :: Selector -> Selector -> Selector+(|~) a b = In (SelectorF (Refinement []) (Sibling a b))+ -- | Named alias for `#`.  with :: Selector -> Refinement -> Selector@@ -176,6 +179,7 @@   | Child     f f   | Deep      f f   | Adjacent  f f+  | Sibling   f f   | Combined  f f   deriving Show 

@@ -33,6 +33,11 @@ , vh , vmin , vmax+, fr+, maxContent+, minContent+, available+, fitContent  -- * Calculation operators for calc @@ -142,7 +147,7 @@ -- | Size in picas (1pc = 12pt). pc i = SimpleSize (cssDoubleText i <> "pc") -em, ex, rem, vw, vh, vmin, vmax :: Double -> Size LengthUnit+em, ex, rem, vw, vh, vmin, vmax, fr :: Double -> Size LengthUnit  -- | Size in em's (computed cssDoubleText of the font-size). em i = SimpleSize (cssDoubleText i <> "em")@@ -164,6 +169,25 @@  -- | SimpleSize in vmax's (the larger of vw or vh). vmax i = SimpleSize (cssDoubleText i <> "vmax")++-- | 'SimpleSize' in fr's (a fractional unit and 1fr is for 1 part of the available space in grid areas).+fr i = SimpleSize (cssDoubleText i <> "fr")++-- | SimpleSize for the intrinsic preferred width.+maxContent :: Size LengthUnit+maxContent = SimpleSize "max-content"++-- | SimpleSize for the intrinsic minimum width.+minContent :: Size LengthUnit+minContent = SimpleSize "min-content"++-- | SimpleSize for the containing block width minus horizontal margin, border, and padding.+available :: Size LengthUnit+available = SimpleSize "available"++-- | The larger of the intrinsic minimum width or the smaller of the intrinsic preferred width and the available width.+fitContent :: Size LengthUnit+fitContent = SimpleSize "fit-content"  -- | SimpleSize in percents. pct :: Double -> Size Percentage

@@ -7,10 +7,7 @@ import Control.Applicative import Control.Arrow (second) import Control.Monad.Writer (Writer, execWriter, tell)-import Data.Foldable (foldMap) import Data.Maybe (isJust)-import Data.Monoid (Monoid(..))-import Data.Semigroup (Semigroup(..)) import Data.String (IsString) import Data.Text (Text) 

@@ -35,6 +35,7 @@  , TextAlign , textAlign+, textAlignLast , justify, matchParent, start, end , alignSide , alignString@@ -94,7 +95,6 @@ ) where -import Data.Monoid import Data.String import Data.Text (Text) @@ -207,6 +207,9 @@  textAlign :: TextAlign -> Css textAlign = key "text-align"++textAlignLast :: TextAlign -> Css+textAlignLast = key "text-align-last"  ------------------------------------------------------------------------------- 

@@ -12,7 +12,6 @@ ) where -import Data.Monoid import Data.Text (pack)  import Clay.Common

@@ -7,6 +7,18 @@   Transformation , transform , transforms+, TransformStyle+, transformStyle+, flat+, preserve3d+, TransformBox+, transformBox+, transformContentBox+, transformBorderBox+, fillBox+, strokeBox+, viewBox+, transformOrigin  -- * Translating. @@ -39,7 +51,6 @@ ) where -import Data.Monoid import Prelude hiding (Left, Right)  import Clay.Property@@ -55,6 +66,38 @@  transforms :: [Transformation] -> Css transforms xs = prefixed (browsers <> "transform") (noCommas xs)++-------------------------------------------------------------------------------++newtype TransformStyle = TransformStyle Value+  deriving (Val, Inherit, Initial, Unset)++transformStyle :: TransformStyle -> Css+transformStyle = prefixed (browsers <> "transform-style")++flat, preserve3d :: TransformStyle+flat = TransformStyle "flat"+preserve3d = TransformStyle "preserve-3d"++-------------------------------------------------------------------------------++newtype TransformBox = TransformBox Value+  deriving (Val, Inherit, Initial, Unset)++transformBox :: TransformBox -> Css+transformBox = prefixed (browsers <> "transform-box")++transformContentBox, transformBorderBox, fillBox, strokeBox, viewBox :: TransformBox+transformContentBox = TransformBox "contentBox"+transformBorderBox = TransformBox "borderBox"+fillBox = TransformBox "fillBox"+strokeBox = TransformBox "strokeBox"+viewBox = TransformBox "viewBox"++-------------------------------------------------------------------------------++transformOrigin :: [Size a] -> Css+transformOrigin = prefixed (browsers <> "transform-origin") . noCommas  ------------------------------------------------------------------------------- 

@@ -36,7 +36,6 @@ ) where -import Data.Monoid import Data.Text (Text)  import Clay.Common@@ -90,11 +89,11 @@  stepsStart, stepsStop :: Integer -> TimingFunction -stepsStart s = other ("steps(" <> value s <> ", end)")+stepsStart s = other ("steps(" <> value s <> ", start)") stepsStop  s = other ("steps(" <> value s <> ", end)")  cubicBezier :: Double -> Double -> Double -> Double -> TimingFunction-cubicBezier a b c d = other ("cubic-bezier(" <> value (a ! b ! c ! d) <> ")")+cubicBezier a b c d = other ("cubic-bezier(" <> value [a, b, c, d] <> ")")  transitionTimingFunction :: TimingFunction -> Css transitionTimingFunction = key "transition-timing-function"