clay 0.12.1 → 0.12.2
raw patch · 3 files changed
+15/−4 lines, 3 filesdep ~hspecPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: hspec
API changes (from Hackage documentation)
+ Clay.Selector: instance Data.Semigroup.Semigroup (Clay.Selector.Fix Clay.Selector.SelectorF)
Files
- clay.cabal +2/−2
- src/Clay/Display.hs +2/−2
- src/Clay/Selector.hs +11/−0
clay.cabal view
@@ -1,5 +1,5 @@ Name: clay-Version: 0.12.1+Version: 0.12.2 Synopsis: CSS preprocessor as embedded Haskell. Description: Clay is a CSS preprocessor like LESS and Sass, but implemented as an embedded@@ -83,5 +83,5 @@ mtl >= 1 && < 2.3, text >= 0.11 && < 1.3, hspec-expectations >= 0.7.2 && < 0.9,- hspec >= 2.2.0 && < 2.3+ hspec >= 2.2.0 && < 2.5 Ghc-Options: -Wall
src/Clay/Display.hs view
@@ -272,8 +272,8 @@ nResize = CursorValue "n-resize" seResize = CursorValue "se-resize" swResize = CursorValue "sw-resize"-sResize = CursorValue "sResize"-wResize = CursorValue "sResize"+sResize = CursorValue "s-resize"+wResize = CursorValue "w-resize" cursorText = CursorValue "text" wait = CursorValue "wait" cursorProgress = CursorValue "progress"
src/Clay/Selector.hs view
@@ -6,6 +6,7 @@ , UndecidableInstances , ViewPatterns , PatternGuards+ , CPP #-} module Clay.Selector where @@ -15,6 +16,10 @@ import Data.Text (Text) import Prelude hiding (foldl) +#if MIN_VERSION_base(4,9,0)+import Data.Semigroup+#endif+ import qualified Data.Text as Text -- | The star selector applies to all elements. Maps to @*@ in CSS.@@ -133,6 +138,7 @@ (|=) :: Text -> Text -> Refinement (|=) a = Refinement . pure . AttrHyph a + ------------------------------------------------------------------------------- data Predicate@@ -197,6 +203,11 @@ Just ('#', s) -> SelectorF (Refinement [Id s]) Star Just ('.', s) -> SelectorF (Refinement [Class s]) Star _ -> SelectorF (Refinement []) (Elem t)++#if MIN_VERSION_base(4,9,0)+instance Semigroup (Fix SelectorF) where+ (<>) = mappend+#endif instance Monoid (Fix SelectorF) where mempty = error "Selector is a semigroup"